From 0bba9cd8af7c5e76291e44ebb6e15b87f596bdce Mon Sep 17 00:00:00 2001 From: Bo Lu Date: Sat, 1 Feb 2025 20:04:41 +1100 Subject: [PATCH 1/2] ci: make rust 1.81.0 as default toolchain --- .github/workflows/coverage.yml | 3 +++ .github/workflows/release.yml | 2 +- .github/workflows/test_supabase_wrappers.yml | 3 +++ .github/workflows/test_wrappers.yml | 6 ++++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 4b6e34bf..efd32ab1 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -22,6 +22,9 @@ jobs: with: toolchain: 1.81.0 components: llvm-tools-preview + default: true + override: true + components: rustfmt, clippy - name: Install cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d630a586..675d64ef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,7 +71,7 @@ jobs: # Ensure installed pg_config is first on path export PATH=$PATH:/usr/lib/postgresql/${{ matrix.postgres }}/bin - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain stable && \ + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain 1.81.0 && \ rustup --version && \ rustc --version && \ cargo --version diff --git a/.github/workflows/test_supabase_wrappers.yml b/.github/workflows/test_supabase_wrappers.yml index 6131703d..9ddd6b16 100644 --- a/.github/workflows/test_supabase_wrappers.yml +++ b/.github/workflows/test_supabase_wrappers.yml @@ -17,6 +17,9 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.81.0 + default: true + override: true + components: rustfmt, clippy - run: | sudo apt remove -y postgres* diff --git a/.github/workflows/test_wrappers.yml b/.github/workflows/test_wrappers.yml index b8e6c9ee..3a260c63 100644 --- a/.github/workflows/test_wrappers.yml +++ b/.github/workflows/test_wrappers.yml @@ -24,6 +24,9 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.81.0 + default: true + override: true + components: rustfmt, clippy - run: | sudo apt remove -y postgres* @@ -79,6 +82,9 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.81.0 + default: true + override: true + components: rustfmt, clippy - run: | sudo apt remove -y postgres* From aae397cff54e8f398bc9701586ecee02a816d9e8 Mon Sep 17 00:00:00 2001 From: Bo Lu Date: Sat, 1 Feb 2025 20:57:23 +1100 Subject: [PATCH 2/2] fix coverage workflow file --- .github/workflows/coverage.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index efd32ab1..ba02e5aa 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -21,10 +21,9 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: 1.81.0 - components: llvm-tools-preview + components: llvm-tools-preview, rustfmt, clippy default: true override: true - components: rustfmt, clippy - name: Install cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov