Merge pull request #514 from FgForrest/master-backup-before-mvcc

ci: attempt to deploy image per MAJOR version #7
FgForrest · Apr 15, 2024 · e28c0af · e28c0af
2 parents f654f3e + 0dfe1e0
commit e28c0af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/docker-canary.yml b/.github/workflows/docker-canary.yml
@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4        # checkout from Git
+        with:
+          ref: dev  # Always checks out the dev branch
 
       - name: Download a single artifact # download `evita-server.jar` artifact if the workflow we react to was successful
         uses: dawidd6/action-download-artifact@v2
@@ -54,4 +56,4 @@ jobs:
           tags: ${{ vars.CI_REGISTRY_USER }}/${{ env.RELEASE_IMAGE }}
           platforms: linux/amd64,linux/arm64/v8
           build-args: |
-            EVITA_JAR_NAME=${{ env.EVITA_JAR_NAME }}
+            EVITA_JAR_NAME=${{ env.EVITA_JAR_NAME }}
diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
@@ -14,6 +14,8 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - uses: actions/checkout@v3        # checkout from Git
+        with:
+          ref: master  # Always checks out the master branch
 
       - name: Download a JAR file to deploy # download `evita-server.jar` artifact if the workflow we react to was successful
         uses: dawidd6/action-download-artifact@v2