From 0db5a653a059e27eb5b61964efdc7af8bdc015d7 Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Fri, 24 Mar 2023 21:23:52 +0800 Subject: [PATCH 1/3] Fix the CI for Rust nightly with minimal dependency versions When testing minimal dependency versions, upgrade `cc` to v1.0.61, otherwise building `openssl-sys` will fail on Linux. --- .github/workflows/CI.yml | 1 + .github/workflows/CIQuantaDisabled.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f47a845e..eef42195 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -63,6 +63,7 @@ jobs: if: ${{ matrix.rust == 'nightly' }} run: | cargo update -p openssl --precise 0.10.39 + cargo update -p cc --precise 1.0.61 - name: Pin some dependencies to specific versions (MSRV only) if: ${{ matrix.rust == '1.51.0' }} diff --git a/.github/workflows/CIQuantaDisabled.yml b/.github/workflows/CIQuantaDisabled.yml index a2690216..1cfb0555 100644 --- a/.github/workflows/CIQuantaDisabled.yml +++ b/.github/workflows/CIQuantaDisabled.yml @@ -56,6 +56,7 @@ jobs: if: ${{ matrix.rust == 'nightly' }} run: | cargo update -p openssl --precise 0.10.39 + cargo update -p cc --precise 1.0.61 - name: Pin some dependencies to specific versions (MSRV only) if: ${{ matrix.rust == '1.51.0' }} From 2655c3a4cada00305e360041d45059b08dfd553d Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Fri, 24 Mar 2023 21:30:53 +0800 Subject: [PATCH 2/3] Fix the CI for Rust nightly with minimal dependency versions When testing minimal dependency versions, upgrade `cc` to v1.0.61, otherwise building `openssl-sys` will fail on Linux. --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 7c623867..884fa45d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -44,6 +44,7 @@ linux_arm64_task: echo 'Downgrading dependencies to minimal versions' cargo update -Z minimal-versions cargo update -p openssl --precise 0.10.39 + cargo update -p cc --precise 1.0.61 else echo 'Skipped' fi From 333cda31590cc09c38f185779daab8012419387e Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Fri, 24 Mar 2023 22:42:08 +0800 Subject: [PATCH 3/3] Fix the CI for MSRV 1.51 When testing the MSRV, downgrade `thiserror` and `serde` to v1.0.39 and v1.0.156 respectively, so that they will compile. --- .cirrus.yml | 2 ++ .github/workflows/CI.yml | 2 ++ .github/workflows/CIQuantaDisabled.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 884fa45d..103222ee 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -63,6 +63,8 @@ linux_arm64_task: cargo update -p pulldown-cmark --precise 0.9.1 cargo update -p once_cell --precise 1.14.0 cargo update -p tokio-native-tls --precise 0.3.0 + cargo update -p thiserror --precise 1.0.39 + cargo update -p serde --precise 1.0.156 else echo 'Skipped' fi diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index eef42195..1127cda9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -85,6 +85,8 @@ jobs: cargo update -p pulldown-cmark --precise 0.9.1 cargo update -p once_cell --precise 1.14.0 cargo update -p tokio-native-tls --precise 0.3.0 + cargo update -p thiserror --precise 1.0.39 + cargo update -p serde --precise 1.0.156 - name: Show cargo tree uses: actions-rs/cargo@v1 diff --git a/.github/workflows/CIQuantaDisabled.yml b/.github/workflows/CIQuantaDisabled.yml index 1cfb0555..853d025f 100644 --- a/.github/workflows/CIQuantaDisabled.yml +++ b/.github/workflows/CIQuantaDisabled.yml @@ -78,6 +78,8 @@ jobs: cargo update -p pulldown-cmark --precise 0.9.1 cargo update -p once_cell --precise 1.14.0 cargo update -p tokio-native-tls --precise 0.3.0 + cargo update -p thiserror --precise 1.0.39 + cargo update -p serde --precise 1.0.156 - name: Run tests (debug, but no quanta feature) uses: actions-rs/cargo@v1