From 755de38996e205b3e5e700d185b67ceaa3261af5 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Mon, 8 Jul 2024 00:24:59 +1000 Subject: [PATCH 1/5] Bump main.yml --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e7ec1ae..9a15d913 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -201,13 +201,13 @@ jobs: - uses: actions/checkout@v4 - name: Install Rust run: | - rustup toolchain install 1.63.0 --no-self-update --profile minimal + rustup toolchain install 1.65.0 --no-self-update --profile minimal rustup toolchain install nightly --no-self-update --profile minimal - rustup default 1.63.0 + rustup default 1.65.0 shell: bash - name: Create Cargo.lock with minimal version run: cargo +nightly update -Zminimal-versions - - name: Cache downloaded crates since 1.63 is really slow in fetching + - name: Cache downloaded crates since 1.65 is really slow in fetching uses: Swatinem/rust-cache@v2 - run: cargo check --lib -p cc --locked - run: cargo check --lib -p cc --locked --all-features From 8b5034d42a770b58fac3e92a2a02dab6e6347fc3 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Mon, 8 Jul 2024 00:25:30 +1000 Subject: [PATCH 2/5] Check msrv on macOS in main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a15d913..fe38d164 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -196,7 +196,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v4 - name: Install Rust From 1356c568f5c9441ca6844a6e0f6973d4b6340f26 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Mon, 8 Jul 2024 00:26:00 +1000 Subject: [PATCH 3/5] Bump msrv to 1.65 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c2419475..e15cd98a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ categories = ["development-tools::build-utils"] # The binary target is only used by tests. exclude = ["/.github", "tests", "src/bin"] edition = "2018" -rust-version = "1.63" +rust-version = "1.65" [dependencies] jobserver = { version = "0.1.30", default-features = false, optional = true } From 2fc668a8c7933e1b4369d1a3236b5511c81b2ad4 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Mon, 8 Jul 2024 20:58:37 +1000 Subject: [PATCH 4/5] Bump msrv to 1.66 Signed-off-by: Jiahao XU --- .github/workflows/main.yml | 9 +++++---- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe38d164..b401d783 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -197,18 +197,19 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] + env: + MSRV: 1.66.0 steps: - uses: actions/checkout@v4 - name: Install Rust run: | - rustup toolchain install 1.65.0 --no-self-update --profile minimal + rustup toolchain install $MSRV --no-self-update --profile minimal rustup toolchain install nightly --no-self-update --profile minimal - rustup default 1.65.0 + rustup default $MSRV shell: bash - name: Create Cargo.lock with minimal version run: cargo +nightly update -Zminimal-versions - - name: Cache downloaded crates since 1.65 is really slow in fetching - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@v2 - run: cargo check --lib -p cc --locked - run: cargo check --lib -p cc --locked --all-features diff --git a/Cargo.toml b/Cargo.toml index e15cd98a..310d82b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ categories = ["development-tools::build-utils"] # The binary target is only used by tests. exclude = ["/.github", "tests", "src/bin"] edition = "2018" -rust-version = "1.65" +rust-version = "1.66" [dependencies] jobserver = { version = "0.1.30", default-features = false, optional = true } From 3659519e91c0c8e225cf21ef81a410153825a4e5 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Mon, 8 Jul 2024 21:06:33 +1000 Subject: [PATCH 5/5] Fix job msrv Signed-off-by: Jiahao XU --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b401d783..69e1c633 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -210,8 +210,8 @@ jobs: - name: Create Cargo.lock with minimal version run: cargo +nightly update -Zminimal-versions - uses: Swatinem/rust-cache@v2 - - run: cargo check --lib -p cc --locked - - run: cargo check --lib -p cc --locked --all-features + - run: env -u CARGO_REGISTRIES_CRATES_IO_PROTOCOL cargo check --lib -p cc --locked + - run: env -u CARGO_REGISTRIES_CRATES_IO_PROTOCOL cargo check --lib -p cc --locked --all-features clippy: name: Clippy