diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c1c313d..772d29c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,24 +1,36 @@ name: "CI" + on: push: branches: - master pull_request: + workflow_dispatch: + jobs: + configure: - runs-on: self-hosted + runs-on: x86_64-linux outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - uses: actions/checkout@v4 - id: set-matrix - run: echo "matrix=$(nixci gh-matrix --systems=aarch64-linux,aarch64-darwin | jq -c .)" >> $GITHUB_OUTPUT + run: echo "matrix=$(nixci gh-matrix --systems=x86_64-linux,x86_64-darwin,aarch64-darwin | jq -c .)" >> $GITHUB_OUTPUT + nix: - runs-on: self-hosted + runs-on: ${{ matrix.system }} + permissions: + contents: read needs: configure strategy: matrix: ${{ fromJson(needs.configure.outputs.matrix) }} fail-fast: false steps: - uses: actions/checkout@v4 - - run: nixci build --systems "github:nix-systems/${{ matrix.system }}" .#default.${{ matrix.subflake}} + - run: | + nixci \ + --extra-access-tokens "github.com=${{ secrets.GITHUB_TOKEN }}" \ + build \ + --systems "github:nix-systems/${{ matrix.system }}" \ + .#default.${{ matrix.subflake}} diff --git a/dev/flake.nix b/dev/flake.nix index 833980e..3e5131f 100644 --- a/dev/flake.nix +++ b/dev/flake.nix @@ -20,7 +20,7 @@ programs.nixpkgs-fmt.enable = true; }; devShells.default = pkgs.mkShell { - # cf. https://community.flake.parts/haskell-flake#composing-devshells + # cf. https://community.flake.parts/haskell-flake/devshell#composing-devshells inputsFrom = [ config.treefmt.build.devShell ]; diff --git a/doc/flake.lock b/doc/flake.lock index 84aecc0..d65bf0e 100644 --- a/doc/flake.lock +++ b/doc/flake.lock @@ -11,11 +11,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1717022817, - "narHash": "sha256-PHyHgQL5/b0+A/kmNCHVOM/WSJSGe1jZ+LFWfYNx31E=", + "lastModified": 1717947583, + "narHash": "sha256-vN/pfiAzYH4i3cUb5pLqkXgPoAPtaxjUXv5aRpbKShU=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "c6c1ca5b9ceaaa40fd979fb25bb7043adf4554ad", + "rev": "4551006c2807ab361ea4db5e171afb4798da4fc2", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "services-flake": "services-flake" }, "locked": { - "lastModified": 1717704560, - "narHash": "sha256-KWEmyfAqRNRr7UG//zz8AMEusmZ4mfmuAYmKSYOtDNw=", + "lastModified": 1719086977, + "narHash": "sha256-6FSuhdg6wRBEXhV4PSaXvgeG5XRgcygy4HhrDn0tlM4=", "owner": "flake-parts", "repo": "community.flake.parts", - "rev": "f08e69c563d09c1fa9e7c5d80b5edb249bbe48ce", + "rev": "d4096a735618337db3d2869de83849cc7bb9989b", "type": "github" }, "original": { @@ -1012,11 +1012,11 @@ "treefmt-nix": "treefmt-nix_5" }, "locked": { - "lastModified": 1717879746, - "narHash": "sha256-NL0LppO6TrQaK75RVHaBW/6WTvk1HlLemzepsISgjyo=", + "lastModified": 1719089459, + "narHash": "sha256-va+220WFHXVioP1fwP08AdeP0b/raVcAIcKbtDuGXP4=", "owner": "hercules-ci", "repo": "flake.parts-website", - "rev": "4050c8fe047785cace8ebd328a95968634b94874", + "rev": "21e34b7855974026e33f1f4833d19ec3867f8f8c", "type": "github" }, "original": { @@ -1529,11 +1529,11 @@ "haskell-flake_3": { "flake": false, "locked": { - "lastModified": 1717339509, - "narHash": "sha256-ySll9pAYK78v8GY5wrCFLg2iMI6Ms/4tNfrvlMaUQ1M=", + "lastModified": 1718915291, + "narHash": "sha256-6CToXT/jcbYBi3EMAZZtyPj14NsMbdAwq+ZeQtfu5P0=", "owner": "srid", "repo": "haskell-flake", - "rev": "cfb7db6b7b66cb7d1499dd53b8aeaa7c866f565f", + "rev": "3f76199d42d55e3a36bf8e8e0544e715d6a3f007", "type": "github" }, "original": { @@ -1574,11 +1574,11 @@ }, "haskell-flake_6": { "locked": { - "lastModified": 1717339509, - "narHash": "sha256-ySll9pAYK78v8GY5wrCFLg2iMI6Ms/4tNfrvlMaUQ1M=", + "lastModified": 1718915291, + "narHash": "sha256-6CToXT/jcbYBi3EMAZZtyPj14NsMbdAwq+ZeQtfu5P0=", "owner": "srid", "repo": "haskell-flake", - "rev": "cfb7db6b7b66cb7d1499dd53b8aeaa7c866f565f", + "rev": "3f76199d42d55e3a36bf8e8e0544e715d6a3f007", "type": "github" }, "original": { @@ -1702,11 +1702,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1713898448, - "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", + "lastModified": 1718018037, + "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", + "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", "type": "github" }, "original": { @@ -1721,11 +1721,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1713898448, - "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", + "lastModified": 1718018037, + "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", + "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", "type": "github" }, "original": { @@ -1821,11 +1821,11 @@ "mission-control": { "flake": false, "locked": { - "lastModified": 1713251031, - "narHash": "sha256-gqp9YGqg5cc5fGmc+qM7YGEg8UANGJbwj+nnGk5K1/o=", + "lastModified": 1718815759, + "narHash": "sha256-hzLbxU580EaxKmkbQkiaMF3NoIzrcmVryGul5WSQatA=", "owner": "Platonic-Systems", "repo": "mission-control", - "rev": "beb45a1d7fbd9c56233763ba568a09f1c5a9262d", + "rev": "db5e2cc39c6799b301412d69182b9221c65146a8", "type": "github" }, "original": { @@ -1836,11 +1836,11 @@ }, "mission-control_2": { "locked": { - "lastModified": 1713251031, - "narHash": "sha256-gqp9YGqg5cc5fGmc+qM7YGEg8UANGJbwj+nnGk5K1/o=", + "lastModified": 1718815759, + "narHash": "sha256-hzLbxU580EaxKmkbQkiaMF3NoIzrcmVryGul5WSQatA=", "owner": "Platonic-Systems", "repo": "mission-control", - "rev": "beb45a1d7fbd9c56233763ba568a09f1c5a9262d", + "rev": "db5e2cc39c6799b301412d69182b9221c65146a8", "type": "github" }, "original": { @@ -1934,11 +1934,11 @@ "treefmt": "treefmt" }, "locked": { - "lastModified": 1717827120, - "narHash": "sha256-z2LAGGjRk7sYfotKLdNWmJLdGRplwgzLBD38z9h9Qcg=", + "lastModified": 1719036783, + "narHash": "sha256-lMITB8KabGyvcqs5wVfEsnZ/xJjuMG0mZ5bFeIpct/c=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "9f50064e88ec062e1993d16b03297bfb23ece750", + "rev": "1b6813a0b86878118f92291cff2e314945e4e8f7", "type": "github" }, "original": { @@ -2023,11 +2023,11 @@ "nixos-flake": { "flake": false, "locked": { - "lastModified": 1716406291, - "narHash": "sha256-qHjJ6alc4o3p51hrPp3JGdC5Pbz5EjF+UZq1HbK8av0=", + "lastModified": 1719079946, + "narHash": "sha256-A3JUcPH00buqBgjmi0lWUZIql9+8Y7CMSXGoUXcm+yk=", "owner": "srid", "repo": "nixos-flake", - "rev": "aa9100167350cbdffaa272b0fd382d7c23606b86", + "rev": "6335b2f05f007b95ac2438b0a55498f9f20e73f7", "type": "github" }, "original": { @@ -2210,11 +2210,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718447546, + "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "842253bf992c3a7157b67600c2857193f126563a", "type": "github" }, "original": { @@ -2682,11 +2682,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -2743,11 +2743,11 @@ "process-compose-flake": { "flake": false, "locked": { - "lastModified": 1717682476, - "narHash": "sha256-EjmlQSBs6XxsOEk7KQSpk2m/mkRtUpH++jZQix2jFgE=", + "lastModified": 1718031437, + "narHash": "sha256-+RrlkAVZx0QhyeHAGFJnjST+/7Dc3zsDU3zAKXoDXaI=", "owner": "Platonic-Systems", "repo": "process-compose-flake", - "rev": "8a6fae467d4862f2be9aa2954ab2d1e324c399f4", + "rev": "9344fac44edced4c686721686a6ad904d067c546", "type": "github" }, "original": { @@ -2758,16 +2758,15 @@ }, "process-compose-flake_2": { "locked": { - "lastModified": 1671746418, - "narHash": "sha256-pcPALqEFSlAz+68SStQPoy9eT13dJ+tOe4OJbJCGToQ=", - "owner": "hercules-ci", + "lastModified": 1718031437, + "narHash": "sha256-+RrlkAVZx0QhyeHAGFJnjST+/7Dc3zsDU3zAKXoDXaI=", + "owner": "Platonic-systems", "repo": "process-compose-flake", - "rev": "2bd5ac6649dc124c7a51fcf3db97c43cb7683ed4", + "rev": "9344fac44edced4c686721686a6ad904d067c546", "type": "github" }, "original": { - "owner": "hercules-ci", - "ref": "fix-docs", + "owner": "Platonic-systems", "repo": "process-compose-flake", "type": "github" } @@ -2834,11 +2833,11 @@ "rust-overlay": { "flake": false, "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "lastModified": 1719022649, + "narHash": "sha256-ZDS8x9XpFeSBs9gMTHoujKWPn+i9ecqE9NWEUF07Yuc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "rev": "ff019b65a656d36dca3e57b43c40c44eec7852c5", "type": "github" }, "original": { @@ -2850,11 +2849,11 @@ "services-flake": { "flake": false, "locked": { - "lastModified": 1717690185, - "narHash": "sha256-vqcKZxgBPhF7lGZdMGlzHKTMAboDK9D6SFrusME+6UY=", + "lastModified": 1719006490, + "narHash": "sha256-BHiV/z8pufVLi7ibDXbkYWBQh+P2fKyutp+ch8+iRPc=", "owner": "juspay", "repo": "services-flake", - "rev": "eb3bac5543951d06f79424f6c619a966c8c3d671", + "rev": "c371cd53829e973a7dd0d065d183c68b26203c27", "type": "github" }, "original": { @@ -3053,11 +3052,11 @@ ] }, "locked": { - "lastModified": 1717278143, - "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { @@ -3163,11 +3162,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1717850719, - "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { diff --git a/example/flake.lock b/example/flake.lock index 7186038..76121aa 100644 --- a/example/flake.lock +++ b/example/flake.lock @@ -20,11 +20,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1717339509, - "narHash": "sha256-ySll9pAYK78v8GY5wrCFLg2iMI6Ms/4tNfrvlMaUQ1M=", + "lastModified": 1718915291, + "narHash": "sha256-6CToXT/jcbYBi3EMAZZtyPj14NsMbdAwq+ZeQtfu5P0=", "owner": "srid", "repo": "haskell-flake", - "rev": "cfb7db6b7b66cb7d1499dd53b8aeaa7c866f565f", + "rev": "3f76199d42d55e3a36bf8e8e0544e715d6a3f007", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717774105, - "narHash": "sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI=", + "lastModified": 1718983919, + "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d226935fd75012939397c83f6c385e4d6d832288", + "rev": "90338afd6177fc683a04d934199d693708c85a3b", "type": "github" }, "original": {