Update rust to 1.57; test profile with opt-level = 2

tailhook · Dec 21, 2021 · a3a504d · a3a504d
1 parent 74d7fd2
commit a3a504d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,9 @@ edition = "2021"
 [workspace]
 members = ["path_filter"]
 
+[profile.test]
+opt-level = 2
+
 [dependencies]
 libc = "0.2.28"
 nix = "0.11.0"

diff --git a/Makefile b/Makefile
@@ -17,6 +17,8 @@ with-docker: downloads
 
 release: downloads vagga-release
 
+build-test: downloads vagga-build-test
+
 vagga:
 	cargo build --target=x86_64-unknown-linux-musl
 	cp --remove-destination target/x86_64-unknown-linux-musl/debug/vagga .
@@ -25,6 +27,10 @@ vagga-release:
 	cargo build --target=x86_64-unknown-linux-musl --release
 	cp --remove-destination target/x86_64-unknown-linux-musl/release/vagga .
 
+vagga-build-test:
+	cargo build --target=x86_64-unknown-linux-musl --profile=test
+	cp --remove-destination target/x86_64-unknown-linux-musl/release/vagga .
+
 downloads: apk busybox alpine-keys.apk
 
 alpine/MIRRORS.txt apk busybox alpine-keys: ./fetch_binaries.sh

diff --git a/vagga.yaml b/vagga.yaml
@@ -19,16 +19,16 @@ containers:
     - !Install [file]  # dependency of checkinstall (bug #46)
 
     - !TarInstall
-      url: "https://static.rust-lang.org/dist/rust-1.56.0-x86_64-unknown-linux-gnu.tar.gz"
+      url: "https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-gnu.tar.gz"
       script: "./install.sh --prefix=/usr --components=rustc,rust-std-x86_64-unknown-linux-gnu,cargo"
     - !TarInstall
-      url: "https://static.rust-lang.org/dist/rust-std-1.56.0-x86_64-unknown-linux-musl.tar.gz"
+      url: "https://static.rust-lang.org/dist/rust-std-1.57.0-x86_64-unknown-linux-musl.tar.gz"
       script: "./install.sh --prefix=/musl \
                --components=rust-std-x86_64-unknown-linux-musl"
     - !Sh 'ln -s /musl/lib/rustlib/x86_64-unknown-linux-musl /usr/lib/rustlib/x86_64-unknown-linux-musl'
     - !Install [musl-tools]
     - !TarInstall
-      url: "https://static.rust-lang.org/dist/rust-std-1.56.0-wasm32-unknown-unknown.tar.gz"
+      url: "https://static.rust-lang.org/dist/rust-std-1.57.0-wasm32-unknown-unknown.tar.gz"
       script: "./install.sh --prefix=/usr --components=rust-std-wasm32-unknown-unknown"
     - &bulk !Tar
       url: "https://github.com/tailhook/bulk/releases/download/v0.4.9/bulk-v0.4.9.tar.gz"
@@ -58,10 +58,10 @@ containers:
     - !Sh dpkg --add-architecture armhf
     - !Install [musl-dev:armhf]
     - !TarInstall
-      url: "https://static.rust-lang.org/dist/rust-1.56.0-x86_64-unknown-linux-gnu.tar.gz"
+      url: "https://static.rust-lang.org/dist/rust-1.57.0-x86_64-unknown-linux-gnu.tar.gz"
       script: "./install.sh --prefix=/usr --components=rustc,rust-std-x86_64-unknown-linux-gnu,cargo"
     - !TarInstall
-      url: "https://static.rust-lang.org/dist/rust-std-1.56.0-arm-unknown-linux-musleabihf.tar.gz"
+      url: "https://static.rust-lang.org/dist/rust-std-1.57.0-arm-unknown-linux-musleabihf.tar.gz"
       script: "./install.sh --prefix=/usr \
                --components=rust-std-arm-unknown-linux-musleabihf"
 
@@ -125,6 +125,11 @@ commands:
     container: rust-musl
     run: [make, release]
 
+  make-test: !Command
+    description: Build vagga for tests
+    container: rust-musl
+    run: [make, build-test]
+
   make-arm: !Command
     description: Cross-compile vagga for arm
     container: musleabihf