pin an older nightly

This allows us to enable the underlying "c" feature, which is failing to build on current nightlies. See related issues: BLAKE3-team/BLAKE3#56 BLAKE3-team/BLAKE3#57 rust-lang/rust#68905
oconnor663 · Mar 4, 2020 · 56bf3d1 · 56bf3d1
1 parent a297e4f
commit 56bf3d1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -8,16 +8,16 @@ on:
 
 jobs:
   tests:
-    name: python${{ matrix.python-version }}-${{ matrix.target.python-architecture }} ${{ matrix.target.os }}
-    runs-on: ${{ matrix.target.os }}
+    name: python${{ matrix.python-version }}-${{ matrix.platform.python-architecture }} ${{ matrix.platform.os }}
+    runs-on: ${{ matrix.platform.os }}
     strategy:
       matrix:
         python-version: [3.5, 3.6, 3.7, 3.8]
-        target: [
-          { "os": "ubuntu-latest",  "python-architecture": "x64", rust-toolchain: "nightly" },
-          { "os": "macOS-latest",   "python-architecture": "x64", rust-toolchain: "nightly" },
-          { "os": "windows-latest", "python-architecture": "x64", rust-toolchain: "nightly-x86_64-pc-windows-msvc" },
-          { "os": "windows-latest", "python-architecture": "x86", rust-toolchain: "nightly-i686-pc-windows-msvc" },
+        platform: [
+          { os: "ubuntu-latest",  python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
+          { os: "macOS-latest",   python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
+          { os: "windows-latest", python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc" },
+          { os: "windows-latest", python-architecture: "x86", rust-target: "i686-pc-windows-msvc" },
         ]
       fail-fast: false
     steps:
@@ -26,13 +26,12 @@ jobs:
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
-          architecture: ${{ matrix.target.python-architecture }}
+          architecture: ${{ matrix.platform.python-architecture }}
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.target.rust-toolchain }}
           profile: minimal
-          override: true
+      - run: rustup set default-host ${{ matrix.platform.rust-target }}
       - name: build.py
         run: python -u build.py
       - name: test.py

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -7,16 +7,16 @@ on:
 
 jobs:
   wheel:
-    name: python${{ matrix.python-version }}-${{ matrix.target.python-architecture }} ${{ matrix.target.os }}
-    runs-on: ${{ matrix.target.os }}
+    name: python${{ matrix.python-version }}-${{ matrix.platform.python-architecture }} ${{ matrix.platform.os }}
+    runs-on: ${{ matrix.platform.os }}
     strategy:
       matrix:
         python-version: [3.5, 3.6, 3.7, 3.8]
-        target: [
-          { "os": "ubuntu-latest",  "python-architecture": "x64", rust-toolchain: "nightly" },
-          { "os": "macOS-latest",   "python-architecture": "x64", rust-toolchain: "nightly" },
-          { "os": "windows-latest", "python-architecture": "x64", rust-toolchain: "nightly-x86_64-pc-windows-msvc" },
-          { "os": "windows-latest", "python-architecture": "x86", rust-toolchain: "nightly-i686-pc-windows-msvc" },
+        platform: [
+          { os: "ubuntu-latest",  python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
+          { os: "macOS-latest",   python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
+          { os: "windows-latest", python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc" },
+          { os: "windows-latest", python-architecture: "x86", rust-target: "i686-pc-windows-msvc" },
         ]
       fail-fast: false
     steps:
@@ -25,13 +25,12 @@ jobs:
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
-          architecture: ${{ matrix.target.python-architecture }}
+          architecture: ${{ matrix.platform.python-architecture }}
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.target.rust-toolchain }}
           profile: minimal
-          override: true
+      - run: rustup set default-host ${{ matrix.platform.rust-target }}
       - name: install maturin
         run: pip install maturin
       - name: build wheel

diff --git a/Cargo.toml b/Cargo.toml
@@ -17,11 +17,8 @@ edition = "2018"
 [lib]
 crate-type = ["cdylib"]
 
-[features]
-c = ["blake3/c"]
-
 [dependencies]
-blake3 = { version = "0.2.2", features = ["rayon"] }
+blake3 = { version = "0.2.2", features = ["c", "rayon"] }
 pyo3 = { version = "0.9.0-alpha.1", features = ["extension-module"] }
 arrayref = "0.3.6"
 hex = "0.4.2"
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly
+nightly-2020-02-05