Skip to content

Commit

Permalink
Merge pull request #19 from moia-oss/bump-nightly2
Browse files Browse the repository at this point in the history
use other toolchain, bump nightly
  • Loading branch information
jankeu authored Feb 17, 2023
2 parents 3124e57 + 38d4275 commit 776944c
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 28 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@ on:
jobs:
udeps:
name: Check for unused dependencies
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions-rs/[email protected]
- run: |
echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
echo "RUST_TOOLCHAIN_NIGHTLY=$(cat ./rust-toolchain-nightly)" >> $GITHUB_ENV
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-09-22
override: true
- run: cargo install cargo-udeps
- uses: Swatinem/rust-cache@v1
toolchain: ${{ env.RUST_TOOLCHAIN_NIGHTLY }}
- name: Cargo Install
run: cargo install cargo-udeps
- uses: Swatinem/rust-cache@v2
with:
sharedKey: debug-build-nightly
shared-key: debug-build-nightly
- run: make udeps
42 changes: 22 additions & 20 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
name: PR
name: pr

on:
pull_request:
branches: ['*']
on: [pull_request]

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions-rs/[email protected]
- run: echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
- uses: dtolnay/rust-toolchain@master
with:
override: true
toolchain: ${{ env.RUST_TOOLCHAIN }}
components: rustfmt, clippy
- uses: Swatinem/rust-cache@v1
- uses: Swatinem/rust-cache@v2
with:
sharedKey: debug-build
- run: make test
shared-key: debug-build
- name: Make test
run: make test
lint:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions-rs/[email protected]
- run: |
echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
echo "RUST_TOOLCHAIN_NIGHTLY=$(cat ./rust-toolchain-nightly)" >> $GITHUB_ENV
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-01-26
override: true
toolchain: ${{ env.RUST_TOOLCHAIN_NIGHTLY }}
components: rustfmt
- uses: actions-rs/toolchain@v1.0.7
- uses: dtolnay/rust-toolchain@master
with:
override: true
toolchain: ${{ env.RUST_TOOLCHAIN }}
components: rustfmt, clippy
- uses: Swatinem/rust-cache@v1
- uses: Swatinem/rust-cache@v2
with:
sharedKey: debug-build-nightly
- run: make lint

shared-key: debug-build-nightly
- name: Make lint
run: make lint
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RUST_NIGHTLY_VERSION := nightly-2023-01-26
RUST_NIGHTLY_VERSION := $(shell cat rust-toolchain-nightly)
GRCOV_VERSION := 0.8.13

install-nightly:
Expand Down
1 change: 1 addition & 0 deletions rust-toolchain-nightly
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nightly-2023-02-16

0 comments on commit 776944c

Please sign in to comment.