Skip to content

Commit

Permalink
Fix the CI with minimal crate versions
Browse files Browse the repository at this point in the history
- Change the following dev dependencies:
  - Raise the minimal async-std version from 1.1 to 1.2.
  - Use rustls in reqwest instead of native-tls (openssl on Linux).
  • Loading branch information
tatsuya6502 committed Dec 11, 2023
1 parent 8aafbb1 commit 98bbbb1
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 16 deletions.
6 changes: 6 additions & 0 deletions .ci_extras/pin-crate-vers-msrv.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

set -eux

# Pin some dependencies to specific versions for the MSRV.
# cargo update -p <crate> --precise <version>
6 changes: 6 additions & 0 deletions .ci_extras/pin-crate-vers-nightly.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

set -eux

# Pin some dependencies to specific versions for the nightly toolchain.
cargo update -p proc-macro2 --precise 1.0.60
11 changes: 4 additions & 7 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +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
cargo update -p cc --precise 1.0.61
run: ./.ci_extras/pin-crate-vers-nightly.sh

# - name: Pin some dependencies to specific versions (MSRV only)
# if: ${{ matrix.rust == '1.65.0' }}
# run: |
# cargo update -p <crate> --precise <version>
- name: Pin some dependencies to specific versions (MSRV only)
if: ${{ matrix.rust == '1.65.0' }}
run: ./.ci_extras/pin-crate-vers-msrv.sh

- name: Show cargo tree
uses: actions-rs/cargo@v1
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/CIQuantaDisabled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +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
cargo update -p cc --precise 1.0.61
run: ./.ci_extras/pin-crate-vers-nightly.sh

# - name: Pin some dependencies to specific versions (MSRV only)
# if: ${{ matrix.rust == '1.65.0' }}
# run: |
# cargo update -p <crate> --precise <version>
- name: Pin some dependencies to specific versions (MSRV only)
if: ${{ matrix.rust == '1.65.0' }}
run: ./.ci_extras/pin-crate-vers-msrv.sh

- name: Run tests (debug, but no quanta feature)
uses: actions-rs/cargo@v1
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ log = { version = "0.4", optional = true }
actix-rt = { version = "2.7", default-features = false }
ahash = "0.8.3"
anyhow = "1.0.19"
async-std = { version = "1.11", features = ["attributes"] }
async-std = { version = "1.12", features = ["attributes"] }
env_logger = "0.10.0"
getrandom = "0.2"
paste = "1.0.9"
reqwest = "0.11.11"
reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls"] }
skeptic = "0.13"
tokio = { version = "1.19", features = ["fs", "macros", "rt-multi-thread", "sync", "time" ] }

Expand Down

0 comments on commit 98bbbb1

Please sign in to comment.