other: remove toolchain, clean up CI (#1504)

This commit is contained in:
Clement Tsang 2024-07-26 04:23:06 +00:00 committed by GitHub
parent 01c0c33451
commit e37b159fae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 29 deletions

View File

@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Rust toolchain - name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
with: with:
toolchain: stable toolchain: stable

View File

@ -135,7 +135,7 @@ jobs:
- name: Set up Rust toolchain - name: Set up Rust toolchain
if: matrix.info.container == '' if: matrix.info.container == ''
uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
with: with:
toolchain: ${{ matrix.info.rust || 'stable' }} toolchain: ${{ matrix.info.rust || 'stable' }}
target: ${{ matrix.info.target }} target: ${{ matrix.info.target }}
@ -241,7 +241,7 @@ jobs:
args: install -y wixtoolset args: install -y wixtoolset
- name: Set up Rust toolchain - name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
with: with:
toolchain: stable toolchain: stable
target: x86_64-pc-windows-msvc target: x86_64-pc-windows-msvc
@ -351,7 +351,7 @@ jobs:
fetch-depth: 1 fetch-depth: 1
- name: Set up Rust toolchain - name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
with: with:
toolchain: ${{ matrix.info.rust || 'stable' }} toolchain: ${{ matrix.info.rust || 'stable' }}
target: ${{ matrix.info.target }} target: ${{ matrix.info.target }}
@ -455,7 +455,7 @@ jobs:
fetch-depth: 1 fetch-depth: 1
- name: Set up Rust toolchain - name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
with: with:
toolchain: ${{ matrix.info.rust || 'stable' }} toolchain: ${{ matrix.info.rust || 'stable' }}
target: ${{ matrix.info.target }} target: ${{ matrix.info.target }}

View File

@ -90,7 +90,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Rust toolchain - name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
with: with:
toolchain: stable toolchain: stable
components: rustfmt, clippy components: rustfmt, clippy
@ -153,32 +153,23 @@ jobs:
os: "ubuntu-latest", os: "ubuntu-latest",
target: "i686-unknown-linux-gnu", target: "i686-unknown-linux-gnu",
cross: true, cross: true,
rust: stable,
} }
- { - {
os: "ubuntu-latest", os: "ubuntu-latest",
target: "x86_64-unknown-linux-musl", target: "x86_64-unknown-linux-musl",
cross: false, cross: false,
rust: stable,
} }
- { - {
os: "ubuntu-latest", os: "ubuntu-latest",
target: "i686-unknown-linux-musl", target: "i686-unknown-linux-musl",
cross: true, cross: true,
rust: stable,
} }
- { - { os: "windows-2019", target: "i686-pc-windows-msvc", cross: false }
os: "windows-2019",
target: "i686-pc-windows-msvc",
cross: false,
rust: stable,
}
- { - {
os: "windows-2019", os: "windows-2019",
target: "x86_64-pc-windows-gnu", target: "x86_64-pc-windows-gnu",
cross: false, cross: false,
rust: stable,
} }
# Beta # Beta
@ -186,19 +177,19 @@ jobs:
os: "ubuntu-latest", os: "ubuntu-latest",
target: "x86_64-unknown-linux-gnu", target: "x86_64-unknown-linux-gnu",
cross: false, cross: false,
rust: beta, rust: "beta",
} }
- { - {
os: "macos-12", os: "macos-12",
target: "x86_64-apple-darwin", target: "x86_64-apple-darwin",
cross: false, cross: false,
rust: beta, rust: "beta",
} }
- { - {
os: "windows-2019", os: "windows-2019",
target: "x86_64-pc-windows-msvc", target: "x86_64-pc-windows-msvc",
cross: false, cross: false,
rust: beta, rust: "beta",
} }
# armv7 # armv7
@ -206,7 +197,6 @@ jobs:
os: "ubuntu-latest", os: "ubuntu-latest",
target: "armv7-unknown-linux-gnueabihf", target: "armv7-unknown-linux-gnueabihf",
cross: true, cross: true,
rust: stable,
} }
# armv6 # armv6
@ -214,7 +204,6 @@ jobs:
os: "ubuntu-latest", os: "ubuntu-latest",
target: "arm-unknown-linux-gnueabihf", target: "arm-unknown-linux-gnueabihf",
cross: true, cross: true,
rust: stable,
} }
# PowerPC 64 LE # PowerPC 64 LE
@ -222,7 +211,6 @@ jobs:
os: "ubuntu-latest", os: "ubuntu-latest",
target: "powerpc64le-unknown-linux-gnu", target: "powerpc64le-unknown-linux-gnu",
cross: true, cross: true,
rust: stable,
} }
# Risc-V 64gc # Risc-V 64gc
@ -230,7 +218,6 @@ jobs:
os: "ubuntu-latest", os: "ubuntu-latest",
target: "riscv64gc-unknown-linux-gnu", target: "riscv64gc-unknown-linux-gnu",
cross: true, cross: true,
rust: stable,
} }
# Android ARM64 # Android ARM64
@ -238,7 +225,6 @@ jobs:
os: "ubuntu-latest", os: "ubuntu-latest",
target: "aarch64-linux-android", target: "aarch64-linux-android",
cross: true, cross: true,
rust: stable,
cross-version: "git:cabfc3b02d1edec03869fabdabf6a7f8b0519160", cross-version: "git:cabfc3b02d1edec03869fabdabf6a7f8b0519160",
no-default-features: true, no-default-features: true,
} }
@ -248,9 +234,9 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Rust toolchain - name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
with: with:
toolchain: ${{ matrix.info.rust }} toolchain: ${{ matrix.info.rust || 'stable' }}
target: ${{ matrix.info.target }} target: ${{ matrix.info.target }}
- name: Enable Rust cache - name: Enable Rust cache

View File

@ -50,7 +50,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Rust toolchain - name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
with: with:
toolchain: stable toolchain: stable

View File

@ -1,2 +0,0 @@
[toolchain]
channel = "1.80.0"