diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0c3e402..93fb0fe 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,12 +3,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@v16 + - uses: cachix/install-nix-action@v31 with: - extra-conf: | + extra_nix_config: | max-jobs = auto - source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux - - uses: cachix/cachix-action@v15 + - uses: cachix/cachix-action@v16 with: authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} extraPullNames: cuda-maintainers diff --git a/dev/flake-module.nix b/dev/flake-module.nix index a7d6753..77be283 100644 --- a/dev/flake-module.nix +++ b/dev/flake-module.nix @@ -45,16 +45,15 @@ github-actions = { steps = [ { - uses = "DeterminateSystems/nix-installer-action@v16"; + uses = "cachix/install-nix-action@v31"; "with" = { - source-url = "https://install.lix.systems/lix/lix-installer-x86_64-linux"; - extra-conf = '' + extra_nix_config = '' max-jobs = auto ''; }; } { - uses = "cachix/cachix-action@v15"; + uses = "cachix/cachix-action@v16"; "with" = { useDaemon = true; name = "terlar"; diff --git a/module/jobs/github-actions/default.nix b/module/jobs/github-actions/default.nix index 933370c..1edf134 100644 --- a/module/jobs/github-actions/default.nix +++ b/module/jobs/github-actions/default.nix @@ -22,6 +22,7 @@ in (lib.mkIf (changes != [ ]) { changes = { outputs.changes = "\${{ steps.diff.outputs.changes }}"; + runs-on = config.pipeline.github-actions.defaultRunsOn; steps = [ { id = "diff"; diff --git a/module/tests/github-actions/job.nix b/module/tests/github-actions/job.nix index e51dd9d..82dca0e 100644 --- a/module/tests/github-actions/job.nix +++ b/module/tests/github-actions/job.nix @@ -116,6 +116,8 @@ test-github-actions-job-with-default-branch-trigger-onMergeRequest-with-paths = { expr = test-lib.eval-github-actions { + pipeline.github-actions.defaultRunsOn = "ubuntu-latest"; + jobs.job = { branches.default = { changes.paths = [ @@ -131,6 +133,7 @@ jobs = { changes = { outputs.changes = "\${{ steps.diff.outputs.changes }}"; + runs-on = "ubuntu-latest"; steps = [ { id = "diff"; @@ -144,6 +147,7 @@ job = { needs = [ "changes" ]; "if" = ''''${{ fromJSON(needs.changes.outputs.changes)['job'] == true }}''; + runs-on = "ubuntu-latest"; steps = [ { uses = "actions/checkout@v4"; } ];