feat: Pin Rust CI to 1.80.0 (#270)

* Pin rust to 1.80.0 * debug: print installed * install windows gnu * debug: remove debug line
crate-crypto · Sep 24, 2024 · 8a76c5c · 8a76c5c
1 parent 27760b1
commit 8a76c5c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/release-csharp-bindings.yml b/.github/workflows/release-csharp-bindings.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: 1.80.0
           target: ${{ matrix.target }}
       - name: Install cargo-binstall
         uses: taiki-e/install-action@cargo-binstall

diff --git a/.github/workflows/release-java-bindings.yml b/.github/workflows/release-java-bindings.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: 1.80.0
           targets: ${{ matrix.target }}
       - name: Install cargo-binstall
         uses: taiki-e/install-action@cargo-binstall

diff --git a/.github/workflows/release-node-bindings.yml b/.github/workflows/release-node-bindings.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: 1.80.0
           targets: ${{ matrix.settings.target }}
 
       # llvm-preview-tools are needed for xwin, because we are compiling assembly (blst)

diff --git a/.github/workflows/release-rust-crates.yml b/.github/workflows/release-rust-crates.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Setup toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: 1.80.0
           target: ${{ matrix.target }}
 
       - name: Build
@@ -76,7 +76,7 @@ jobs:
       - name: Setup toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: 1.80.0
 
       # These steps are in a specific order so crate dependencies are updated first
       - name: Publish maybe_rayon

diff --git a/.github/workflows/test-golang-bindings.yml b/.github/workflows/test-golang-bindings.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: 1.80.0
 
       - name: Run compile script
         run: ./scripts/compile.sh golang

diff --git a/.github/workflows/test-nim-bindings.yml b/.github/workflows/test-nim-bindings.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: 1.80.0
 
       - name: Run compile script
         run: ./scripts/compile.sh nim

diff --git a/scripts/compile.sh b/scripts/compile.sh
@@ -11,6 +11,12 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 OS=$(uname)
 ARCH=$(uname -m)
 
+# For windows, we install x86_64-pc-windows-gnu, instead of relying on the msvc version
+if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" || "$OSTYPE" == "cygwin" || "$OSTYPE" == "mingw"* ]]; then
+    echo "Installing x86_64-pc-windows-gnu target for Rust..."
+    rustup target add x86_64-pc-windows-gnu
+fi
+
 # Function to compile for Java
 compile_java() {
     echo "Compiling for Java..."