From 126e974f4cedb902e607919774d47ce7dbe73ea7 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 18 Dec 2024 18:38:46 -0500 Subject: [PATCH] chore: make sure env var can be appended in all contexts --- .github/workflows/dockerhub-release-matrix.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dockerhub-release-matrix.yml b/.github/workflows/dockerhub-release-matrix.yml index 66bd44132..60da2db3a 100644 --- a/.github/workflows/dockerhub-release-matrix.yml +++ b/.github/workflows/dockerhub-release-matrix.yml @@ -87,29 +87,28 @@ jobs: id: image run: | if [[ "${{ matrix.arch }}" == "arm64" ]]; then - sudo nix run nixpkgs#nushell -- -c ' + 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 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 - ' + open ansible/vars.yml | get postgres_release | get $release_key | str trim + ') + echo "pg_version=supabase/postgres:$pg_version" >> $GITHUB_OUTPUT else - nix run nixpkgs#nushell -- -c ' + 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 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 - ' + open ansible/vars.yml | get postgres_release | get $release_key | str trim + ') + echo "pg_version=supabase/postgres:$pg_version" >> $GITHUB_OUTPUT fi - - id: build uses: docker/build-push-action@v5 with: