merge main and update workflow deployment

gnosisguild · Dec 10, 2024 · e99feb4 · e99feb4
1 parent 70d02dd
commit e99feb4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/ec2-deployment.yml b/.github/workflows/ec2-deployment.yml
@@ -37,25 +37,26 @@ jobs:
         id: version
         run: echo "version=$(date +'%Y%m%d')-${GITHUB_SHA::8}" >> $GITHUB_OUTPUT
 
-      - name: Build image
-        run: |
-          docker build -t $IMAGE_NAME:${{ steps.version.outputs.version }} -f $DOCKERFILE_PATH .
-
       - name: Log in to GitHub Container Registry
-        if: github.ref == 'refs/heads/release'
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.GITHUB_TOKEN }}  
+
+      - name: Build image
+        env:
+          IMAGE_TAG: ${{ steps.version.outputs.version }}
+        run: |
+          docker build -t $IMAGE_NAME:${{ steps.version.outputs.version }} -f $DOCKERFILE_PATH .
+          docker push $IMAGE_NAME:$IMAGE_TAG
 
       - name: Push to GHCR
         if: github.ref == 'refs/heads/release'
         env:
           IMAGE_TAG: ${{ steps.version.outputs.version }}
         run: |
           docker tag $IMAGE_NAME:$IMAGE_TAG $IMAGE_NAME:latest
-          docker push $IMAGE_NAME:$IMAGE_TAG
           docker push $IMAGE_NAME:latest
 
   deploy:

diff --git a/packages/ciphernode/Cargo.lock b/packages/ciphernode/Cargo.lock
diff --git a/packages/ciphernode/config/Cargo.toml b/packages/ciphernode/config/Cargo.toml
@@ -10,8 +10,8 @@ serde = { workspace = true }
 figment = { workspace = true }
 alloy = { workspace = true }
 shellexpand = { workspace = true }
+url = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }
-url = { workspace = true }