From 9e169dbb1768b2c7e98579d81e3600a479490ecd Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Sat, 29 Jul 2023 16:46:57 +0800 Subject: [PATCH] Fix the CI for MSRV 1.60 When testing the MSRV, downgrade `tempfile` to v3.6.0 so that it will compile. --- .ci_extras/pin-crate-vers-msrv.sh | 6 ++++++ .ci_extras/pin-crate-vers-nightly.sh | 7 +++++++ .cirrus.yml | 2 +- .github/workflows/CI.yml | 10 ++++------ .github/workflows/CIQuantaDisabled.yml | 10 ++++------ 5 files changed, 22 insertions(+), 13 deletions(-) create mode 100755 .ci_extras/pin-crate-vers-msrv.sh create mode 100755 .ci_extras/pin-crate-vers-nightly.sh diff --git a/.ci_extras/pin-crate-vers-msrv.sh b/.ci_extras/pin-crate-vers-msrv.sh new file mode 100755 index 00000000..f115f405 --- /dev/null +++ b/.ci_extras/pin-crate-vers-msrv.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +set -eux + +# Pin some dependencies to specific versions for the MSRV. +cargo update -p tempfile --precise 3.6.0 diff --git a/.ci_extras/pin-crate-vers-nightly.sh b/.ci_extras/pin-crate-vers-nightly.sh new file mode 100755 index 00000000..f37e041f --- /dev/null +++ b/.ci_extras/pin-crate-vers-nightly.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -eux + +# Pin some dependencies to specific versions for the nightly toolchain. +cargo update -p openssl --precise 0.10.39 +cargo update -p cc --precise 1.0.61 diff --git a/.cirrus.yml b/.cirrus.yml index d5fc7c69..ac9fe906 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -50,7 +50,7 @@ linux_arm64_task: # pin_deps_script: | # if [ "v$RUST_VERSION" == "v1.60.0" ]; then # echo 'Pinning some dependencies to specific versions' - # cargo update -p --precise + # ./.ci_extras/pin-crate-vers-msrv.sh # else # echo 'Skipped' # fi diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2402a97a..16cbb7c4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -61,13 +61,11 @@ jobs: - name: Pin some dependencies to specific versions (Nightly only) if: ${{ matrix.rust == 'nightly' }} - run: | - cargo update -p openssl --precise 0.10.39 + run: ./.ci_extras/pin-crate-vers-nightly.sh - # - name: Pin some dependencies to specific versions (MSRV only) - # if: ${{ matrix.rust == '1.60.0' }} - # run: | - # cargo update -p --precise + - name: Pin some dependencies to specific versions (MSRV only) + if: ${{ matrix.rust == '1.60.0' }} + run: ./.ci_extras/pin-crate-vers-msrv.sh - name: Show cargo tree uses: actions-rs/cargo@v1 diff --git a/.github/workflows/CIQuantaDisabled.yml b/.github/workflows/CIQuantaDisabled.yml index 3cf87552..1893c282 100644 --- a/.github/workflows/CIQuantaDisabled.yml +++ b/.github/workflows/CIQuantaDisabled.yml @@ -54,13 +54,11 @@ jobs: - name: Pin some dependencies to specific versions (Nightly only) if: ${{ matrix.rust == 'nightly' }} - run: | - cargo update -p openssl --precise 0.10.39 + run: ./.ci_extras/pin-crate-vers-nightly.sh - # - name: Pin some dependencies to specific versions (MSRV only) - # if: ${{ matrix.rust == '1.60.0' }} - # run: | - # cargo update -p --precise + - name: Pin some dependencies to specific versions (MSRV only) + if: ${{ matrix.rust == '1.60.0' }} + run: ./.ci_extras/pin-crate-vers-msrv.sh - name: Run tests (debug, but no quanta feature) uses: actions-rs/cargo@v1