chore: using tags from merge_manifest

Author: samrose

.github/workflows/dockerhub-release-matrix.yml

@@ -122,65 +122,58 @@ jobs:
           cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
           file: ${{ matrix.postgres.dockerfile }}
   merge_manifest:
-    needs: [prepare, build, build_release_image]
-    strategy:
-      matrix:
-        include: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: docker/setup-buildx-action@v3
-      - uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Get image tag
-        id: get_version
-        run: |
-          nix run nixpkgs#nushell -- -c '
-            let version = "15"
-            let release_key = if ($version | str contains "orioledb") {
-              $"postgres($version | str replace "-" "")"
-            } else {
-              $"postgres($version)"
-            }
-            let pg_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
-            
-            $"pg_version=($pg_version)" | save --append $env.GITHUB_OUTPUT
-          ' 
-      - name: Merge multi-arch manifests
-        run: |
-          docker buildx imagetools create -t supabase/postgres:${{ steps.get_version.outputs.pg_version }} \
-          supabase/postgres:${{ steps.get_version.outputs.pg_version }}_amd64 \
-          supabase/postgres:${{ steps.get_version.outputs.pg_version }}_arm64
-  get_publish_version:
-      needs: merge_manifest
+      needs: [prepare, build, build_release_image]
+      strategy:
+        matrix:
+          include: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
       runs-on: ubuntu-latest
       outputs:
-        versions: ${{ steps.get_versions.outputs.versions }}
+        tags: ${{ steps.collect_tags.outputs.tags }}
       steps:
+        - uses: actions/checkout@v3
+        - uses: DeterminateSystems/nix-installer-action@main
         - uses: docker/setup-buildx-action@v3
         - uses: docker/login-action@v2
           with:
             username: ${{ secrets.DOCKER_USERNAME }}
             password: ${{ secrets.DOCKER_PASSWORD }}
-        - uses: DeterminateSystems/nix-installer-action@main
-        - name: Get merged manifest versions
-          id: get_versions
+        - name: Get image tag
+          id: get_version
           run: |
             nix run nixpkgs#nushell -- -c '
-              let manifest = (docker manifest inspect supabase/postgres | from json)
-              let tags = {
-                include: [$manifest.tag]
+              let version = "${{ matrix.version }}"
+              let release_key = if ($version | str contains "orioledb") {
+                $"postgresorioledb-17"
+              } else {
+                $"postgres($version)"
               }
-              $"versions=($tags | to json -r)" | save --append $env.GITHUB_OUTPUT
-            '
+              let pg_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
+              
+              $"pg_version=($pg_version)" | save --append $env.GITHUB_OUTPUT
+            ' 
+        - name: Merge multi-arch manifests
+          run: |
+            docker buildx imagetools create -t supabase/postgres:${{ steps.get_version.outputs.pg_version }} \
+            supabase/postgres:${{ steps.get_version.outputs.pg_version }}_amd64 \
+            supabase/postgres:${{ steps.get_version.outputs.pg_version }}_arm64
+        - name: Collect tags
+          id: collect_tags
+          run: |
+            nix run nixpkgs#nushell -- -c '
+              let tag = "${{ steps.get_version.outputs.pg_version }}"
+              let matrix = {include: [{version: $tag}]}
+              $"tags=($matrix | to json -r)" | save --append $env.GITHUB_OUTPUT
+            '  
+  get_publish_version:
+      needs: merge_manifest
+      runs-on: ubuntu-latest
+      outputs:
+        matrix: ${{ needs.merge_manifest.outputs.tags }}
   publish:
-    needs: get_publish_version
-    strategy:
-      matrix: ${{ fromJson(needs.get_publish_version.outputs.versions) }}
-    uses: ./.github/workflows/mirror.yml
-    with:
-      version: ${{ matrix.version }}
-    secrets: inherit
+      needs: [merge_manifest, get_publish_version]  # Add merge_manifest
+      strategy:
+        matrix: ${{ fromJson(needs.get_publish_version.outputs.matrix) }}
+      uses: ./.github/workflows/mirror.yml
+      with:
+        version: ${{ matrix.version }}
+      secrets: inherit