diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/.github/workflows/ci.yml | 22 | ||||
| -rwxr-xr-x | src/tools/miri/ci/ci.sh | 5 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml index c5979e18a3b..ec14fffc1d0 100644 --- a/src/tools/miri/.github/workflows/ci.yml +++ b/src/tools/miri/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: include: - os: ubuntu-latest host_target: x86_64-unknown-linux-gnu - - os: macos-latest - host_target: x86_64-apple-darwin + - os: macos-14 + host_target: aarch64-apple-darwin - os: windows-latest host_target: i686-pc-windows-msvc runs-on: ${{ matrix.os }} @@ -49,15 +49,16 @@ jobs: with: path: | # Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>. - ~/.cargo/bin + # Cache package/registry information ~/.cargo/registry/index ~/.cargo/registry/cache ~/.cargo/git/db - # contains package information of crates installed via `cargo install`. + # Cache installed binaries + ~/.cargo/bin ~/.cargo/.crates.toml ~/.cargo/.crates2.json - key: ${{ runner.os }}-cargo-reset20230315-${{ hashFiles('**/Cargo.lock') }} - restore-keys: ${{ runner.os }}-cargo-reset20230315 + key: cargo-${{ runner.os }}-reset20240331-${{ hashFiles('**/Cargo.lock') }} + restore-keys: cargo-${{ runner.os }}-reset20240331 - name: Install rustup-toolchain-install-master if: ${{ steps.cache.outputs.cache-hit != 'true' }} @@ -98,15 +99,16 @@ jobs: with: path: | # Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>. - ~/.cargo/bin + # Cache package/registry information ~/.cargo/registry/index ~/.cargo/registry/cache ~/.cargo/git/db - # contains package information of crates installed via `cargo install`. + # Cache installed binaries + ~/.cargo/bin ~/.cargo/.crates.toml ~/.cargo/.crates2.json - key: ${{ runner.os }}-cargo-reset20230315-${{ hashFiles('**/Cargo.lock') }} - restore-keys: ${{ runner.os }}-cargo-reset20230315 + key: cargo-${{ runner.os }}-reset20240331-${{ hashFiles('**/Cargo.lock') }} + restore-keys: cargo-${{ runner.os }}-reset20240331 - name: Install rustup-toolchain-install-master if: ${{ steps.cache.outputs.cache-hit != 'true' }} diff --git a/src/tools/miri/ci/ci.sh b/src/tools/miri/ci/ci.sh index 32b58547d7c..f8ba612750e 100755 --- a/src/tools/miri/ci/ci.sh +++ b/src/tools/miri/ci/ci.sh @@ -135,6 +135,7 @@ case $HOST_TARGET in # Extra tier 1 MIRI_TEST_TARGET=i686-unknown-linux-gnu run_tests MIRI_TEST_TARGET=aarch64-unknown-linux-gnu run_tests + MIRI_TEST_TARGET=x86_64-apple-darwin run_tests MIRI_TEST_TARGET=i686-pc-windows-gnu run_tests MIRI_TEST_TARGET=x86_64-pc-windows-gnu run_tests # Extra tier 2 @@ -150,8 +151,8 @@ case $HOST_TARGET in # Custom target JSON file MIRI_TEST_TARGET=tests/avr.json MIRI_NO_STD=1 run_tests_minimal no_std ;; - x86_64-apple-darwin) - # Host + aarch64-apple-darwin) + # Host (tier 2) GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests # Extra tier 1 MIRI_TEST_TARGET=x86_64-pc-windows-msvc CARGO_MIRI_ENV=1 run_tests |