Skip to content

Commit d3eb8ae

Browse files
authored
Merge pull request #99 from eqtylab/fix-nix-setup
Fix nix setup
2 parents 9ea25f2 + 7b6fb6d commit d3eb8ae

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

.github/workflows/ci-full.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,14 @@ jobs:
154154
- uses: Swatinem/rust-cache@v2
155155
- run: cargo clippy --all-targets --all-features -- -D warnings
156156

157+
nix:
158+
name: Nix Build
159+
runs-on: ubuntu-latest
160+
steps:
161+
- uses: actions/checkout@v4
162+
- uses: eqtylab-actions/install-nix-action@v31
163+
- run: nix build .#cupcake-cli -L
164+
157165
fmt:
158166
name: Format
159167
runs-on: ubuntu-latest

flake.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
targets = [ "wasm32-unknown-unknown" ];
2424
};
2525

26-
rust = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain).override rust-config;
26+
rust = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override rust-config;
2727

2828
craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rust;
2929

@@ -56,8 +56,9 @@
5656
filter =
5757
let
5858
regoFilter = path: _type: builtins.match ".*rego$" path != null;
59+
ymlFilter = path: _type: builtins.match ".*yml$" path != null;
5960
in
60-
path: _type: (regoFilter path _type) || (craneLib.filterCargoSources path _type);
61+
path: _type: (regoFilter path _type) || (ymlFilter path _type) || (craneLib.filterCargoSources path _type);
6162
};
6263
});
6364

0 commit comments

Comments
 (0)