Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Min rust 160 #1279

Merged
merged 13 commits into from
Aug 17, 2022
Merged

Min rust 160 #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
05548cc
bump edition, msrv 159 and some dependencies
extrawurst Aug 15, 2022
831da33
bump some versions
extrawurst Aug 15, 2022
e368593
fix
extrawurst Aug 15, 2022
866447f
upgrade clap
extrawurst Aug 15, 2022
44a5bee
fix ci
extrawurst Aug 17, 2022
426f0d7
update dependencies
extrawurst Aug 17, 2022
f181119
cleanup
extrawurst Aug 17, 2022
d57823c
remove resolver workaround
extrawurst Aug 17, 2022
63f5512
downgrade git2 dep
extrawurst Aug 17, 2022
7baeec4
bump msrv to 1.60
extrawurst Aug 17, 2022
4167e2f
remove wix version pinning
extrawurst Aug 17, 2022
0adcf11
fix win ci
extrawurst Aug 17, 2022
492f8fe
repin wix version
extrawurst Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clippy.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
msrv = "1.50.0"
msrv = "1.60.0"
cognitive-complexity-threshold = 18
5 changes: 0 additions & 5 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ jobs:
profile: minimal
components: clippy

- name: New Resolver
run: |
cargo install cargo-modify --force
cargo modify new-resolver

- name: Build
run: cargo build
- name: Run tests
Expand Down
21 changes: 4 additions & 17 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
rust: [nightly, stable, '1.50']
rust: [nightly, stable, '1.60']
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.rust == 'nightly' }}

Expand Down Expand Up @@ -48,12 +48,6 @@ jobs:
profile: minimal
components: clippy

- name: New Resolver
if: matrix.rust != '1.50'
run: |
cargo install cargo-modify --force
cargo modify new-resolver

- name: Build Debug
run: |
cargo build
Expand Down Expand Up @@ -86,17 +80,17 @@ jobs:
- name: Build MSI (windows)
if: matrix.os == 'windows-latest'
run: |
cargo install cargo-wix --version 0.3.1
cargo install cargo-wix --version 0.3.3
cargo wix --version
cargo wix --no-build --nocapture --output ./target/wix/gitui.msi
cargo wix -p gitui --no-build --nocapture --output ./target/wix/gitui.msi
ls -l ./target/wix/gitui.msi

build-linux-musl:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
rust: [nightly, stable, '1.50']
rust: [nightly, stable, '1.60']
continue-on-error: ${{ matrix.rust == 'nightly' }}
steps:
- uses: actions/checkout@master
Expand All @@ -108,13 +102,6 @@ jobs:
default: true
target: x86_64-unknown-linux-musl

# TODO: remove once we depend on 1.51 as a msrv and resolver is supported by default
- name: New Resolver
if: matrix.rust != '1.50'
run: |
cargo install cargo-modify --force
cargo modify new-resolver

- name: Setup MUSL
run: |
sudo apt-get -qq install musl-tools
Expand Down
Loading