Push both JustRunMy image tags

Author: keepsloading

.github/workflows/deploy-justrunmy.yml

@@ -23,23 +23,30 @@ jobs:
           username: ${{ secrets.JUSTRUNMY_REGISTRY_USERNAME }}
           password: ${{ secrets.JUSTRUNMY_REGISTRY_PASSWORD }}
 
-      - name: Resolve v2 image tag
+      - name: Resolve JustRunMy image tags
         id: image
         shell: bash
         run: |
-          image="${{ secrets.JUSTRUNMY_IMAGE }}"
-          if [ -z "$image" ]; then
+          base_image="${{ secrets.JUSTRUNMY_IMAGE }}"
+          if [ -z "$base_image" ]; then
             echo "JUSTRUNMY_IMAGE secret is missing"
             exit 1
           fi
-          image="${image//v1_autodeploy/v2_autodeploy}"
-          image="${image/:v1_/:v2_}"
-          image="${image/%:v1/:v2}"
-          echo "tag=$image" >> "$GITHUB_OUTPUT"
+          v2_image="${base_image//v1_autodeploy/v2_autodeploy}"
+          v2_image="${v2_image/:v1_/:v2_}"
+          v2_image="${v2_image/%:v1/:v2}"
+          {
+            echo "tags<<EOF"
+            echo "$base_image"
+            if [ "$v2_image" != "$base_image" ]; then
+              echo "$v2_image"
+            fi
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          tags: ${{ steps.image.outputs.tag }}
+          tags: ${{ steps.image.outputs.tags }}

.github/workflows/jrnm-redeploy.yml

@@ -32,4 +32,8 @@ jobs:
       - name: Push to JustRunMyApp remote
         run: |
           git remote add jrnm "${{ secrets.JRNM_GIT_URL }}"
-          git push jrnm HEAD:deploy --force
+          git push jrnm HEAD:deploy --force 2>&1 | tee jrnm-push.log
+          if grep -qi "Error processing git push\\|No matching nodes" jrnm-push.log; then
+            echo "JustRunMyApp reported a failed redeploy."
+            exit 1
+          fi