chore: remove major version matrix processing for manual release

Author: samrose

Diff for: .github/workflows/manual-docker-release.yml

@@ -4,52 +4,17 @@ on:
   workflow_dispatch:
     inputs:
       postgresVersion:
-        description: 'Optional. Postgres version to publish against, i.e. 15.1.1.78'
-        required: false
+        description: 'Postgres version to publish, i.e. 15.1.1.78'
+        required: true
 
 jobs:
-  prepare:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix_config: ${{ steps.set-matrix.outputs.matrix_config }}
-    steps:
-      - uses: DeterminateSystems/nix-installer-action@main
-      - name: Checkout Repo
-        uses: actions/checkout@v3
-      - name: Generate build matrix
-        id: set-matrix
-        run: |
-          nix run nixpkgs#nushell -- -c 'let versions = (open ansible/vars.yml | get postgres_major)
-          let matrix = ($versions | each { |ver|
-            let version = ($ver | str trim)
-            let dockerfile = $"Dockerfile-($version)"
-            if ($dockerfile | path exists) {
-              {
-                version: $version,
-                dockerfile: $dockerfile
-              }
-            } else {
-              null
-            }
-          } | compact)
-
-          let matrix_config = {
-            include: $matrix
-          }
-
-          $"matrix_config=($matrix_config | to json -r)" | save --append $env.GITHUB_OUTPUT'
   build:
-    needs: prepare
-    strategy:
-      matrix: ${{ fromJson(needs.prepare.outputs.matrix_config) }}
     runs-on: ubuntu-latest
     outputs:
       build_args: ${{ steps.args.outputs.result }}
     steps:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main
-      - name: Set PostgreSQL version environment variable
-        run: echo "POSTGRES_MAJOR_VERSION=${{ matrix.version }}" >> $GITHUB_ENV
 
       - id: args
         run: |
@@ -61,11 +26,11 @@ jobs:
             | str join "\n" 
             | save --append $env.GITHUB_OUTPUT
           '    
+
   build_release_image:
-    needs: [prepare, build]
+    needs: build
     strategy:
       matrix:
-        postgres: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
         arch: [amd64, arm64]
     runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-runner' }}
     timeout-minutes: 180
@@ -83,41 +48,8 @@ jobs:
       - name: Get image tag
         id: image
         run: |
