Skip to content

Commit

Permalink
Merge branch 'main' into release/rustic-rs/0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
simonsan authored Sep 19, 2023
2 parents 5c851e4 + 29ce537 commit 4f7d266
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 50 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ jobs:
clippy:
name: Clippy
runs-on: ubuntu-latest

strategy:
matrix:
feature: [default]
steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
Expand All @@ -47,7 +49,7 @@ jobs:
- uses: actions-rs/clippy-check@b5b5f21f4797c02da247df37026fcd0a5024aa4d # v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-targets --all-features -- -D warnings
args: --all-targets --features ${{ matrix.feature }} -- -D warnings
name: Clippy Output

test:
Expand All @@ -56,6 +58,7 @@ jobs:
strategy:
matrix:
rust: [stable]
feature: [default]
job:
- os: macos-latest
- os: ubuntu-latest
Expand All @@ -81,7 +84,7 @@ jobs:
- uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
with:
command: test
args: -r --all-targets --all-features --workspace
args: -r --all-targets --features ${{ matrix.feature }} --workspace

docs:
name: Build docs
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/cross-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,18 @@ jobs:
fail-fast: false
matrix:
rust: [stable]
feature: [default]
job:
- os: windows-latest
os-name: windows
target: x86_64-pc-windows-msvc
architecture: x86_64
use-cross: false
- os: windows-latest
os-name: windows
target: x86_64-pc-windows-gnu
architecture: x86_64
use-cross: false
- os: macos-latest
os-name: macos
target: x86_64-apple-darwin
Expand Down Expand Up @@ -83,3 +89,5 @@ jobs:
toolchain: ${{ matrix.rust }}
target: ${{ matrix.job.target }}
use-cross: ${{ matrix.job.use-cross }}
all-features: "false"
feature: ${{ matrix.feature }}
6 changes: 6 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ jobs:
architecture: x86_64
binary-postfix: ".exe"
use-cross: false
- os: windows-latest
os-name: windows
target: x86_64-pc-windows-gnu
architecture: x86_64
binary-postfix: ".exe"
use-cross: false
- os: macos-latest
os-name: macos
target: x86_64-apple-darwin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
with:
command: test
args: -r --all-targets --all-features -p rustic-rs --test completions -- --ignored
args: --release -p rustic-rs --test completions -- --ignored
#
# FIXME: This is broken, when rustic-rs is released, we should fix it.
# semver-check:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: chainguard-dev/actions/setup-gitsign@main
- uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
- name: Install cargo-release
uses: taiki-e/install-action@de0d48bde65ea4c3b39598619c16d930abf31208 # v2
uses: taiki-e/install-action@2358ab643982f73276ef3aef08759c6cc3693530 # v2
with:
tool: cargo-release
- uses: cargo-bins/release-pr@deeacca5a38bacc74a3f444b798f4b9bba40f6ad # v2
Expand Down
Loading

0 comments on commit 4f7d266

Please sign in to comment.