Skip to content

Commit

Permalink
deps: update loom to 0.4 (#452)
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e authored Dec 22, 2020
1 parent e398b0a commit ed1d194
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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"

0 comments on commit ed1d194

Please sign in to comment.