mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-04-21 16:29:20 -04:00
fix(ci): update our ci toolchain to resolve toolchain conflicts
This commit is contained in:
parent
bee547ef68
commit
25cc97660a
@ -52,7 +52,7 @@ jobs:
|
||||
- uses: Swatinem/rust-cache@v2.7.3
|
||||
|
||||
- name: Install Rust Stable
|
||||
uses: dtolnay/rust-toolchain@1.79
|
||||
uses: dtolnay/rust-toolchain@1.80
|
||||
with:
|
||||
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
|
||||
|
||||
@ -81,9 +81,7 @@ jobs:
|
||||
- name: Work around spurious network errors in curl 8.0
|
||||
shell: bash
|
||||
run: |
|
||||
if rustc --version --verbose | grep -q '^release: 1\.79\.'; then
|
||||
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
|
||||
fi
|
||||
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
|
||||
|
||||
- name: Install Frontend Dependencies
|
||||
working-directory: src-gui
|
||||
|
@ -37,7 +37,7 @@ jobs:
|
||||
- uses: Swatinem/rust-cache@v2.7.3
|
||||
|
||||
- name: install Rust stable
|
||||
uses: dtolnay/rust-toolchain@1.79
|
||||
uses: dtolnay/rust-toolchain@1.80
|
||||
with:
|
||||
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
|
||||
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
|
||||
@ -67,9 +67,7 @@ jobs:
|
||||
- name: work around spurious network errors in curl 8.0
|
||||
shell: bash
|
||||
run: |
|
||||
if rustc --version --verbose | grep -q '^release: 1\.79\.'; then
|
||||
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
|
||||
fi
|
||||
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
|
||||
|
||||
- name: install frontend dependencies
|
||||
working-directory: src-gui
|
||||
|
2
.github/workflows/build-release-binaries.yml
vendored
2
.github/workflows/build-release-binaries.yml
vendored
@ -66,7 +66,7 @@ jobs:
|
||||
|
||||
- uses: dtolnay/rust-toolchain@master
|
||||
with:
|
||||
toolchain: "1.74"
|
||||
toolchain: "1.80"
|
||||
|
||||
- name: Cross Build ${{ matrix.target }} ${{ matrix.bin }} binary
|
||||
if: matrix.target == 'armv7-unknown-linux-gnueabihf'
|
||||
|
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -15,7 +15,7 @@ jobs:
|
||||
|
||||
- uses: dtolnay/rust-toolchain@master
|
||||
with:
|
||||
toolchain: "1.74"
|
||||
toolchain: "1.80"
|
||||
components: clippy,rustfmt
|
||||
|
||||
- uses: Swatinem/rust-cache@v2.7.3
|
||||
@ -123,7 +123,7 @@ jobs:
|
||||
|
||||
- uses: dtolnay/rust-toolchain@master
|
||||
with:
|
||||
toolchain: "1.74"
|
||||
toolchain: "1.80"
|
||||
targets: armv7-unknown-linux-gnueabihf
|
||||
|
||||
- name: Install dependencies required by Tauri v2 (ubuntu only)
|
||||
|
2
.github/workflows/draft-new-release.yml
vendored
2
.github/workflows/draft-new-release.yml
vendored
@ -53,7 +53,7 @@ jobs:
|
||||
id: make-commit
|
||||
env:
|
||||
DPRINT_VERSION: "0.39.1"
|
||||
RUST_TOOLCHAIN: "1.79"
|
||||
RUST_TOOLCHAIN: "1.80"
|
||||
run: |
|
||||
rustup component add rustfmt --toolchain "$RUST_TOOLCHAIN-x86_64-unknown-linux-gnu"
|
||||
curl -fsSL https://dprint.dev/install.sh | sh -s $DPRINT_VERSION
|
||||
|
Loading…
x
Reference in New Issue
Block a user