Skip to content

Commit 0659252

Browse files
committed
fix(ci): move arti-hyper to another ci job, instead of pinning
1 parent b9b0c1b commit 0659252

File tree

2 files changed

+57
-6
lines changed

2 files changed

+57
-6
lines changed

.github/workflows/cont_integration.yml

+54-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ name: Rust
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches: ["master"]
66
pull_request:
7-
branches: [ "master" ]
7+
branches: ["master"]
88

99
env:
1010
CARGO_TERM_COLOR: always
1111

1212
jobs:
1313
build-test:
14-
1514
runs-on: ubuntu-latest
1615
strategy:
1716
matrix:
@@ -31,6 +30,58 @@ jobs:
3130
- async-https-native
3231
- async-https-rustls
3332
- async-https-rustls-manual-roots
33+
steps:
34+
- uses: actions/checkout@v3
35+
36+
- name: Generate cache key
37+
run: echo "${{ matrix.rust.version }} ${{ matrix.features }}" | tee .cache_key
38+
39+
- name: cache
40+
uses: actions/cache@v3
41+
with:
42+
path: |
43+
~/.cargo/registry
44+
~/.cargo/git
45+
target
46+
key: ${{ runner.os }}-cargo-${{ hashFiles('.cache_key') }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
47+
48+
- name: Set default toolchain
49+
run: rustup default ${{ matrix.rust.version }}
50+
51+
- name: Set profile
52+
run: rustup set profile minimal
53+
54+
- name: Add clippy
55+
if: ${{ matrix.rust.clippy }}
56+
run: rustup component add clippy
57+
58+
- name: Update toolchain
59+
run: rustup update
60+
61+
- name: pin dependencies
62+
if: matrix.rust.version == '1.63.0'
63+
run: |
64+
cargo update -p home --precise 0.5.5
65+
66+
- name: Build
67+
run: cargo build --features ${{ matrix.features }} --no-default-features
68+
69+
- name: Clippy
70+
if: ${{ matrix.rust.clippy }}
71+
run: cargo clippy --all-targets --features ${{ matrix.features }} --no-default-features -- -D warnings
72+
73+
- name: Test
74+
run: cargo test --features ${{ matrix.features }} --no-default-features
75+
76+
build-arti-hyper-feature-test:
77+
# It has it's own job to running tests, because arti-client does not support the MSRV.
78+
runs-on: ubuntu-latest
79+
strategy:
80+
matrix:
81+
rust:
82+
- version: stable # STABLE
83+
clippy: true
84+
features:
3485
- async-arti-hyper
3586
- async-arti-hyper-native
3687
- async-arti-hyper-rustls

Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ log = "^0.4"
2525
minreq = { version = "2.11.0", features = ["json-using-serde"], optional = true }
2626
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }
2727
hyper = { version = "0.14", optional = true, features = ["http1", "client", "runtime"], default-features = false }
28-
arti-hyper = { version = "0.8.3", optional = true, features = ["default"] }
29-
arti-client = { version = "0.8.3", optional = true }
30-
tor-rtcompat = { version = "0.8.2", optional = true, features = ["tokio"]}
28+
arti-hyper = { version = "0.13.0", optional = true, features = ["default"] }
29+
arti-client = { version = "0.13.0", optional = true }
30+
tor-rtcompat = { version = "0.9.7", optional = true, features = ["tokio"]}
3131
tls-api = { version = "0.9.0", optional = true }
3232
tls-api-native-tls = { version = "0.9.0", optional = true }
3333
ahash = { version = "=0.8.6", optional = true } # ahash 0.8.7 version don't work with our MSRV on aarch64, check: https://github.com/tkaitchuck/aHash/issues/195

0 commit comments

Comments
 (0)