Skip to content

Commit 413c7a4

Browse files
committed
chore: detect runner and adjust the way command is run
1 parent f03c65a commit 413c7a4

File tree

1 file changed

+35
-22
lines changed

1 file changed

+35
-22
lines changed

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

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -86,28 +86,41 @@ jobs:
8686
- name: Get image tag
8787
id: image
8888
run: |
89-
nix run nixpkgs#nushell -- -c '
90-
let version = "${{ matrix.postgres.version }}"
91-
let release_key = if ($version | str contains "orioledb") {
92-
$"postgresorioledb-17"
93-
} else {
94-
$"postgres($version)"
95-
}
96-
let pg_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
97-
$"pg_version=supabase/postgres:($pg_version)" | save --append $env.GITHUB_OUTPUT
98-
'
99-
- id: build
100-
uses: docker/build-push-action@v5
101-
with:
102-
push: true
103-
build-args: |
104-
${{ needs.build.outputs.build_args }}
105-
target: production
106-
tags: ${{ steps.image.outputs.pg_version }}_${{ matrix.arch }}
107-
platforms: linux/${{ matrix.arch }}
108-
cache-from: type=gha,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
109-
cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
110-
file: ${{ matrix.postgres.dockerfile }}
89+
if [[ "${{ matrix.arch }}" == "arm64" ]]; then
90+
sudo nix run nixpkgs#nushell -- -c '
91+
let version = "${{ matrix.postgres.version }}"
92+
let release_key = if ($version | str contains "orioledb") {
93+
$"postgresorioledb-17"
94+
} else {
95+
$"postgres($version)"
96+
}
97+
let pg_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
98+
$"pg_version=supabase/postgres:($pg_version)" | save --append $env.GITHUB_OUTPUT
99+
'
100+
else
101+
nix run nixpkgs#nushell -- -c '
102+
let version = "${{ matrix.postgres.version }}"
103+
let release_key = if ($version | str contains "orioledb") {
104+
$"postgresorioledb-17"
105+
} else {
106+
$"postgres($version)"
107+
}
108+
let pg_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
109+
$"pg_version=supabase/postgres:($pg_version)" | save --append $env.GITHUB_OUTPUT
110+
'
111+
fi
112+
- id: build
113+
uses: docker/build-push-action@v5
114+
with:
115+
push: true
116+
build-args: |
117+
${{ needs.build.outputs.build_args }}
118+
target: production
119+
tags: ${{ steps.image.outputs.pg_version }}_${{ matrix.arch }}
120+
platforms: linux/${{ matrix.arch }}
121+
cache-from: type=gha,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
122+
cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
123+
file: ${{ matrix.postgres.dockerfile }}
111124
merge_manifest:
112125
needs: [prepare, build, build_release_image]
113126
strategy:

0 commit comments

Comments
 (0)