From 2f4719811b1637db413d4901217c730d1699c4cc Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 12 Feb 2024 15:08:16 -0800 Subject: [PATCH] chore(ci): update to 0.7 --- .github/workflows/flake-update.yml | 31 ++---- .github/workflows/nodes.yml | 146 ++++++++--------------------- ci/flake-cron.nix | 34 +------ ci/nodes.nix | 37 +------- flake.lock | 8 +- flake.nix | 2 +- 6 files changed, 57 insertions(+), 201 deletions(-) diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index a16c2330..508e7949 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@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@v0.6 + uses: arcnmx/ci/actions/nix/install@v0.7 - id: ci-action-build name: nix build ci.gh-actions.configFile - uses: arcnmx/ci/actions/nix/build@v0.6 + uses: arcnmx/ci/actions/nix/build@v0.7 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@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: args: -u .github/workflows/flake-update.yml .ci/workflow.yml attrs: nixpkgs.diffutils @@ -36,27 +36,16 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@v0.6 - - id: ci-setup - name: nix setup - uses: arcnmx/ci/actions/nix/run@v0.6 - with: - attrs: ci.job.flake-update.run.bootstrap - quiet: false - - id: architectures - name: prepare for emulated builds - run: 'sudo $(which archbinfmt) - - ' + uses: arcnmx/ci/actions/nix/install@v0.7 - id: ci-dirty name: nix test dirty - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.flake-update.run.test command: ci-build-dirty @@ -64,7 +53,7 @@ jobs: stdout: ${{ runner.temp }}/ci.build.dirty - id: ci-test name: nix test build - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.flake-update.run.test command: ci-build-realise @@ -75,7 +64,7 @@ jobs: CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} id: ci-summary name: nix test results - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.flake-update.run.test command: ci-build-summarise @@ -87,7 +76,7 @@ jobs: id: ci-cache if: always() name: nix test cache - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 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 0df41145..25dc28b7 100644 --- a/.github/workflows/nodes.yml +++ b/.github/workflows/nodes.yml @@ -9,26 +9,15 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@v0.6 - - id: ci-setup - name: nix setup - uses: arcnmx/ci/actions/nix/run@v0.6 - with: - attrs: ci.job.aya.run.bootstrap - quiet: false - - id: architectures - name: prepare for emulated builds - run: 'sudo $(which archbinfmt) - - ' + uses: arcnmx/ci/actions/nix/install@v0.7 - id: ci-dirty name: nix test dirty - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.aya.run.test command: ci-build-dirty @@ -36,7 +25,7 @@ jobs: stdout: ${{ runner.temp }}/ci.build.dirty - id: ci-test name: nix test build - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.aya.run.test command: ci-build-realise @@ -47,7 +36,7 @@ jobs: CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} id: ci-summary name: nix test results - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.aya.run.test command: ci-build-summarise @@ -59,7 +48,7 @@ jobs: id: ci-cache if: always() name: nix test cache - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.aya.run.test command: ci-build-cache @@ -71,21 +60,21 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@v0.6 + uses: arcnmx/ci/actions/nix/install@v0.7 - id: ci-action-build name: nix build ci.gh-actions.configFile - uses: arcnmx/ci/actions/nix/build@v0.6 + uses: arcnmx/ci/actions/nix/build@v0.7 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@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: args: -u .github/workflows/nodes.yml .ci/workflow.yml attrs: nixpkgs.diffutils @@ -96,26 +85,15 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@v0.6 - - id: ci-setup - name: nix setup - uses: arcnmx/ci/actions/nix/run@v0.6 - with: - attrs: ci.job.ct.run.bootstrap - quiet: false - - id: architectures - name: prepare for emulated builds - run: 'sudo $(which archbinfmt) - - ' + uses: arcnmx/ci/actions/nix/install@v0.7 - id: ci-dirty name: nix test dirty - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.ct.run.test command: ci-build-dirty @@ -123,7 +101,7 @@ jobs: stdout: ${{ runner.temp }}/ci.build.dirty - id: ci-test name: nix test build - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.ct.run.test command: ci-build-realise @@ -134,7 +112,7 @@ jobs: CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} id: ci-summary name: nix test results - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.ct.run.test command: ci-build-summarise @@ -146,7 +124,7 @@ jobs: id: ci-cache if: always() name: nix test cache - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.ct.run.test command: ci-build-cache @@ -158,26 +136,15 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@v0.6 - - id: ci-setup - name: nix setup - uses: arcnmx/ci/actions/nix/run@v0.6 - with: - attrs: ci.job.hakurei.run.bootstrap - quiet: false - - id: architectures - name: prepare for emulated builds - run: 'sudo $(which archbinfmt) - - ' + uses: arcnmx/ci/actions/nix/install@v0.7 - id: ci-dirty name: nix test dirty - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.hakurei.run.test command: ci-build-dirty @@ -185,7 +152,7 @@ jobs: stdout: ${{ runner.temp }}/ci.build.dirty - id: ci-test name: nix test build - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.hakurei.run.test command: ci-build-realise @@ -196,7 +163,7 @@ jobs: CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} id: ci-summary name: nix test results - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.hakurei.run.test command: ci-build-summarise @@ -208,7 +175,7 @@ jobs: id: ci-cache if: always() name: nix test cache - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.hakurei.run.test command: ci-build-cache @@ -220,26 +187,15 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@v0.6 - - id: ci-setup - name: nix setup - uses: arcnmx/ci/actions/nix/run@v0.6 - with: - attrs: ci.job.mediabox.run.bootstrap - quiet: false - - id: architectures - name: prepare for emulated builds - run: 'sudo $(which archbinfmt) - - ' + uses: arcnmx/ci/actions/nix/install@v0.7 - id: ci-dirty name: nix test dirty - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.mediabox.run.test command: ci-build-dirty @@ -247,7 +203,7 @@ jobs: stdout: ${{ runner.temp }}/ci.build.dirty - id: ci-test name: nix test build - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.mediabox.run.test command: ci-build-realise @@ -258,7 +214,7 @@ jobs: CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} id: ci-summary name: nix test results - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.mediabox.run.test command: ci-build-summarise @@ -270,7 +226,7 @@ jobs: id: ci-cache if: always() name: nix test cache - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.mediabox.run.test command: ci-build-cache @@ -282,26 +238,15 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@v0.6 - - id: ci-setup - name: nix setup - uses: arcnmx/ci/actions/nix/run@v0.6 - with: - attrs: ci.job.reimu.run.bootstrap - quiet: false - - id: architectures - name: prepare for emulated builds - run: 'sudo $(which archbinfmt) - - ' + uses: arcnmx/ci/actions/nix/install@v0.7 - id: ci-dirty name: nix test dirty - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.reimu.run.test command: ci-build-dirty @@ -309,7 +254,7 @@ jobs: stdout: ${{ runner.temp }}/ci.build.dirty - id: ci-test name: nix test build - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.reimu.run.test command: ci-build-realise @@ -320,7 +265,7 @@ jobs: CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} id: ci-summary name: nix test results - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.reimu.run.test command: ci-build-summarise @@ -332,7 +277,7 @@ jobs: id: ci-cache if: always() name: nix test cache - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.reimu.run.test command: ci-build-cache @@ -344,26 +289,15 @@ jobs: steps: - id: checkout name: git clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: false - id: nix-install name: nix install - uses: arcnmx/ci/actions/nix/install@v0.6 - - id: ci-setup - name: nix setup - uses: arcnmx/ci/actions/nix/run@v0.6 - with: - attrs: ci.job.tei.run.bootstrap - quiet: false - - id: architectures - name: prepare for emulated builds - run: 'sudo $(which archbinfmt) - - ' + uses: arcnmx/ci/actions/nix/install@v0.7 - id: ci-dirty name: nix test dirty - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.tei.run.test command: ci-build-dirty @@ -371,7 +305,7 @@ jobs: stdout: ${{ runner.temp }}/ci.build.dirty - id: ci-test name: nix test build - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.tei.run.test command: ci-build-realise @@ -382,7 +316,7 @@ jobs: CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} id: ci-summary name: nix test results - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.tei.run.test command: ci-build-summarise @@ -394,7 +328,7 @@ jobs: id: ci-cache if: always() name: nix test cache - uses: arcnmx/ci/actions/nix/run@v0.6 + uses: arcnmx/ci/actions/nix/run@v0.7 with: attrs: ci.job.tei.run.test command: ci-build-cache diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index 93238ab2..f856ba8e 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -12,10 +12,9 @@ in { nixpkgs.args.localSystem = "x86_64-linux"; ci = { - version = "v0.6"; + version = "v0.7"; gh-actions = { enable = true; - export = true; }; }; @@ -27,28 +26,6 @@ in { #extra-sandbox-paths = with channels.cipkgs; map (package: builtins.unsafeDiscardStringContext "${package}?") [bash qemu "/run/binfmt"]; }; - environment.bootstrap = { - archbinfmt = let - makeQemuWrapper = name: '' - mkdir -p /run/binfmt - rm -f /run/binfmt/${name}-linux - cat > /run/binfmt/${name}-linux << 'EOF' - #!${channels.cipkgs.bash}/bin/sh - exec -- ${channels.cipkgs.qemu}/bin/qemu-${name} "$@" - EOF - chmod +x /run/binfmt/${name}-linux - ''; - in - channels.cipkgs.writeShellScriptBin "archbinfmt" '' - ${makeQemuWrapper "aarch64"} - ${makeQemuWrapper "arm"} - echo 'extra-sandbox-paths = ${channels.cipkgs.bash} ${channels.cipkgs.qemu} /run/binfmt' >> /etc/nix/nix.conf - echo ':aarch64-linux:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/run/binfmt/aarch64-linux:' > /proc/sys/fs/binfmt_misc/register - echo ':armv6l-linux:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/run/binfmt/arm-linux:' > /proc/sys/fs/binfmt_misc/register - echo ':armv7l-linux:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/run/binfmt/arm-linux:' > /proc/sys/fs/binfmt_misc/register - ''; - }; - gh-actions = { on = let paths = [ @@ -69,15 +46,6 @@ in { } ]; }; - jobs = mkIf (config.id != "ci") { - ${config.id}.step.architectures = { - order = 201; - name = "prepare for emulated builds"; - run = '' - sudo $(which archbinfmt) - ''; - }; - }; }; channels = { diff --git a/ci/nodes.nix b/ci/nodes.nix index a9dce17d..1b2e3eea 100644 --- a/ci/nodes.nix +++ b/ci/nodes.nix @@ -11,10 +11,9 @@ with lib; { nixpkgs.args.localSystem = "x86_64-linux"; ci = { - version = "v0.6"; + version = "v0.7"; gh-actions = { enable = true; - export = true; }; }; channels.nixfiles.path = ../.; @@ -25,40 +24,6 @@ with lib; { #extra-sandbox-paths = with channels.cipkgs; map (package: builtins.unsafeDiscardStringContext "${package}?") [bash qemu "/run/binfmt"]; }; - gh-actions = { - jobs = mkIf (config.id != "ci") { - ${config.id}.step.architectures = { - order = 201; - name = "prepare for emulated builds"; - run = '' - sudo $(which archbinfmt) - ''; - }; - }; - }; - - environment.bootstrap = { - archbinfmt = let - makeQemuWrapper = name: '' - mkdir -p /run/binfmt - rm -f /run/binfmt/${name}-linux - cat > /run/binfmt/${name}-linux << 'EOF' - #!${channels.cipkgs.bash}/bin/sh - exec -- ${channels.cipkgs.qemu}/bin/qemu-${name} "$@" - EOF - chmod +x /run/binfmt/${name}-linux - ''; - in - channels.cipkgs.writeShellScriptBin "archbinfmt" '' - ${makeQemuWrapper "aarch64"} - ${makeQemuWrapper "arm"} - echo 'extra-sandbox-paths = ${channels.cipkgs.bash} ${channels.cipkgs.qemu} /run/binfmt' >> /etc/nix/nix.conf - echo ':aarch64-linux:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/run/binfmt/aarch64-linux:' > /proc/sys/fs/binfmt_misc/register - echo ':armv6l-linux:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/run/binfmt/arm-linux:' > /proc/sys/fs/binfmt_misc/register - echo ':armv7l-linux:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/run/binfmt/arm-linux:' > /proc/sys/fs/binfmt_misc/register - ''; - }; - jobs = let enabledHosts = ["hakurei" "reimu" "aya" "tei" "mediabox" "ct"]; in diff --git a/flake.lock b/flake.lock index 6bccb674..7cf4a53b 100644 --- a/flake.lock +++ b/flake.lock @@ -24,16 +24,16 @@ "ci": { "flake": false, "locked": { - "lastModified": 1702334111, - "narHash": "sha256-BLk0GUHGSxW3h35nlRjXzb3tKFC2rq29PLGMNxMtlVc=", + "lastModified": 1707782685, + "narHash": "sha256-1in0xT0MKHZn/1jrNMUp7rbVCgVj79HF0Fmao1IsTE0=", "owner": "arcnmx", "repo": "ci", - "rev": "1176d85875516e5dcff58333feb46f570187c4da", + "rev": "fc284b03f16fa9cb82ca93bdef8106866f1d7287", "type": "github" }, "original": { "owner": "arcnmx", - "ref": "v0.6", + "ref": "v0.7", "repo": "ci", "type": "github" } diff --git a/flake.nix b/flake.nix index 23035011..3b5b459c 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ url = "github:chessai/nix-std"; }; ci = { - url = "github:arcnmx/ci/v0.6"; + url = "github:arcnmx/ci/v0.7"; flake = false; }; flake-compat = {