Skip to content

Commit

Permalink
Reapply local changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
danielwippermann committed Oct 17, 2023
1 parent a59c949 commit 5997c24
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 62 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ permissions:
contents: read
on:
push:
branches: [main]
# branches: [main]
pull_request:
# Spend CI time only on latest ref: https://github.com/jonhoo/rust-ci-conf/pull/5
concurrency:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
# https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
strategy:
matrix:
msrv: ["1.56.1"] # 2021 edition requires 1.56
msrv: ["1.60.0"] # 2021 edition requires 1.56, once_cell requires 1.60.0
name: ubuntu / ${{ matrix.msrv }}
steps:
- uses: actions/checkout@v4
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/nostd.yml

This file was deleted.

62 changes: 31 additions & 31 deletions .github/workflows/safety.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ permissions:
contents: read
on:
push:
branches: [main]
# branches: [main]
pull_request:
# Spend CI time only on latest ref: https://github.com/jonhoo/rust-ci-conf/pull/5
concurrency:
Expand Down Expand Up @@ -46,33 +46,33 @@ jobs:
env:
LSAN_OPTIONS: "suppressions=lsan-suppressions.txt"
RUSTFLAGS: "-Z sanitizer=leak"
miri:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- run: |
echo "NIGHTLY=nightly-$(curl -s https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu/miri)" >> $GITHUB_ENV
- name: Install ${{ env.NIGHTLY }}
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.NIGHTLY }}
components: miri
- name: cargo miri test
run: cargo miri test
env:
MIRIFLAGS: ""
loom:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
- name: cargo test --test loom
run: cargo test --release --test loom
env:
LOOM_MAX_PREEMPTIONS: 2
RUSTFLAGS: "--cfg loom"
# miri:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# with:
# submodules: true
# - run: |
# echo "NIGHTLY=nightly-$(curl -s https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu/miri)" >> $GITHUB_ENV
# - name: Install ${{ env.NIGHTLY }}
# uses: dtolnay/rust-toolchain@master
# with:
# toolchain: ${{ env.NIGHTLY }}
# components: miri
# - name: cargo miri test
# run: cargo miri test
# env:
# MIRIFLAGS: ""
# loom:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# with:
# submodules: true
# - name: Install stable
# uses: dtolnay/rust-toolchain@stable
# - name: cargo test --test loom
# run: cargo test --release --test loom
# env:
# LOOM_MAX_PREEMPTIONS: 2
# RUSTFLAGS: "--cfg loom"
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ permissions:
contents: read
on:
push:
branches: [main]
# branches: [main]
pull_request:
# Spend CI time only on latest ref: https://github.com/jonhoo/rust-ci-conf/pull/5
concurrency:
Expand Down

0 comments on commit 5997c24

Please sign in to comment.