diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 762d48f83..ecb1cf869 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -20,10 +20,18 @@ jobs: with: submodules: recursive - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 with: nix_path: nixpkgs=channel:nixos-unstable + - name: Remove non-nix binary + run: rm -rf ~/.cargo/bin + + - name: Clippy cargo-sewup + run: nix develop --ignore-environment -c cargo clippy -p cargo-sewup + env: + RUST_BACKTRACE: 1 + - name: Init default project test run: nix develop -c 'cli-init-test' default diff --git a/.github/workflows/crate.yml b/.github/workflows/crate.yml index 3efdbde9d..bfdbb072d 100644 --- a/.github/workflows/crate.yml +++ b/.github/workflows/crate.yml @@ -28,12 +28,20 @@ jobs: VALIDATE_RUST_2018: true GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 with: nix_path: nixpkgs=channel:nixos-unstable + - name: Remove non-nix binary + run: rm -rf ~/.cargo/bin + + - name: Clippy sewup + run: nix develop -c cargo clippy -p sewup + env: + RUST_BACKTRACE: 1 + - name: Default feature test - run: nix develop -c 'cargo' test -p sewup --features=default + run: nix develop -c cargo test -p sewup --features=default - name: RDB feature test - run: nix develop -c 'cargo' test -p sewup --features=rdb --no-default-features + run: nix develop -c cargo test -p sewup --features=rdb --no-default-features diff --git a/.github/workflows/derive.yml b/.github/workflows/derive.yml index 951d84ba2..9bbac7f7f 100644 --- a/.github/workflows/derive.yml +++ b/.github/workflows/derive.yml @@ -20,9 +20,17 @@ jobs: with: submodules: recursive - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 with: nix_path: nixpkgs=channel:nixos-unstable + - name: Remove non-nix binary + run: rm -rf ~/.cargo/bin + + - name: Clippy sewup-derive + run: nix develop --ignore-environment -c cargo clippy -p sewup-derive + env: + RUST_BACKTRACE: 1 + - name: Derive test - run: nix develop -c 'cargo' test -p sewup-derive + run: nix develop -c cargo test -p sewup-derive diff --git a/flake.lock b/flake.lock index 883e0b340..c39381ed8 100644 --- a/flake.lock +++ b/flake.lock @@ -32,17 +32,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1638097282, - "narHash": "sha256-EXCzj9b8X/lqDPJapxZThIOKL5ASbpsJZ+8L1LnY1ig=", - "owner": "NixOS", + "lastModified": 1638535497, + "narHash": "sha256-tk5LNbdkUhALp00+r5ZmQ3t7n2d5M7YUQB+MznWvVOg=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "78cb77b29d37a9663e05b61abb4fa09465da4b70", + "rev": "c71f061c68ba8ce53471b767d5049cbd0f3d8490", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { @@ -74,11 +75,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1638152159, - "narHash": "sha256-Q0UHsm36cCxk16I/bF1rHJHxjIflESKk2ej76P39j90=", + "lastModified": 1638757066, + "narHash": "sha256-EkWnmOLc3/8xGDOGhIau4v0EUZ9emEpXJZyOVoryDh8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d9a664513558376595e838b21348cdac0ba3115e", + "rev": "96f1bd1ec11d9c9e8b41c7560df9efae8d091908", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ea287bfc1..769a01383 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { - nixpkgs.url = "nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; rust-overlay.url = "github:oxalica/rust-overlay"; flake-utils.url = "github:numtide/flake-utils"; };