diff --git a/.github/workflows/nodes.yml b/.github/workflows/nodes.yml index e4747c39..47936349 100644 --- a/.github/workflows/nodes.yml +++ b/.github/workflows/nodes.yml @@ -199,6 +199,63 @@ jobs: command: ci-build-cache quiet: false stdin: ${{ runner.temp }}/ci.build.cache + rinnosuke: + name: nodes-rinnosuke + runs-on: ubuntu-latest + steps: + - id: checkout + name: git clone + uses: actions/checkout@v1 + with: + submodules: false + - id: nix-install + name: nix install + uses: arcnmx/ci/actions/nix/install@master + - id: ci-setup + name: nix setup + uses: arcnmx/ci/actions/nix/run@master + with: + attrs: ci.job.rinnosuke.run.bootstrap + quiet: false + - id: ci-dirty + name: nix test dirty + uses: arcnmx/ci/actions/nix/run@master + with: + attrs: ci.job.rinnosuke.run.test + command: ci-build-dirty + quiet: false + stdout: ${{ runner.temp }}/ci.build.dirty + - id: ci-test + name: nix test build + uses: arcnmx/ci/actions/nix/run@master + with: + attrs: ci.job.rinnosuke.run.test + command: ci-build-realise + ignore-exit-code: true + quiet: false + stdin: ${{ runner.temp }}/ci.build.dirty + - env: + CI_EXIT_CODE: ${{ steps.ci-test.outputs.exit-code }} + id: ci-summary + name: nix test results + uses: arcnmx/ci/actions/nix/run@master + with: + attrs: ci.job.rinnosuke.run.test + command: ci-build-summarise + quiet: false + stdin: ${{ runner.temp }}/ci.build.dirty + stdout: ${{ runner.temp }}/ci.build.cache + - env: + CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }} + id: ci-cache + if: always() + name: nix test cache + uses: arcnmx/ci/actions/nix/run@master + with: + attrs: ci.job.rinnosuke.run.test + command: ci-build-cache + quiet: false + stdin: ${{ runner.temp }}/ci.build.cache samhain: name: nodes-samhain runs-on: ubuntu-latest diff --git a/nix/sources.json b/nix/sources.json index 4fd25fbb..cb046109 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -41,10 +41,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "102a67055b8fe55e247f57639da12a5bef13f610", - "sha256": "039kk45r6pqsfd865lgfiwbaqlpll4p9pmndbzhi6l5w5r8dbabm", + "rev": "6c0362ccf22565d687a0cbc37ec409ca8e5eb2e4", + "sha256": "19rhvwpy66ncf72jd2vchqzs5mgbcs32hsvlbnkhyy3ys449i361", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/102a67055b8fe55e247f57639da12a5bef13f610.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/6c0362ccf22565d687a0cbc37ec409ca8e5eb2e4.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "hexchen": { @@ -65,10 +65,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "84d54402a5dcd5f5561f1273db0781d8e96df229", - "sha256": "1nzlcv9sp3vm127qwb0c4r800gwi8x6lnaizh53d46ccpc3m70aw", + "rev": "f637e145d758ab183d3dba096c9312eae8bc0c7c", + "sha256": "031iascpzdpm8ps38lc24a5vjbmdfv8xv3ds589hw9n8jrzh8idp", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/84d54402a5dcd5f5561f1273db0781d8e96df229.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/f637e145d758ab183d3dba096c9312eae8bc0c7c.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -147,10 +147,10 @@ "homepage": "https://nur.nix-community.org/", "owner": "nix-community", "repo": "NUR", - "rev": "30b11824891d4a0761db48f58c0f7365ff8ef251", - "sha256": "1rgihfadyknb387yqbdfrag51h67m21xmij0g1fll74fjdpqfi7s", + "rev": "f8670abd9473a8a3fb555c5499dda63e0f72f946", + "sha256": "1x23g52671cp0qxyjg8y2l2xzk702gxhar6iw0n7rs8fffnap45z", "type": "tarball", - "url": "https://github.com/nix-community/NUR/archive/30b11824891d4a0761db48f58c0f7365ff8ef251.tar.gz", + "url": "https://github.com/nix-community/NUR/archive/f8670abd9473a8a3fb555c5499dda63e0f72f946.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "tf-nix": { diff --git a/shell.nix b/shell.nix index 59714461..c91a2b4e 100644 --- a/shell.nix +++ b/shell.nix @@ -25,37 +25,37 @@ let ''; nf-actions = pkgs.writeShellScriptBin "nf-actions" '' export START_DIR="$PWD" - cd ${toString ./.} + cd "${toString ./.}" export NF_CONFIG_ROOT=${toString ./.}/ci NF_CONFIG_FILES=($NF_CONFIG_ROOT/{nodes,niv-cron}.nix) for f in "''${NF_CONFIG_FILES[@]}"; do echo $f - nix run --arg config $f ci.run.gh-actions-generate + nix run --argstr config "$f" ci.run.gh-actions-generate done - cd ${toString ./config/trusted} + cd "${toString ./config/trusted}" export TRUSTED_CONFIG_ROOT=${toString ./config/trusted}/ci TRUSTED_CONFIG_FILES=($TRUSTED_CONFIG_ROOT/nodes.nix) for f in "''${TRUSTED_CONFIG_FILES[@]}"; do echo $f - nix run --arg config $f ci.run.gh-actions-generate + nix run --argstr config "$f" ci.run.gh-actions-generate done cd $START_DIR ''; nf-actions-test = pkgs.writeShellScriptBin "nf-actions-test" '' export START_DIR="$PWD" - cd ${toString ./.} + cd "${toString ./.}" export NF_CONFIG_ROOT=${toString ./.}/ci NF_CONFIG_FILES=($NF_CONFIG_ROOT/{nodes,niv-cron}.nix) for f in "''${NF_CONFIG_FILES[@]}"; do echo $f - nix run --arg config $f ci.test + nix run --argstr config "$f" ci.test done - cd ${toString ./config/trusted} + cd "${toString ./config/trusted}" export TRUSTED_CONFIG_ROOT=${toString ./config/trusted}/ci TRUSTED_CONFIG_FILES=($TRUSTED_CONFIG_ROOT/nodes.nix) for f in "''${TRUSTED_CONFIG_FILES[@]}"; do echo $f - nix run --arg config $f ci.test + nix run --argstr config "$f" ci.test done cd $START_DIR '';