Skip to content

Commit

Permalink
Merge the changes from master into my package version feature branch
Browse files Browse the repository at this point in the history
This merge commit is only necessary as there is a single merge conflict
in `src/commands/source/download.rs` and I don't want to rebase my long
running feature branch that reworks/improves/fixes the logic around
`PackageVersion` and `PackageVersionConstraint`.

Ideally GitHub could handle this but I currently can only choose between
this additional merge commit or merging it manually (bypassing our
branch protections to enforce CI).

Signed-off-by: Michael Weiss <[email protected]>
  • Loading branch information
primeos-work committed Jan 9, 2025
2 parents 9296e91 + f7c68cb commit bf44089
Show file tree
Hide file tree
Showing 23 changed files with 1,025 additions and 736 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install toolchain
uses: dtolnay/rust-toolchain@v1
with:
toolchain: 1.78.0 # MSRV
toolchain: 1.80.0 # MSRV
components: rustfmt

- name: Run cargo fmt
Expand All @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
rust:
- 1.78.0 # MSRV
- 1.80.0 # MSRV
- stable
- beta

Expand All @@ -53,7 +53,7 @@ jobs:
strategy:
matrix:
rust:
- 1.78.0 # MSRV
- 1.80.0 # MSRV
- stable
- beta
steps:
Expand Down Expand Up @@ -81,12 +81,13 @@ jobs:
- advisories
- bans licenses sources

# Prevent sudden announcement of a new advisory from failing ci:
# Prevent sudden announcement of a new advisory from failing CI:
continue-on-error: ${{ matrix.checks == 'advisories' }}

steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
# https://github.com/EmbarkStudios/cargo-deny-action:
- uses: EmbarkStudios/cargo-deny-action@v2
with:
command: check ${{ matrix.checks }}

Expand All @@ -99,7 +100,7 @@ jobs:
fail-fast: false
matrix:
include:
- rust: 1.78.0 # MSRV
- rust: 1.80.0 # MSRV
optional: false
- rust: beta
optional: true
Expand Down
Loading

0 comments on commit bf44089

Please sign in to comment.