Skip to content

Commit e46086a

Browse files
committed
Fix cargo-cross issue.
The last release is outdated and causes build-issues. This builds the latest version (untagged) from source.
1 parent 1560904 commit e46086a

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
~/.cargo/git/db/
3131
target/
3232
key: ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.lock') }}
33+
-
34+
name: Install dev dependencies
35+
run: nix-shell --command "make dev-dependencies"
3336
-
3437
name: Run tests
3538
run: nix-shell --command "make test"
@@ -58,6 +61,9 @@ jobs:
5861
~/.cargo/git/db/
5962
target/
6063
key: ${{ runner.os }}-cargo-dist-${{ hashFiles('**/Cargo.lock') }}
64+
-
65+
name: Install dev dependencies
66+
run: nix-shell --command "make dev-dependencies"
6167
-
6268
name: Build distributables
6369
run: nix-shell --command "make dist"

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,7 @@ test:
8383
# Enter the devshell.
8484
devshell:
8585
nix-shell
86+
87+
# Dependencies
88+
dev-dependencies:
89+
cargo install cross --git https://github.com/cross-rs/cross --rev 426e8110a083c1aaa8e04ed460e86f4606226619 --locked

shell.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
pkgs.mkShell {
44
buildInputs = [
55
pkgs.rustup
6-
pkgs.cargo-cross
76
pkgs.cargo-deb
7+
# pkgs.cargo-cross # this is installed using make dev-dependencies until a new release is out
88
];
9+
shellHook = ''
10+
export PATH=$PATH:~/.cargo/bin
11+
'';
912
}

0 commit comments

Comments
 (0)