@@ -148,7 +148,6 @@ jobs:
148
148
$"postgres($version)"
149
149
}
150
150
let pg_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
151
-
152
151
$"pg_version=supabase/postgres:($pg_version)" | save --append $env.GITHUB_OUTPUT
153
152
'
154
153
- name : Output version
@@ -161,28 +160,36 @@ jobs:
161
160
echo "results[${{ strategy.job-index }}]=${{ steps.output_version.outputs.result }}" >> $GITHUB_OUTPUT
162
161
- name : Merge multi-arch manifests
163
162
run : |
164
- docker buildx imagetools create -t supabase/postgres:${{ steps.get_version.outputs.pg_version }} \
165
- supabase/postgres:${{ steps.get_version.outputs.pg_version }}_amd64 \
166
- supabase/postgres:${{ steps.get_version.outputs.pg_version }}_arm64
167
-
163
+ docker buildx imagetools create -t ${{ steps.get_version.outputs.pg_version }} \
164
+ ${{ steps.get_version.outputs.pg_version }}_amd64 \
165
+ ${{ steps.get_version.outputs.pg_version }}_arm64
168
166
combine_versions :
169
167
needs : merge_manifest
170
168
runs-on : ubuntu-latest
171
169
outputs :
172
170
matrix : ${{ steps.set-matrix.outputs.matrix }}
173
171
steps :
172
+ - uses : actions/checkout@v3
174
173
- uses : DeterminateSystems/nix-installer-action@main
175
174
- name : Combine versions into matrix
176
175
id : set-matrix
177
176
run : |
178
177
nix run nixpkgs#nushell -- -c '
179
- let versions = (${{ needs.merge_manifest.outputs.matrix_results }} | from json)
178
+ let raw_versions = "${{ needs.merge_manifest.outputs.matrix_results }}"
179
+ let versions = ($raw_versions
180
+ | lines # Split into lines
181
+ | each { |line| # Process each line
182
+ $line
183
+ | str replace "results\\[\\d+\\]=" "" # Remove the results[N]= prefix
184
+ | str trim # Clean up any whitespace
185
+ }
186
+ | where { |it| $it != "" } # Filter out any empty lines
187
+ )
180
188
let matrix = {
181
189
include: ($versions | each { |ver| { version: $ver } })
182
190
}
183
191
$"matrix=($matrix | to json -r)" | save --append $env.GITHUB_OUTPUT
184
192
'
185
-
186
193
publish :
187
194
needs : combine_versions
188
195
strategy :
0 commit comments