Merge pull request #291 from posborne/fix/ci-issues

Fix CI Issues

Author: fitzgen

.github/workflows/benchmarks.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         # for now, limit this a bit
-        revision: ["main", "v25.0.0"]
+        revision: ["main", "v38.0.3"]
     env:
       REVISION: ${{ matrix.revision }}
     steps:
@@ -76,7 +76,7 @@ jobs:
       run: |
         cargo run benchmark \
         --engine=artifacts/wasmtime-main/libengine.so \
-        --engine=artifacts/wasmtime-v25.0.0/libengine.so \
+        --engine=artifacts/wasmtime-v38.0.3/libengine.so \
         --processes=4 \
         --iterations-per-process=1 \
         -- "${PARTITION_SUITE}"

.github/workflows/sightglass.yml

@@ -11,9 +11,7 @@ env:
   CARGO_TERM_COLOR: always
   RUST_LOG: info
 
-  # The Wasmtime commit that we build the bench API from for testing. Bumping
-  # this will automatically cause us to update our CI cache on the next run.
-  WASMTIME_COMMIT: "a2e71dafac4d2e42ed6edbc77081d39a40f4c3ff"
+  REVISION: "v38.0.3"
 
 jobs:
   format:
@@ -33,23 +31,27 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v4
-    - run: rustup update nightly
+    - run: rustup update
     - name: Download Cached Wasmtime engine
       uses: actions/cache@v4
       id: wasmtime-cache
       with:
         path: engines/wasmtime/*
-        key: wasmtime-${{ runner.os }}-${{ env.WASMTIME_COMMIT }}
+        key: wasmtime-${{ runner.os }}-${{ env.REVISION }}
 
     - name: Build Wasmtime engine
       if: steps.wasmtime-cache.outputs.cache-hit != 'true'
       working-directory: ./engines/wasmtime
+      env:
+        REVISION: ${{ env.REVISION }}
       run: |
            rustc build.rs
            ./build
 
     - name: Build all
-      run: cargo +nightly build --verbose --all
+      run: cargo build --verbose --all
 
     - name: Test all
-      run: cargo +nightly test --verbose --all
+      run: cargo test --verbose --all
+      env:
+        RUST_BACKTRACE: 1

Cargo.lock

@@ -9,9 +9,9 @@ RUN wget https://ziglang.org/download/0.12.0/zig-linux-x86_64-0.12.0.tar.xz
 RUN tar --extract --verbose --file=zig-linux-x86_64-0.12.0.tar.xz
 ENV PATH="${PATH}:/zig-linux-x86_64-0.12.0"
 RUN echo "zig version = $(zig version)"
-RUN wget https://github.com/jedisct1/libsodium/archive/stable.zip
-RUN unzip stable.zip
-RUN mv /libsodium-stable /libsodium
+RUN wget https://github.com/jedisct1/libsodium/releases/download/1.0.20-RELEASE/libsodium-1.0.20.tar.gz
+RUN tar -xzf libsodium-1.0.20.tar.gz
+RUN mv /libsodium-1.0.20 /libsodium
 
 # Build the benchmarks. Note how we patch the self-timing code with calls to the
 # Sightglass `bench_start()` and `bench_end()` functions. Also note that each

benchmarks/libsodium/Dockerfile

@@ -398,7 +398,10 @@ impl BenchmarkCommand {
 
             anyhow::ensure!(
                 output.status.success(),
-                "benchmark subprocess did not exit successfully"
+                "benchmark subprocess did not exit successfully: {}\nstderr: {}\nstdout: {}",
+                output.status,
+                String::from_utf8_lossy(&output.stderr),
+                String::from_utf8_lossy(&output.stdout)
             );
 
             eprintln!(".");

crates/cli/src/benchmark.rs

@@ -9,7 +9,7 @@ edition = "2021"
 anyhow = "1.0"
 libloading = "0.7"
 log = "0.4"
-precision = "0.1.15"
+precision = { git = "https://github.com/posborne/rust-precision.git", branch = "target-stable-asm" }
 serde = { version = "1.0.118", features = ["derive"] }
 sightglass-build = { path = "../build" }
 sightglass-data = { path = "../data" }