From 321fb796f1c853c57bbb398fbc1b5dc3042986e6 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 13 Nov 2025 05:51:40 -0500 Subject: [PATCH 1/4] fix: Detect if it's running on a self-hosted runner and skip nix install --- .github/actions/nix-install-ephemeral/action.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/actions/nix-install-ephemeral/action.yml b/.github/actions/nix-install-ephemeral/action.yml index caa9a051d..99fe92776 100644 --- a/.github/actions/nix-install-ephemeral/action.yml +++ b/.github/actions/nix-install-ephemeral/action.yml @@ -36,7 +36,19 @@ runs: sudo chmod +x /etc/nix/upload-to-cache.sh env: NIX_SIGN_SECRET_KEY: ${{ env.NIX_SIGN_SECRET_KEY }} + - name: Check runner type + id: check-runner + shell: bash + run: | + if [[ "${{ runner.name }}" == *"GitHub Actions"* ]] || [[ "$RUNNER_ENVIRONMENT" == "github-hosted" ]]; then + echo "is_self_hosted=false" >> $GITHUB_OUTPUT + echo "Running on GitHub-hosted runner, will install Nix" + else + echo "is_self_hosted=true" >> $GITHUB_OUTPUT + echo "Running on self-hosted runner, skipping Nix installation (should be pre-installed)" + fi - name: Install nix + if: steps.check-runner.outputs.is_self_hosted != 'true' uses: cachix/install-nix-action@v31 with: install_url: https://releases.nixos.org/nix/nix-2.32.2/install From a9435bdf0d61ffbd5d45711ca69e85c44aab697b Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 13 Nov 2025 05:59:24 -0500 Subject: [PATCH 2/4] fix: limit to arm-native-runner --- .github/actions/nix-install-ephemeral/action.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/nix-install-ephemeral/action.yml b/.github/actions/nix-install-ephemeral/action.yml index 99fe92776..4fac2127c 100644 --- a/.github/actions/nix-install-ephemeral/action.yml +++ b/.github/actions/nix-install-ephemeral/action.yml @@ -40,15 +40,15 @@ runs: id: check-runner shell: bash run: | - if [[ "${{ runner.name }}" == *"GitHub Actions"* ]] || [[ "$RUNNER_ENVIRONMENT" == "github-hosted" ]]; then - echo "is_self_hosted=false" >> $GITHUB_OUTPUT - echo "Running on GitHub-hosted runner, will install Nix" + if [[ "${{ runner.name }}" == "arm-native-runner" ]]; then + echo "skip_nix_install=true" >> $GITHUB_OUTPUT + echo "Running on arm-native-runner, skipping Nix installation (pre-installed)" else - echo "is_self_hosted=true" >> $GITHUB_OUTPUT - echo "Running on self-hosted runner, skipping Nix installation (should be pre-installed)" + echo "skip_nix_install=false" >> $GITHUB_OUTPUT + echo "Will install Nix" fi - name: Install nix - if: steps.check-runner.outputs.is_self_hosted != 'true' + if: steps.check-runner.outputs.skip_nix_install != 'true' uses: cachix/install-nix-action@v31 with: install_url: https://releases.nixos.org/nix/nix-2.32.2/install From f810a4b0291284a9ee7b65fa47398ec6d5d17ca0 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 13 Nov 2025 06:14:29 -0500 Subject: [PATCH 3/4] fix: can just not run in workflow --- .github/actions/nix-install-ephemeral/action.yml | 11 ----------- .github/workflows/qemu-image-build.yml | 2 -- 2 files changed, 13 deletions(-) diff --git a/.github/actions/nix-install-ephemeral/action.yml b/.github/actions/nix-install-ephemeral/action.yml index 4fac2127c..f5822880d 100644 --- a/.github/actions/nix-install-ephemeral/action.yml +++ b/.github/actions/nix-install-ephemeral/action.yml @@ -36,17 +36,6 @@ runs: sudo chmod +x /etc/nix/upload-to-cache.sh env: NIX_SIGN_SECRET_KEY: ${{ env.NIX_SIGN_SECRET_KEY }} - - name: Check runner type - id: check-runner - shell: bash - run: | - if [[ "${{ runner.name }}" == "arm-native-runner" ]]; then - echo "skip_nix_install=true" >> $GITHUB_OUTPUT - echo "Running on arm-native-runner, skipping Nix installation (pre-installed)" - else - echo "skip_nix_install=false" >> $GITHUB_OUTPUT - echo "Will install Nix" - fi - name: Install nix if: steps.check-runner.outputs.skip_nix_install != 'true' uses: cachix/install-nix-action@v31 diff --git a/.github/workflows/qemu-image-build.yml b/.github/workflows/qemu-image-build.yml index b66f16128..0f474087b 100644 --- a/.github/workflows/qemu-image-build.yml +++ b/.github/workflows/qemu-image-build.yml @@ -48,8 +48,6 @@ jobs: - name: Checkout Repo uses: supabase/postgres/.github/actions/shared-checkout@HEAD - - uses: ./.github/actions/nix-install-ephemeral - - name: Run checks if triggered manually if: ${{ github.event_name == 'workflow_dispatch' }} run: | From 7c7fa2c7e038481d4b6464710dd78c1318590961 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 13 Nov 2025 06:17:49 -0500 Subject: [PATCH 4/4] fix: remove logic --- .github/actions/nix-install-ephemeral/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/nix-install-ephemeral/action.yml b/.github/actions/nix-install-ephemeral/action.yml index f5822880d..caa9a051d 100644 --- a/.github/actions/nix-install-ephemeral/action.yml +++ b/.github/actions/nix-install-ephemeral/action.yml @@ -37,7 +37,6 @@ runs: env: NIX_SIGN_SECRET_KEY: ${{ env.NIX_SIGN_SECRET_KEY }} - name: Install nix - if: steps.check-runner.outputs.skip_nix_install != 'true' uses: cachix/install-nix-action@v31 with: install_url: https://releases.nixos.org/nix/nix-2.32.2/install