diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d20203..65cc732 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,32 +23,15 @@ jobs: - name: Fetch source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Nix - uses: cachix/install-nix-action@v16 - with: - nix_path: nixpkgs=channel:nixos-21.05 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Configure Nix substituters - run: | - set -xe - mkdir -p ~/.config/nix/ - cp ./.github/nix.conf ~/.config/nix/ + uses: cachix/install-nix-action@v22 - name: Use cachix - uses: cachix/cachix-action@v10 + uses: cachix/cachix-action@v12 with: name: holochain-ci - - - name: Prepare Nix environment - run: | - nix-env -iA cachix -f https://cachix.org/api/v1/install - cachix use holochain-ci - nix-shell --command "echo Completed" - - name: run-tests run: | - cd $GITHUB_WORKSPACE - nix-shell . --run "npm ci && npm run test" + nix develop --command npm install + nix develop --command npm ci + nix develop --command npm run test diff --git a/flake.lock b/flake.lock index cca2bd7..6a6cf17 100644 --- a/flake.lock +++ b/flake.lock @@ -74,6 +74,22 @@ "type": "github" } }, + "empty": { + "flake": false, + "locked": { + "lastModified": 1683792623, + "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", + "owner": "steveej", + "repo": "empty", + "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", + "type": "github" + }, + "original": { + "owner": "steveej", + "repo": "empty", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -139,12 +155,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -159,22 +178,20 @@ "cargo-rdme": "cargo-rdme", "crane": "crane", "crate2nix": "crate2nix", + "empty": "empty", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "holochain": [ "holochain", - "versions", - "holochain" + "empty" ], "lair": [ "holochain", - "versions", - "lair" + "empty" ], "launcher": [ "holochain", - "versions", - "launcher" + "empty" ], "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", @@ -182,17 +199,18 @@ "rust-overlay": "rust-overlay_2", "scaffolding": [ "holochain", - "versions", - "scaffolding" + "empty" ], - "versions": "versions" + "versions": [ + "versions" + ] }, "locked": { - "lastModified": 1678895419, - "narHash": "sha256-KEQlBArDxYKzZiFB6SkCa71ilKoUPpXUA2/iXSAzvEk=", + "lastModified": 1692140385, + "narHash": "sha256-myB5UrBsrosCQvX7DCssv4WFF94HVjCYWs5NKAM+Cws=", "owner": "holochain", "repo": "holochain", - "rev": "ed3c844672a42a8eb881ca2457513c90da5f1219", + "rev": "323d94faab28cd6c002ab20d20853560b59500e0", "type": "github" }, "original": { @@ -204,16 +222,16 @@ "holochain_2": { "flake": false, "locked": { - "lastModified": 1675455504, - "narHash": "sha256-619bpPtO0IUSzPzLNzHERuvqGblpjO65rsw3jdxoEkQ=", + "lastModified": 1686257124, + "narHash": "sha256-SvXGHOr96ob/NfQCeVJ2J4LWc83qkZn+/pnE9qVNB+I=", "owner": "holochain", "repo": "holochain", - "rev": "ed5b7bb461c2a8bfd4d2633bad604a20b8f2da03", + "rev": "db5b8b27da3bf296958c3bf54ac3950dc60a39c8", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.1.3", + "ref": "holochain-0.1.5", "repo": "holochain", "type": "github" } @@ -221,16 +239,16 @@ "lair": { "flake": false, "locked": { - "lastModified": 1670953460, - "narHash": "sha256-cqOr7iWzsNeomYQiiFggzG5Dr4X0ysnTkjtA8iwDLAQ=", + "lastModified": 1682356264, + "narHash": "sha256-5ZYJ1gyyL3hLR8hCjcN5yremg8cSV6w1iKCOrpJvCmc=", "owner": "holochain", "repo": "lair", - "rev": "cbfbefefe43073904a914c8181a450209a74167b", + "rev": "43be404da0fd9d57bf4429c44def405bd6490f61", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.2.3", + "ref": "lair_keystore-v0.2.4", "repo": "lair", "type": "github" } @@ -269,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678654296, - "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=", + "lastModified": 1686869522, + "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b", + "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", "type": "github" }, "original": { @@ -322,7 +340,8 @@ "nixpkgs": [ "holochain", "nixpkgs" - ] + ], + "versions": "versions" } }, "rust-overlay": { @@ -361,11 +380,11 @@ ] }, "locked": { - "lastModified": 1678847038, - "narHash": "sha256-69Tqu2GHOo/naYe2GHUFlyUOs5xC3eHc1Gyru/WShps=", + "lastModified": 1692065371, + "narHash": "sha256-1uKLJT89aDS2IlT5oM9vOe6yL34teNvs+b6DZNA5RAM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "35f8293d6e58d14c6255d40be7bed3389d08701a", + "rev": "4ea85def89eceac6b5e327fd3628dcb9ba5add2e", "type": "github" }, "original": { @@ -377,11 +396,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1677514461, - "narHash": "sha256-xflYnH6whXRqXFAqY2MHVXTWWcesn9OzZuyNhdXjsgo=", + "lastModified": 1692137048, + "narHash": "sha256-YfW4pthiUXJbP0ribr0fvCo9P/cB7xfhpB8MwfQ/JLI=", "owner": "holochain", "repo": "scaffolding", - "rev": "c245d306110f3a5408f1dbe15d6a3725884ef3f4", + "rev": "104a269d91c8935ded04c44f950b055b0ad39f94", "type": "github" }, "original": { @@ -391,6 +410,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "versions": { "inputs": { "holochain": "holochain_2", @@ -400,11 +434,11 @@ }, "locked": { "dir": "versions/0_1", - "lastModified": 1679465852, - "narHash": "sha256-NPTidQcJn6XTmGXxN9ue2DEJqzcgmTzGtmmi8KITVJc=", + "lastModified": 1692140385, + "narHash": "sha256-myB5UrBsrosCQvX7DCssv4WFF94HVjCYWs5NKAM+Cws=", "owner": "holochain", "repo": "holochain", - "rev": "f6e8935c46f68f4a5ed6400838afa6a99b62e276", + "rev": "323d94faab28cd6c002ab20d20853560b59500e0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fe9ac21..72e8f27 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,10 @@ inputs = { nixpkgs.follows = "holochain/nixpkgs"; + versions.url = "github:holochain/holochain/?dir=versions/0_1"; holochain = { url = "github:holochain/holochain"; - inputs.versions.url = "github:holochain/holochain/?dir=versions/0_1"; + inputs.versions.follows = "versions"; }; }; @@ -32,4 +33,4 @@ }; }; }; -} \ No newline at end of file +}