-          if [[ "${{ matrix.arch }}" == "arm64" ]]; then
-            pg_version=$(sudo nix run nixpkgs#nushell -- -c '
-              let version = "${{ matrix.postgres.version }}"
-              let release_key = if ($version | str contains "orioledb") {
-                $"postgresorioledb-17"
-              } else {
-                $"postgres($version)"
-              }
-              let base_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
-              let final_version = if "${{ inputs.postgresVersion }}" != "" {
-                "${{ inputs.postgresVersion }}"
-              } else {
-                $base_version
-              }
-              $final_version | str trim
-            ')
-            echo "pg_version=supabase/postgres:$pg_version" >> $GITHUB_OUTPUT
-          else
-            pg_version=$(nix run nixpkgs#nushell -- -c '
-              let version = "${{ matrix.postgres.version }}"
-              let release_key = if ($version | str contains "orioledb") {
-                $"postgresorioledb-17"
-              } else {
-                $"postgres($version)"
-              }
-              let base_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
-              let final_version = if "${{ inputs.postgresVersion }}" != "" {
-                "${{ inputs.postgresVersion }}"
-              } else {
-                $base_version
-              }
-              $final_version | str trim
-            ')
-            echo "pg_version=supabase/postgres:$pg_version" >> $GITHUB_OUTPUT
-          fi
+          echo "pg_version=supabase/postgres:${{ inputs.postgresVersion }}" >> $GITHUB_OUTPUT
+
       - id: build
         uses: docker/build-push-action@v5
         with:
@@ -129,12 +61,10 @@ jobs:
           platforms: linux/${{ matrix.arch }}
           cache-from: type=gha,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
           cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
-          file: ${{ matrix.postgres.dockerfile }}
+          file: Dockerfile-${{ matrix.arch }}
+
   merge_manifest:
-    needs: [prepare, build, build_release_image]
-    strategy:
-      matrix:
-        include: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
+    needs: build_release_image
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -144,107 +74,16 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Get image tag
-        id: get_version
-        run: |
-          nix run nixpkgs#nushell -- -c '
-            let version = "${{ matrix.version }}"
-            let release_key = if ($version | str contains "orioledb") {
-              $"postgresorioledb-17"
-            } else {
-              $"postgres($version)"
-            }
-            let pg_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
-            $"pg_version=supabase/postgres:($pg_version)" | save --append $env.GITHUB_OUTPUT
-          '
-      - name: Output version
-        id: output_version
-        run: |
-          echo "result=${{ steps.get_version.outputs.pg_version }}" >> $GITHUB_OUTPUT
-      - name: Collect versions
-        id: collect_versions
-        run: |
-          echo "${{ steps.output_version.outputs.result }}" >> results.txt  # Append results
-      - name: Upload Results Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: merge_results-${{ matrix.version }}
-          path: results.txt
-          if-no-files-found: warn
+          
       - name: Merge multi-arch manifests
         run: |
-          docker buildx imagetools create -t ${{ steps.get_version.outputs.pg_version }} \
-          ${{ steps.get_version.outputs.pg_version }}_amd64 \
-          ${{ steps.get_version.outputs.pg_version }}_arm64
-  combine_results:
-    needs: [prepare, merge_manifest]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: DeterminateSystems/nix-installer-action@main
+          docker buildx imagetools create -t supabase/postgres:${{ inputs.postgresVersion }} \
+          supabase/postgres:${{ inputs.postgresVersion }}_amd64 \
+          supabase/postgres:${{ inputs.postgresVersion }}_arm64
 
-      - name: Debug Input from Prepare
-        run: |
-          echo "Raw matrix_config output:"
-          echo "${{ needs.prepare.outputs.matrix_config }}"
-      - name: Get Versions from Matrix Config
-        id: get_versions
-        run: |
-          nix run nixpkgs#nushell -- -c '
-            # Parse the matrix configuration directly
-            let matrix_config = (${{ toJson(needs.prepare.outputs.matrix_config) }} | from json)
-      
-            # Get versions directly from include array
-            let versions = ($matrix_config.include | get version)
-      
-            echo "Versions: $versions"
-      
-            # Convert the versions to a comma-separated string
-            let versions_str = ($versions | str join ",")
-            $"versions=$versions_str" | save --append $env.GITHUB_ENV
-          '
-      - name: Download Results Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          pattern: merge_results-*
-      - name: Combine Results
-        id: combine
-        run: |
-          nix run nixpkgs#nushell -- -c '
-            # Get all results files and process them in one go
-            let files = (ls **/results.txt | get name)
-            echo $"Found files: ($files)"
-            
-            let matrix = {
-              include: (
-                $files
-                | each { |file| open $file }          # Open each file
-                | each { |content| $content | lines }  # Split into lines
-                | flatten                             # Flatten the nested lists
-                | where { |line| $line != "" }        # Filter empty lines
-                | each { |line| 
-                    # Extract just the version part after the last colon
-                    let version = ($line | parse "supabase/postgres:{version}" | get version.0)
-                    {version: $version}
-                }
-              )
-            }
-            
-            let json_output = ($matrix | to json -r)  # -r for raw output
-            echo $"Debug output: ($json_output)"
-            
-            $"matrix=($json_output)" | save --append $env.GITHUB_OUTPUT
-          '
-      - name: Debug Combined Results
-        run: |
-          echo "Combined Results: '${{ steps.combine.outputs.matrix }}'"
-    outputs:
-      matrix: ${{ steps.combine.outputs.matrix }}
   publish:
-      needs: combine_results
-      strategy:
-        matrix: ${{ fromJson(needs.combine_results.outputs.matrix) }}
-      uses: ./.github/workflows/mirror.yml
-      with:
-        version: ${{ inputs.postgresVersion != '' && inputs.postgresVersion || matrix.version }}
-      secrets: inherit
+    needs: merge_manifest
+    uses: ./.github/workflows/mirror.yml
+    with:
+      version: ${{ inputs.postgresVersion }}
+    secrets: inherit