Skip to content

Commit a3a504d

Browse files
committed
Update rust to 1.57; test profile with opt-level = 2
1 parent 74d7fd2 commit a3a504d

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ edition = "2021"
77
[workspace]
88
members = ["path_filter"]
99

10+
[profile.test]
11+
opt-level = 2
12+
1013
[dependencies]
1114
libc = "0.2.28"
1215
nix = "0.11.0"

Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ with-docker: downloads
1717

1818
release: downloads vagga-release
1919

20+
build-test: downloads vagga-build-test
21+
2022
vagga:
2123
cargo build --target=x86_64-unknown-linux-musl
2224
cp --remove-destination target/x86_64-unknown-linux-musl/debug/vagga .
@@ -25,6 +27,10 @@ vagga-release:
2527
cargo build --target=x86_64-unknown-linux-musl --release
2628
cp --remove-destination target/x86_64-unknown-linux-musl/release/vagga .
2729

30+
vagga-build-test:
31+
cargo build --target=x86_64-unknown-linux-musl --profile=test
32+
cp --remove-destination target/x86_64-unknown-linux-musl/release/vagga .
33+
2834
downloads: apk busybox alpine-keys.apk
2935

3036
alpine/MIRRORS.txt apk busybox alpine-keys: ./fetch_binaries.sh

vagga.yaml

+10-5
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ containers:
1919
- !Install [file] # dependency of checkinstall (bug #46)
2020

2121
- !TarInstall
22-
url: "https://static.rust-lang.org/dist/rust-1.56.0-x86_64-unknown-linux-gnu.tar.gz"
22+
url: "https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-gnu.tar.gz"
2323
script: "./install.sh --prefix=/usr --components=rustc,rust-std-x86_64-unknown-linux-gnu,cargo"
2424
- !TarInstall
25-
url: "https://static.rust-lang.org/dist/rust-std-1.56.0-x86_64-unknown-linux-musl.tar.gz"
25+
url: "https://static.rust-lang.org/dist/rust-std-1.57.0-x86_64-unknown-linux-musl.tar.gz"
2626
script: "./install.sh --prefix=/musl \
2727
--components=rust-std-x86_64-unknown-linux-musl"
2828
- !Sh 'ln -s /musl/lib/rustlib/x86_64-unknown-linux-musl /usr/lib/rustlib/x86_64-unknown-linux-musl'
2929
- !Install [musl-tools]
3030
- !TarInstall
31-
url: "https://static.rust-lang.org/dist/rust-std-1.56.0-wasm32-unknown-unknown.tar.gz"
31+
url: "https://static.rust-lang.org/dist/rust-std-1.57.0-wasm32-unknown-unknown.tar.gz"
3232
script: "./install.sh --prefix=/usr --components=rust-std-wasm32-unknown-unknown"
3333
- &bulk !Tar
3434
url: "https://github.com/tailhook/bulk/releases/download/v0.4.9/bulk-v0.4.9.tar.gz"
@@ -58,10 +58,10 @@ containers:
5858
- !Sh dpkg --add-architecture armhf
5959
- !Install [musl-dev:armhf]
6060
- !TarInstall
61-
url: "https://static.rust-lang.org/dist/rust-1.56.0-x86_64-unknown-linux-gnu.tar.gz"
61+
url: "https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-gnu.tar.gz"
6262
script: "./install.sh --prefix=/usr --components=rustc,rust-std-x86_64-unknown-linux-gnu,cargo"
6363
- !TarInstall
64-
url: "https://static.rust-lang.org/dist/rust-std-1.56.0-arm-unknown-linux-musleabihf.tar.gz"
64+
url: "https://static.rust-lang.org/dist/rust-std-1.57.0-arm-unknown-linux-musleabihf.tar.gz"
6565
script: "./install.sh --prefix=/usr \
6666
--components=rust-std-arm-unknown-linux-musleabihf"
6767

@@ -125,6 +125,11 @@ commands:
125125
container: rust-musl
126126
run: [make, release]
127127

128+
make-test: !Command
129+
description: Build vagga for tests
130+
container: rust-musl
131+
run: [make, build-test]
132+
128133
make-arm: !Command
129134
description: Cross-compile vagga for arm
130135
container: musleabihf

0 commit comments

Comments
 (0)