Skip to content

Commit

Permalink
simplify CI
Browse files Browse the repository at this point in the history
  • Loading branch information
robjtede committed Apr 2, 2023
1 parent 8dee8a1 commit 97399e8
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Install ${{ matrix.version }}
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
toolchain: ${{ matrix.version }}
profile: minimal
override: true

Expand Down
36 changes: 10 additions & 26 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ jobs:
name: ${{ matrix.target.name }} / ${{ matrix.version }}
runs-on: ${{ matrix.target.os }}

env:
CI: 1
CARGO_INCREMENTAL: 0
env: {}

steps:
- uses: actions/checkout@v3
Expand All @@ -43,12 +41,10 @@ jobs:
if: matrix.target.os == 'windows-latest'
run: echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append

- name: Install ${{ matrix.version }}
uses: actions-rs/toolchain@v1
- name: Install Rust (${{ matrix.version }})
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
profile: minimal
override: true
toolchain: ${{ matrix.version }}

- name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack
Expand All @@ -60,12 +56,6 @@ jobs:
cargo add [email protected] --dev -p=actix-web
cargo add [email protected] --dev -p=awc
- name: Generate Cargo.lock
uses: actions-rs/cargo@v1
with: { command: generate-lockfile }
- name: Cache Dependencies
uses: Swatinem/[email protected]

- name: workaround MSRV issues
if: matrix.version != 'stable'
run: |
Expand Down Expand Up @@ -104,12 +94,9 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: dtolnay/rust-toolchain@stable

- name: Generate Cargo.lock
run: cargo generate-lockfile
- name: Cache Dependencies
uses: Swatinem/[email protected]
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: nightly }

- name: tests (io-uring)
timeout-minutes: 60
Expand All @@ -123,12 +110,9 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: dtolnay/rust-toolchain@nightly

- name: Generate Cargo.lock
run: cargo generate-lockfile
- name: Cache Dependencies
uses: Swatinem/[email protected]
- name: Install Rust (nightly)
uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: nightly }

- name: doc tests
run: cargo ci-doctest
Expand Down
13 changes: 4 additions & 9 deletions .github/workflows/clippy-fmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,11 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1
with: { components: clippy }

- name: Generate Cargo.lock
run: cargo generate-lockfile
- name: Cache Dependencies
uses: Swatinem/[email protected]

- name: Check with Clippy
uses: actions-rs/clippy-check@v1
- uses: giraffate/clippy-action@v1
with:
args: --workspace --tests --examples --all-features
token: ${{ secrets.GITHUB_TOKEN }}
reporter: 'github-pr-check'
github_token: ${{ secrets.GITHUB_TOKEN }}
clippy_flags: --workspace --all-features --tests --examples --bins -- -Dclippy::todo

lint-docs:
runs-on: ubuntu-latest
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install stable
uses: actions-rs/toolchain@v1
with:
toolchain: stable-x86_64-unknown-linux-gnu
profile: minimal
override: true

- name: Generate Cargo.lock
uses: actions-rs/cargo@v1
with: { command: generate-lockfile }
- name: Cache Dependencies
uses: Swatinem/[email protected]
- uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: nightly }

- name: Generate coverage file
run: |
Expand Down

0 comments on commit 97399e8

Please sign in to comment.