Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update loom to 0.4 #452

Merged
merged 2 commits into from Dec 22, 2020
Merged

Update loom to 0.4 #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4529aaf
Update loom to 0.4
taiki-e Dec 22, 2020
d56a53b
Update nightly toolchain to 2020-12-17
taiki-e Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -75,14 +75,11 @@ jobs:
# Nightly
nightly:
name: nightly
env:
# Pin nightly to avoid being impacted by breakage
RUST_VERSION: nightly-2019-09-25
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update $RUST_VERSION && rustup default $RUST_VERSION
run: rustup update $nightly && rustup default $nightly
- name: Test
run: . ci/test-stable.sh test

Expand Down Expand Up @@ -130,14 +127,11 @@ jobs:
# Loom
loom:
name: loom
env:
# Pin nightly to avoid being impacted by breakage
RUST_VERSION: nightly-2020-05-19
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update $RUST_VERSION && rustup default $RUST_VERSION
run: rustup update $nightly && rustup default $nightly
- name: Loom tests
run: RUSTFLAGS="--cfg loom -Dwarnings" cargo test --lib

Expand All @@ -150,6 +144,8 @@ jobs:
- nightly
- minrust
- cross
- tsan
- loom
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Expand Up @@ -32,4 +32,4 @@ serde = { version = "1.0.60", optional = true, default-features = false, feature
serde_test = "1.0"

[target.'cfg(loom)'.dev-dependencies]
loom = "0.3"
loom = "0.4"