From 01900de145ad773dc3d289cb8dcfc35b7b9c32a2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 13 May 2025 21:14:29 +0200 Subject: [PATCH] workflows: improve test-ability in forks Removing as many "owner == NixOS" conditions as possible allows easier testing of CI itself in forks. --- .github/workflows/backport.yml | 2 +- .github/workflows/check-cherry-picks.yml | 1 - .github/workflows/manual-nixos-v2.yml | 1 - .github/workflows/manual-nixpkgs-v2.yml | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 0c8548d05deb..aee4258f7bb7 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,7 +14,7 @@ permissions: {} jobs: backport: name: Backport Pull Request - if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport')) + if: vars.NIXPKGS_CI_APP_ID && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport')) runs-on: ubuntu-24.04-arm steps: # Use a GitHub App to create the PR so that CI gets triggered diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index d539bb568d36..70dfdfba1e5f 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -16,7 +16,6 @@ jobs: check: name: cherry-pick-check runs-on: ubuntu-24.04-arm - if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index c86d3eccd82d..a8eadf63057e 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -41,7 +41,6 @@ jobs: extra_nix_config: sandbox = true - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 - if: github.repository_owner == 'NixOS' with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index 5fc64af306af..f9a5f8aa30b1 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.github/workflows/manual-nixpkgs-v2.yml @@ -28,7 +28,6 @@ jobs: extra_nix_config: sandbox = true - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 - if: github.repository_owner == 'NixOS' with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci