Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-09-26 11:21:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix(ci): update our ci toolchain to resolve toolchain conflicts

Browse source
This commit is contained in:
einliterflasche 2025-02-27 18:52:28 +01:00
parent bee547ef68
commit 25cc97660a
No known key found for this signature in database
GPG key ID: 90676A9B07184BC9
5 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/build-gui-release-binaries-cb.yml vendored
View file

@ -52,7 +52,7 @@ jobs:
- uses: Swatinem/rust-cache@v2.7.3 - uses: Swatinem/rust-cache@v2.7.3
- name: Install Rust Stable - name: Install Rust Stable
uses: dtolnay/rust-toolchain@1.79 uses: dtolnay/rust-toolchain@1.80
with: with:
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} 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 - name: Work around spurious network errors in curl 8.0
shell: bash shell: bash
run: | run: |
if rustc --version --verbose | grep -q '^release: 1\.79\.'; then echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
fi
- name: Install Frontend Dependencies - name: Install Frontend Dependencies
working-directory: src-gui working-directory: src-gui

6
.github/workflows/build-gui-release-binaries.yml vendored
View file

@ -37,7 +37,7 @@ jobs:
- uses: Swatinem/rust-cache@v2.7.3 - uses: Swatinem/rust-cache@v2.7.3
- name: install Rust stable - name: install Rust stable
uses: dtolnay/rust-toolchain@1.79 uses: dtolnay/rust-toolchain@1.80
with: with:
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds. # 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' || '' }} 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 - name: work around spurious network errors in curl 8.0
shell: bash shell: bash
run: | run: |
if rustc --version --verbose | grep -q '^release: 1\.79\.'; then echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
fi
- name: install frontend dependencies - name: install frontend dependencies
working-directory: src-gui working-directory: src-gui

2
.github/workflows/build-release-binaries.yml vendored
View file

@ -66,7 +66,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master - uses: dtolnay/rust-toolchain@master
with: with:
toolchain: "1.74" toolchain: "1.80"
- name: Cross Build ${{ matrix.target }} ${{ matrix.bin }} binary - name: Cross Build ${{ matrix.target }} ${{ matrix.bin }} binary
if: matrix.target == 'armv7-unknown-linux-gnueabihf' if: matrix.target == 'armv7-unknown-linux-gnueabihf'

4
.github/workflows/ci.yml vendored
View file

@ -15,7 +15,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master - uses: dtolnay/rust-toolchain@master
with: with:
toolchain: "1.74" toolchain: "1.80"
components: clippy,rustfmt components: clippy,rustfmt
- uses: Swatinem/rust-cache@v2.7.3 - uses: Swatinem/rust-cache@v2.7.3
@ -123,7 +123,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master - uses: dtolnay/rust-toolchain@master
with: with:
toolchain: "1.74" toolchain: "1.80"
targets: armv7-unknown-linux-gnueabihf targets: armv7-unknown-linux-gnueabihf
- name: Install dependencies required by Tauri v2 (ubuntu only) - name: Install dependencies required by Tauri v2 (ubuntu only)

2
.github/workflows/draft-new-release.yml vendored
View file

@ -53,7 +53,7 @@ jobs:
id: make-commit id: make-commit
env: env:
DPRINT_VERSION: "0.39.1" DPRINT_VERSION: "0.39.1"
RUST_TOOLCHAIN: "1.79" RUST_TOOLCHAIN: "1.80"
run: | run: |
rustup component add rustfmt --toolchain "$RUST_TOOLCHAIN-x86_64-unknown-linux-gnu" rustup component add rustfmt --toolchain "$RUST_TOOLCHAIN-x86_64-unknown-linux-gnu"
curl -fsSL https://dprint.dev/install.sh | sh -s $DPRINT_VERSION curl -fsSL https://dprint.dev/install.sh | sh -s $DPRINT_VERSION