Skip to content

Commit

Permalink
chore: use a variable for "nightly", use a fixed nightly version for now
Browse files Browse the repository at this point in the history
This nightly version avoids triggering the errors from dalek-cryptography/curve25519-dalek#618
  • Loading branch information
hko-s committed Feb 6, 2024
1 parent 3015840 commit e747f30
Showing 1 changed file with 20 additions and 19 deletions.
39 changes: 20 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
env:
RUST_BACKTRACE: 1
RUSTFLAGS: -Dwarnings
RUST_NIGHTLY: nightly-2024-02-03


jobs:
Expand All @@ -18,7 +19,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
rust: [nightly, beta, stable]
rust: [$RUST_NIGHTLY, beta, stable]

steps:
- name: Checkout
Expand All @@ -40,7 +41,7 @@ jobs:

- name: check nightly
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: check
args: --features nightly --all --bins --examples --tests
Expand All @@ -55,14 +56,14 @@ jobs:

- name: check bench
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: check
args: --benches

- name: check asm
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: check
args: --features asm
Expand All @@ -75,14 +76,14 @@ jobs:

- name: nightly
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: test
args: --all --features nightly

- name: asm
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: test
args: --all --features asm
Expand All @@ -95,14 +96,14 @@ jobs:

- name: nightly ignored
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: test
args: --all --features nightly --release -- --ignored

- name: asm ignored
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: test
args: --all --features asm --release -- --ignored
Expand All @@ -114,7 +115,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
rust: [nightly, beta, stable]
rust: [$RUST_NIGHTLY, beta, stable]
target:
- x86_64-pc-windows-gnu
# FIXME
Expand Down Expand Up @@ -142,7 +143,7 @@ jobs:

- name: check nightly
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: check
args: --features nightly --all --bins --examples --tests --target ${{ matrix.target }}
Expand All @@ -156,15 +157,15 @@ jobs:

- name: check bench
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: check
target: ${{ matrix.target }}
args: --benches

- name: check asm
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly' && matrix.target == 'x86_64-pc-windows-gnu'
if: matrix.rust == '$RUST_NIGHTLY' && matrix.target == 'x86_64-pc-windows-gnu'
with:
command: check
args: --features asm --target ${{ matrix.target }}
Expand All @@ -177,15 +178,15 @@ jobs:

- name: nightly
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: test
args: --all --features nightly --target ${{ matrix.target }}

# FIXME
# - name: asm
# uses: actions-rs/cargo@v1
# if: matrix.rust == 'nightly' && matrix.target == 'x86_64-pc-windows-gnu'
# if: matrix.rust == '$RUST_NIGHTLY' && matrix.target == 'x86_64-pc-windows-gnu'
# with:
# command: test
# args: --all --features asm --target ${{ matrix.target }}
Expand All @@ -198,15 +199,15 @@ jobs:

- name: nightly ignored
uses: actions-rs/cargo@v1
if: matrix.rust == 'nightly'
if: matrix.rust == '$RUST_NIGHTLY'
with:
command: test
args: --all --features nightly --target ${{ matrix.target }} --release -- --ignored

# FIXME
# - name: asm ignored
# uses: actions-rs/cargo@v1
# if: matrix.rust == 'nightly' && matrix.target == 'x86_64-pc-windows-gnu'
# if: matrix.rust == '$RUST_NIGHTLY' && matrix.target == 'x86_64-pc-windows-gnu'
# with:
# command: test
# args: --all --features asm --target ${{ matrix.target }} --release -- --ignored
Expand Down Expand Up @@ -249,7 +250,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [nightly, beta, stable]
rust: [$RUST_NIGHTLY, beta, stable]

steps:
- uses: actions/checkout@master
Expand Down Expand Up @@ -282,7 +283,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
toolchain: $RUST_NIGHTLY
override: true
components: rustfmt

Expand All @@ -304,7 +305,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
toolchain: $RUST_NIGHTLY
override: true
components: clippy
- uses: actions-rs/clippy-check@v1
Expand Down

0 comments on commit e747f30

Please sign in to comment.