More

mozilla · Sep 24, 2024 · 70b419e · 70b419e
1 parent f3942fe
commit 70b419e
Showing 1 changed file with 12 additions and 27 deletions.
diff --git a/.github/workflows/check-vm.yml b/.github/workflows/check-vm.yml
@@ -44,12 +44,12 @@ jobs:
           usesh: true
           copyback: false
           prepare: |
-            pkg install -y rust bash
-            # curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+            pkg install -y bash ninja python gyp
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
+              sh -s -- --profile minimal --default-toolchain stable
           run: |
             export NSS_DIR=$(pwd)/nss
             export NSS_TARGET=Debug
-            env | sort
             cargo check --all-targets --features ci
             RUST_LOG=trace cargo test --features ci --no-fail-fast
 
@@ -59,12 +59,12 @@ jobs:
           usesh: true
           copyback: false
           prepare: |
-            pkg_add rust bash
-            # curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+            pkg_add bash ninja python gyp
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
+              sh -s -- --profile minimal --default-toolchain stable
           run: |
             export NSS_DIR=$(pwd)/nss
             export NSS_TARGET=Debug
-            env | sort
             cargo check --all-targets --features ci
             RUST_LOG=trace cargo test --features ci --no-fail-fast
 
@@ -74,12 +74,12 @@ jobs:
           usesh: true
           copyback: false
           prepare: |
-            /usr/sbin/pkg_add rust bash
-            # curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+            /usr/sbin/pkg_add bash ninja python gyp
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
+              sh -s -- --profile minimal --default-toolchain stable
           run: |
             export NSS_DIR=$(pwd)/nss
             export NSS_TARGET=Debug
-            env | sort
             cargo check --all-targets --features ci
             RUST_LOG=trace cargo test --features ci --no-fail-fast
 
@@ -89,26 +89,11 @@ jobs:
           usesh: true
           copyback: false
           prepare: |
-            pkg install rust bash
-            # curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+            pkg install bash ninja python gyp
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
+              sh -s -- --profile minimal --default-toolchain stable
           run: |
             export NSS_DIR=$(pwd)/nss
             export NSS_TARGET=Debug
-            env | sort
             cargo check --all-targets --features ci
             RUST_LOG=trace cargo test --features ci --no-fail-fast
-
-      # - name: Run client/server transfer
-      #   run: |
-      #     cargo build --bin neqo-client --bin neqo-server
-      #     "target/debug/neqo-server" "$HOST:4433" &
-      #     PID=$!
-      #     # Give the server time to start.
-      #     sleep 1
-      #     "target/debug/neqo-client" --output-dir . "https://$HOST:4433/$SIZE"
-      #     kill $PID
-      #     [ "$(wc -c <"$SIZE")" -eq "$SIZE" ] || exit 1
-      #   env:
-      #     HOST: localhost
-      #     SIZE: 54321
-      #     RUST_LOG: warn