From ba5b524a9c24d3bcd7546b10f60c033b541bf9a5 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 18 Apr 2023 15:00:23 -0700 Subject: [PATCH] switch to release branch of ci --- .github/workflows/flake-update.yml | 22 +++++++++++----------- .github/workflows/nodes.yml | 22 +++++++++++----------- ci/flake-cron.nix | 2 +- ci/nodes.nix | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 0b430eda..a16c2330 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -10,22 +10,22 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@nix2.4-broken + uses: arcnmx/ci/actions/nix/install@v0.6 - id: ci-action-build name: nix build ci.gh-actions.configFile - uses: arcnmx/ci/actions/nix/build@nix2.4-broken + uses: arcnmx/ci/actions/nix/build@v0.6 with: attrs: ci.gh-actions.configFile out-link: .ci/workflow.yml - id: ci-action-compare name: gh-actions compare - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: args: -u .github/workflows/flake-update.yml .ci/workflow.yml attrs: nixpkgs.diffutils @@ -36,16 +36,16 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@nix2.4-broken + uses: arcnmx/ci/actions/nix/install@v0.6 - id: ci-setup name: nix setup - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.flake-update.run.bootstrap quiet: false @@ -56,7 +56,7 @@ jobs: ' - id: ci-dirty name: nix test dirty - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.flake-update.run.test command: ci-build-dirty @@ -64,7 +64,7 @@ jobs: stdout: ${{ runner.temp }}/ci.build.dirty - id: ci-test name: nix test build - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.flake-update.run.test command: ci-build-realise @@ -75,7 +75,7 @@ jobs: CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} id: ci-summary name: nix test results - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.flake-update.run.test command: ci-build-summarise @@ -87,7 +87,7 @@ jobs: id: ci-cache if: always() name: nix test cache - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.flake-update.run.test command: ci-build-cache diff --git a/.github/workflows/nodes.yml b/.github/workflows/nodes.yml index 2691611c..91d008a1 100644 --- a/.github/workflows/nodes.yml +++ b/.github/workflows/nodes.yml @@ -9,21 +9,21 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@nix2.4-broken + uses: arcnmx/ci/actions/nix/install@v0.6 - id: ci-action-build name: nix build ci.gh-actions.configFile - uses: arcnmx/ci/actions/nix/build@nix2.4-broken + uses: arcnmx/ci/actions/nix/build@v0.6 with: attrs: ci.gh-actions.configFile out-link: .ci/workflow.yml - id: ci-action-compare name: gh-actions compare - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: args: -u .github/workflows/nodes.yml .ci/workflow.yml attrs: nixpkgs.diffutils @@ -34,15 +34,15 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@nix2.4-broken + uses: arcnmx/ci/actions/nix/install@v0.6 - id: ci-setup name: nix setup - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.tewi.run.bootstrap quiet: false @@ -53,7 +53,7 @@ jobs: ' - id: ci-dirty name: nix test dirty - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.tewi.run.test command: ci-build-dirty @@ -61,7 +61,7 @@ jobs: stdout: ${{ runner.temp }}/ci.build.dirty - id: ci-test name: nix test build - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.tewi.run.test command: ci-build-realise @@ -72,7 +72,7 @@ jobs: CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} id: ci-summary name: nix test results - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.tewi.run.test command: ci-build-summarise @@ -84,7 +84,7 @@ jobs: id: ci-cache if: always() name: nix test cache - uses: arcnmx/ci/actions/nix/run@nix2.4-broken + uses: arcnmx/ci/actions/nix/run@v0.6 with: attrs: ci.job.tewi.run.test command: ci-build-cache diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index bd542073..208921f1 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -7,7 +7,7 @@ in { nixpkgs.args.localSystem = "x86_64-linux"; ci = { - version = "nix2.4-broken"; + version = "v0.6"; gh-actions = { enable = true; export = true; diff --git a/ci/nodes.nix b/ci/nodes.nix index 4b56440a..30c30050 100644 --- a/ci/nodes.nix +++ b/ci/nodes.nix @@ -4,7 +4,7 @@ nixpkgs.args.localSystem = "x86_64-linux"; ci = { - version = "nix2.4-broken"; + version = "v0.6"; gh-actions = { enable = true; export = true; diff --git a/flake.lock b/flake.lock index 12c9660e..4a805f37 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ "ci": { "flake": false, "locked": { - "lastModified": 1668974694, - "narHash": "sha256-usfZB+CIVltVzkGUNXIdp0L+Nuaa6+gjLxbHT+1THiA=", + "lastModified": 1681855023, + "narHash": "sha256-nvt7kRr/4SizyhOxGH4kJ4y7ZNiSwPLS7/kz52JbmnY=", "owner": "arcnmx", "repo": "ci", - "rev": "56a0b866c1c2fedc25eac788fcead8cd229cb2b2", + "rev": "0aabdf572866e3db2d1b5124ef8d70993810bd29", "type": "github" }, "original": { "owner": "arcnmx", - "ref": "nix2.4-broken", + "ref": "v0.6", "repo": "ci", "type": "github" } diff --git a/flake.nix b/flake.nix index fe022087..ebebed94 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ flake = false; }; ci = { - url = "github:arcnmx/ci/nix2.4-broken"; + url = "github:arcnmx/ci/v0.6"; flake = false; }; home-manager = {