Merge #886

886: Clean up CI config r=taiki-e a=taiki-e - Use dtolnay/rust-toolchain action - Use cargo-minimal-versions to minimal versions check - Add macOS to CI (x86_64 and aarch64) - Fix CachePadded doctest on arm Closes #642 Fixes #668 Co-authored-by: Taiki Endo <te316e89@gmail.com>
crossbeam-rs · Jul 23, 2022 · 7181f02 · 7181f02
2 parents 361deed + 3d5f8f8
commit 7181f02
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 43 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -7,7 +7,7 @@ env:
   RUSTFLAGS: -D warnings
   RUSTUP_MAX_RETRIES: '10'
 
-test_task:
+linux_task:
   name: test (aarch64-unknown-linux-gnu)
   env:
     TARGET: aarch64-unknown-linux-gnu
@@ -18,3 +18,22 @@ test_task:
   test_script:
     - cargo test --all --all-features --exclude benchmarks -- --test-threads=1
     - cargo test --all --all-features --exclude benchmarks --release -- --test-threads=1
+
+macos_task:
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
+  matrix:
+    - name: test (aarch64-apple-darwin)
+      env:
+        TARGET: aarch64-apple-darwin
+    - name: test (x86_64-apple-darwin)
+      env:
+        TARGET: x86_64-apple-darwin
+  setup_script:
+    - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain nightly
+    - source $HOME/.cargo/env
+    - rustup toolchain add nightly-$TARGET && rustup default nightly-$TARGET
+  test_script:
+    - source $HOME/.cargo/env
+    - cargo test --all --all-features --exclude benchmarks -- --test-threads=1
+    - cargo test --all --all-features --exclude benchmarks --release -- --test-threads=1
diff --git a/.github/bors.toml b/.github/bors.toml
@@ -1,4 +1,6 @@
 status = [
     "ci",
     "test (aarch64-unknown-linux-gnu)",
+    "test (aarch64-apple-darwin)",
+    "test (x86_64-apple-darwin)",
 ]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,6 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # aarch64/x86_64 macOS and aarch64 linux are tested on Cirrus CI
         include:
           - rust: '1.38'
             os: ubuntu-latest
@@ -45,27 +46,21 @@ jobs:
             os: windows-latest
           - rust: nightly
             os: ubuntu-latest
-          # TODO: https://github.com/crossbeam-rs/crossbeam/pull/518#issuecomment-633342606
-          # - rust: nightly
-          #   os: macos-latest
           - rust: nightly
             os: windows-latest
           - rust: nightly
             os: ubuntu-latest
             target: i686-unknown-linux-gnu
-          - rust: nightly
-            os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
           # Test 32-bit target that does not have AtomicU64/AtomicI64.
           - rust: nightly
             os: ubuntu-latest
             target: mips-unknown-linux-gnu
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        # --no-self-update is necessary because the windows environment cannot self-update rustup.exe.
-        run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
+      - uses: dtolnay/rust-toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
       - name: Install cross
         uses: taiki-e/install-action@cross
         if: matrix.target != ''
@@ -85,8 +80,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
+      - uses: dtolnay/rust-toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
       - name: Install cargo-hack
         uses: taiki-e/install-action@cargo-hack
       - name: Check features
@@ -97,10 +93,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        run: rustup update nightly && rustup default nightly
+      - uses: dtolnay/rust-toolchain@nightly
       - name: Install cargo-hack
         uses: taiki-e/install-action@cargo-hack
+      - name: Install cargo-minimal-versions
+        uses: taiki-e/install-action@cargo-minimal-versions
       - name: dependency tree check
         run: ./ci/dependencies.sh
 
@@ -112,8 +109,7 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        run: rustup update nightly && rustup default nightly
+      - uses: dtolnay/rust-toolchain@nightly
       - run: ci/no_atomic.sh
       - run: git add -N . && git diff --exit-code
         if: github.repository_owner != 'crossbeam-rs' || github.event_name != 'schedule'
@@ -145,8 +141,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        run: rustup update stable
+      - uses: dtolnay/rust-toolchain@stable
       - name: rustfmt
         run: ./ci/rustfmt.sh
 
@@ -155,8 +150,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        run: rustup update stable
+      - uses: dtolnay/rust-toolchain@stable
       - name: clippy
         run: ./ci/clippy.sh
 
@@ -165,8 +159,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        run: rustup toolchain install nightly --component miri && rustup default nightly
+      - uses: dtolnay/rust-toolchain@miri
       - name: miri
         run: ./ci/miri.sh
 
@@ -175,8 +168,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        run: rustup update nightly && rustup default nightly
+      - uses: dtolnay/rust-toolchain@nightly
       - name: Run sanitizers
         run: ./ci/san.sh
 
@@ -185,8 +177,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        run: rustup update stable
+      - uses: dtolnay/rust-toolchain@stable
       - name: loom
         run: ./ci/crossbeam-epoch-loom.sh
 
@@ -195,8 +186,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust
-        run: rustup update nightly && rustup default nightly
+      - uses: dtolnay/rust-toolchain@nightly
       - name: docs
         run: ./ci/docs.sh
 
@@ -228,6 +218,7 @@ jobs:
       - san
       - loom
       - docs
+      - shellcheck
     runs-on: ubuntu-latest
     steps:
       - name: Mark the job as a success

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,10 +9,6 @@ on:
       - crossbeam-[0-9]+.*
       - crossbeam-[a-z]+-[0-9]+.*
 
-env:
-  RUSTFLAGS: -Dwarnings
-  RUST_BACKTRACE: 1
-
 defaults:
   run:
     shell: bash

diff --git a/ci/dependencies.sh b/ci/dependencies.sh
@@ -7,10 +7,4 @@ cargo tree
 cargo tree --duplicate
 
 # Check minimal versions.
-# Remove dev-dependencies from Cargo.toml to prevent the next `cargo update`
-# from determining minimal versions based on dev-dependencies.
-cargo hack --remove-dev-deps --workspace
-# Update Cargo.lock to minimal version dependencies.
-cargo update -Zminimal-versions
-cargo tree
-cargo hack check --all --all-features --exclude benchmarks
+cargo minimal-versions build --workspace --all-features --exclude benchmarks
diff --git a/ci/rustfmt.sh b/ci/rustfmt.sh
@@ -5,4 +5,4 @@ cd "$(dirname "$0")"/..
 
 rustup component add rustfmt
 
-cargo fmt --all -- --check
+cargo fmt --all --check
diff --git a/crossbeam-utils/src/cache_padded.rs b/crossbeam-utils/src/cache_padded.rs
@@ -39,9 +39,9 @@ use core::ops::{Deref, DerefMut};
 /// let addr1 = &*array[0] as *const i8 as usize;
 /// let addr2 = &*array[1] as *const i8 as usize;
 ///
-/// assert!(addr2 - addr1 >= 64);
-/// assert_eq!(addr1 % 64, 0);
-/// assert_eq!(addr2 % 64, 0);
+/// assert!(addr2 - addr1 >= 32);
+/// assert_eq!(addr1 % 32, 0);
+/// assert_eq!(addr2 % 32, 0);
 /// ```
 ///
 /// When building a concurrent queue with a head and a tail index, it is wise to place them in