Skip to content

Commit

Permalink
ci: tweak gh workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
phoenix-ru committed Oct 29, 2023
1 parent 1ad7649 commit b27d5ad
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 23 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/code-spell-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: "16"
# - uses: actions/setup-node@v3
# with:
# node-version: 20

- name: Run Spell Check
shell: bash
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,13 @@ jobs:
remove-android: 'true'
remove-haskell: 'true'
- uses: actions/checkout@v3
- name: Install Rust
uses: oxidecomputer/actions-rs_toolchain@oxide/master
# - name: Install Rust
# uses: oxidecomputer/actions-rs_toolchain@oxide/master
- name: Cache rust artifacts
uses: Swatinem/rust-cache@v2
with:
shared-key: cargo-test-code-coverage-grcov

- uses: actions/setup-node@v3
with:
node-version: 16

- run: rustup component add llvm-tools-preview
- run: cargo install grcov
- run: CARGO_INCREMENTAL=0 RUSTFLAGS='-Cinstrument-coverage' LLVM_PROFILE_FILE='cargo-test-%p-%m.profraw' cargo test --tests
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/playground.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Playground
name: Build playground

on:
push:
Expand All @@ -11,7 +11,6 @@ env:

jobs:
build:

runs-on: ubuntu-latest

permissions:
Expand Down
24 changes: 13 additions & 11 deletions .github/workflows/rust-test.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
name: CI
name: Tests
on:
push:
branches: [ "master" ]
pull_request:
branches:
- master
branches: [ "master" ]

jobs:
cargo-check:
name: Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Rust
uses: oxidecomputer/actions-rs_toolchain@oxide/master
# - name: Install Rust
# uses: oxidecomputer/actions-rs_toolchain@oxide/master
- name: Cache rust artifacts
uses: Swatinem/rust-cache@v2
with:
shared-key: cargo-check

- name: Run cargo check
run: cargo check --color always --all --all-targets

cargo-test:
name: Test - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand All @@ -31,14 +33,14 @@ jobs:
- windows-latest
steps:
- uses: actions/checkout@v3
- name: Install Rust
uses: oxidecomputer/actions-rs_toolchain@oxide/master
with:
profile: minimal
# - name: Install Rust
# uses: oxidecomputer/actions-rs_toolchain@oxide/master
# with:
# profile: minimal
- name: Cache rust artifacts
uses: Swatinem/rust-cache@v2
with:
shared-key: cargo-test-release-${{ matrix.os }}
shared-key: cargo-test-${{ matrix.os }}

- name: Run cargo test
run: cargo test --release --tests
run: cargo test
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2023-03-20"
# channel = "nightly-2023-03-20"
components = ["clippy", "rustfmt"]

0 comments on commit b27d5ad

Please sign in to comment.