From 5c758438fc1f5566707925bb384a7ae145636b99 Mon Sep 17 00:00:00 2001 From: Tamo Date: Tue, 25 Jun 2024 11:25:15 +0200 Subject: [PATCH] Update the CI to take the rust-toolchain file into account --- .github/workflows/bench-manual.yml | 2 -- .github/workflows/bench-pr.yml | 2 -- .github/workflows/bench-push-indexing.yml | 2 -- .github/workflows/benchmarks-manual.yml | 2 -- .github/workflows/benchmarks-pr.yml | 2 -- .github/workflows/benchmarks-push-indexing.yml | 2 -- .../workflows/benchmarks-push-search-geo.yml | 2 -- .../workflows/benchmarks-push-search-songs.yml | 2 -- .../workflows/benchmarks-push-search-wiki.yml | 2 -- .github/workflows/flaky-tests.yml | 3 --- .github/workflows/fuzzer-indexing.yml | 2 -- .github/workflows/publish-apt-brew-pkg.yml | 3 --- .github/workflows/publish-binaries.yml | 10 ---------- .github/workflows/test-suite.yml | 17 +---------------- .github/workflows/update-cargo-toml-version.yml | 2 -- 15 files changed, 1 insertion(+), 54 deletions(-) diff --git a/.github/workflows/bench-manual.yml b/.github/workflows/bench-manual.yml index 6d8c3a006..3352a4b40 100644 --- a/.github/workflows/bench-manual.yml +++ b/.github/workflows/bench-manual.yml @@ -21,8 +21,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true - name: Run benchmarks - workload ${WORKLOAD_NAME} - branch ${{ github.ref }} - commit ${{ github.sha }} run: | diff --git a/.github/workflows/bench-pr.yml b/.github/workflows/bench-pr.yml index 36af79460..7e8f26a13 100644 --- a/.github/workflows/bench-pr.yml +++ b/.github/workflows/bench-pr.yml @@ -38,8 +38,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true - name: Run benchmarks on PR ${{ github.event.issue.id }} run: | diff --git a/.github/workflows/bench-push-indexing.yml b/.github/workflows/bench-push-indexing.yml index fd0f19a5a..3d92899af 100644 --- a/.github/workflows/bench-push-indexing.yml +++ b/.github/workflows/bench-push-indexing.yml @@ -15,8 +15,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true # Run benchmarks - name: Run benchmarks - Dataset ${BENCH_NAME} - Branch main - Commit ${{ github.sha }} diff --git a/.github/workflows/benchmarks-manual.yml b/.github/workflows/benchmarks-manual.yml index b967eb073..e24c03d2b 100644 --- a/.github/workflows/benchmarks-manual.yml +++ b/.github/workflows/benchmarks-manual.yml @@ -21,8 +21,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true # Set variables - name: Set current branch name diff --git a/.github/workflows/benchmarks-pr.yml b/.github/workflows/benchmarks-pr.yml index 30baa294e..322f394e7 100644 --- a/.github/workflows/benchmarks-pr.yml +++ b/.github/workflows/benchmarks-pr.yml @@ -16,8 +16,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true - name: Check for Command id: command diff --git a/.github/workflows/benchmarks-push-indexing.yml b/.github/workflows/benchmarks-push-indexing.yml index a966570e6..e9c589504 100644 --- a/.github/workflows/benchmarks-push-indexing.yml +++ b/.github/workflows/benchmarks-push-indexing.yml @@ -19,8 +19,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true # Set variables - name: Set current branch name diff --git a/.github/workflows/benchmarks-push-search-geo.yml b/.github/workflows/benchmarks-push-search-geo.yml index 1b5cacfd1..652e92311 100644 --- a/.github/workflows/benchmarks-push-search-geo.yml +++ b/.github/workflows/benchmarks-push-search-geo.yml @@ -18,8 +18,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true # Set variables - name: Set current branch name diff --git a/.github/workflows/benchmarks-push-search-songs.yml b/.github/workflows/benchmarks-push-search-songs.yml index 02cd10472..a9b75ba80 100644 --- a/.github/workflows/benchmarks-push-search-songs.yml +++ b/.github/workflows/benchmarks-push-search-songs.yml @@ -18,8 +18,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true # Set variables - name: Set current branch name diff --git a/.github/workflows/benchmarks-push-search-wiki.yml b/.github/workflows/benchmarks-push-search-wiki.yml index 455aaa95d..0c3406e49 100644 --- a/.github/workflows/benchmarks-push-search-wiki.yml +++ b/.github/workflows/benchmarks-push-search-wiki.yml @@ -18,8 +18,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true # Set variables - name: Set current branch name diff --git a/.github/workflows/flaky-tests.yml b/.github/workflows/flaky-tests.yml index c7e81aacc..4c008d6b3 100644 --- a/.github/workflows/flaky-tests.yml +++ b/.github/workflows/flaky-tests.yml @@ -17,9 +17,6 @@ jobs: apt-get update && apt-get install -y curl apt-get install build-essential -y - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Install cargo-flaky run: cargo install cargo-flaky - name: Run cargo flaky in the dumps diff --git a/.github/workflows/fuzzer-indexing.yml b/.github/workflows/fuzzer-indexing.yml index 1d01a6ea5..ceaef57ac 100644 --- a/.github/workflows/fuzzer-indexing.yml +++ b/.github/workflows/fuzzer-indexing.yml @@ -15,8 +15,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true # Run benchmarks - name: Run the fuzzer diff --git a/.github/workflows/publish-apt-brew-pkg.yml b/.github/workflows/publish-apt-brew-pkg.yml index 11893bae0..628a67263 100644 --- a/.github/workflows/publish-apt-brew-pkg.yml +++ b/.github/workflows/publish-apt-brew-pkg.yml @@ -26,9 +26,6 @@ jobs: apt-get update && apt-get install -y curl apt-get install build-essential -y - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Install cargo-deb run: cargo install cargo-deb - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml index 2372ce497..d9439cb32 100644 --- a/.github/workflows/publish-binaries.yml +++ b/.github/workflows/publish-binaries.yml @@ -46,9 +46,6 @@ jobs: apt-get update && apt-get install -y curl apt-get install build-essential -y - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Build run: cargo build --release --locked # No need to upload binaries for dry run (cron) @@ -79,9 +76,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Build run: cargo build --release --locked # No need to upload binaries for dry run (cron) @@ -109,10 +103,8 @@ jobs: - name: Installing Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: stable profile: minimal target: ${{ matrix.target }} - override: true - name: Cargo build uses: actions-rs/cargo@v1 with: @@ -156,10 +148,8 @@ jobs: - name: Installing Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: stable profile: minimal target: ${{ matrix.target }} - override: true - name: Configure target aarch64 GNU ## Environment variable is not passed using env: ## LD gold won't work with MUSL diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 5dbde4301..fd9238bf1 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -32,9 +32,6 @@ jobs: apt-get install build-essential -y - name: Setup test with Rust stable uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Cache dependencies uses: Swatinem/rust-cache@v2.7.1 - name: Run cargo check without any default features @@ -60,9 +57,6 @@ jobs: - name: Cache dependencies uses: Swatinem/rust-cache@v2.7.1 - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Run cargo check without any default features uses: actions-rs/cargo@v1 with: @@ -88,9 +82,6 @@ jobs: apt-get update apt-get install --assume-yes build-essential curl - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Run cargo build with almost all features run: | cargo build --workspace --locked --release --features "$(cargo xtask list-features --exclude-feature cuda)" @@ -111,9 +102,6 @@ jobs: apt-get update apt-get install --assume-yes build-essential curl - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Run cargo tree without default features and check lindera is not present run: | if cargo tree -f '{p} {f}' -e normal --no-default-features | grep -vqz lindera; then @@ -138,9 +126,6 @@ jobs: apt-get update && apt-get install -y curl apt-get install build-essential -y - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - name: Cache dependencies uses: Swatinem/rust-cache@v2.7.1 - name: Run tests in debug @@ -176,7 +161,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly + toolchain: nightly-2024-06-25 override: true components: rustfmt - name: Cache dependencies diff --git a/.github/workflows/update-cargo-toml-version.yml b/.github/workflows/update-cargo-toml-version.yml index 51ab6d1ab..0f68bdc49 100644 --- a/.github/workflows/update-cargo-toml-version.yml +++ b/.github/workflows/update-cargo-toml-version.yml @@ -21,8 +21,6 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable - override: true - name: Install sd run: cargo install sd - name: Update Cargo.toml file