feat: full/Improved pipeline (#160)

WalletConnect · Aug 1, 2023 · 39235fe · 39235fe
1 parent d829e18
commit 39235fe
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/.github/workflows/publish_image.yml → .github/workflows/auto_deploy.yml b/.github/workflows/publish_image.yml → .github/workflows/auto_deploy.yml
@@ -1,4 +1,4 @@
-name: publish_image
+name: auto_deploy
 
 on:
   push:
@@ -16,10 +16,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      # Ensure that we get the new version from updated Cargo.toml
-      - name: Move to HEAD
-        run: |
-          git reset --hard HEAD
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
@@ -55,6 +52,7 @@ jobs:
         with:
           images: |
             ${{ steps.login-ecr.outputs.registry }}/echo-server
+            ghcr.io/${{ github.repository }}
             walletconnect/echo-server,enable=false
           flavor: |
             latest=auto
@@ -75,3 +73,13 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+  run-ci:
+    uses: ./.github/workflows/ci.yml
+  run-cd:
+    needs:
+      - build-container
+      - run-ci
+    # call the cd.yml file with image tag as the commit hash
+    uses: ./.github/workflows/cd.yml
+    with:
+      image_tag: ${{ github.head_ref }}
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -8,6 +8,11 @@ on:
       - "terraform/**"
   release:
     types: ["published"]
+  workflow_call:
+    inputs:
+      image_tag:
+        type: string
+        required: true
 
 concurrency:
   # Only allow for one action to run at once, queue any others
@@ -29,14 +34,18 @@ jobs:
           result-encoding: string
           script: |
             if (context.eventName == "release") {
-              return context.payload.release.tag_name
+              // remove the v from the tag
+              let tag = context.payload.release.tag_name.replace("v", "")
+              return tag
+            } else if (context.eventName == "workflow_call") {
+              return context.payload.inputs.image_tag
             } else {
               return ""
             }
 
       - id: clean_version
         run: |
-          version=$(echo "${{ steps.get.outputs.result }}" | sed 's/v//g')
+          version=$(echo "${{ steps.get.outputs.result }}")
           echo "version=$version" >> $GITHUB_OUTPUT
 
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,6 +19,9 @@ on:
       - "*.md"
       - "LICENSE"
 
+  workflow_call:
+
+
 concurrency:
   # Support push/pr as event types with different behaviors each:
   # 1. push: queue up builds