Skip to content

Commit 5d743b3

Browse files
committed
Run rustls tests in a separate yml file
1 parent 21122bf commit 5d743b3

File tree

4 files changed

+162
-54
lines changed

4 files changed

+162
-54
lines changed

.github/workflows/macos-build.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,30 +60,3 @@ jobs:
6060
cargo clippy --all-features -- -D warnings
6161
cd ../rustls-wolfcrypt-provider
6262
cargo clippy --all-features -- -D warnings
63-
64-
- name: Run tests of rustls v0.23.35
65-
run: |
66-
mkdir rustlsv0.23.35-test-workspace
67-
cd rustlsv0.23.35-test-workspace
68-
git clone https://github.com/rustls/rustls.git
69-
cd rustls
70-
git fetch --tags
71-
selected_tag=$(git tag -l "v/0\.23\.35")
72-
git checkout "$selected_tag"
73-
cd ..
74-
git clone https://github.com/helkoulak/rustls-wolfcrypt-provider.git
75-
cd rustls-wolfcrypt-provider/
76-
git checkout quic-support
77-
cd wolfcrypt-rs/
78-
make build
79-
cd ../rustls-wolfcrypt-provider/
80-
cargo build --all-features --release
81-
cd ../..
82-
git clone https://github.com/helkoulak/rustls_v0.23.35_test_files.git
83-
cp -r ./rustls_v0.23.35_test_files/tests .
84-
cp ./rustls_v0.23.35_test_files/Cargo.toml .
85-
cp ./rustls_v0.23.35_test_files/provider_files/Cargo.toml ./rustls-wolfcrypt-provider/rustls-wolfcrypt-provider/
86-
rm -rf rustls_v0.23.35_test_files
87-
cargo test -p tests --test all_suites --all-features
88-
cd ..
89-
rm -rf rustlsv0.23.35-test-workspace
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: macOS Build and Test
2+
3+
on:
4+
push:
5+
branches: [ 'main' ]
6+
pull_request:
7+
branches: [ 'main' ]
8+
9+
jobs:
10+
macos-build:
11+
name: Build and Test (macOS)
12+
runs-on: macos-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Install Build Prerequisites
17+
run: |
18+
brew install autoconf libtool automake
19+
brew install go
20+
21+
- name: Install Rust
22+
uses: dtolnay/rust-toolchain@master
23+
with:
24+
toolchain: stable
25+
components: rustfmt, clippy
26+
27+
- name: Cache Rust dependencies
28+
uses: actions/cache@v3
29+
with:
30+
path: |
31+
~/.cargo/registry
32+
~/.cargo/git
33+
target
34+
key: macos-cargo-${{ hashFiles('**/Cargo.lock') }}
35+
restore-keys: |
36+
macos-cargo-
37+
38+
- name: Checkout rustls v0.23.35
39+
uses: actions/checkout@v4
40+
with:
41+
repository: rustls/rustls
42+
ref: v0.23.35
43+
path: rustlsv0.23.35-test-workspace/rustls
44+
45+
- name: Checkout rustls-wolfcrypt-provider (quic-support)
46+
uses: actions/checkout@v4
47+
with:
48+
repository: helkoulak/rustls-wolfcrypt-provider
49+
ref: quic-support
50+
path: rustlsv0.23.35-test-workspace/rustls-wolfcrypt-provider
51+
52+
- name: Build wolfcrypt-rs
53+
working-directory: rustlsv0.23.35-test-workspace/rustls-wolfcrypt-provider/wolfcrypt-rs
54+
run: make build
55+
56+
- name: Build rustls-wolfcrypt-provider
57+
working-directory: rustlsv0.23.35-test-workspace/rustls-wolfcrypt-provider
58+
run: cargo build --all-features --release
59+
60+
- name: Checkout rustls v0.23.35 test files
61+
uses: actions/checkout@v4
62+
with:
63+
repository: helkoulak/rustls_v0.23.35_test_files
64+
path: rustlsv0.23.35-test-workspace/rustls_v0.23.35_test_files
65+
66+
- name: Prepare test workspace
67+
working-directory: rustlsv0.23.35-test-workspace
68+
run: |
69+
cp -r rustls_v0.23.35_test_files/tests .
70+
cp rustls_v0.23.35_test_files/Cargo.toml .
71+
cp rustls_v0.23.35_test_files/provider_files/Cargo.toml \
72+
rustls-wolfcrypt-provider/rustls-wolfcrypt-provider/
73+
74+
- name: Run test suite
75+
working-directory: rustlsv0.23.35-test-workspace
76+
run: |
77+
cargo test -p tests --test all_suites \
78+
--features wolfcrypt-provider,tls12,fips,zlib,prefer-post-quantum,logging \
79+
--no-default-features
80+
81+

.github/workflows/ubuntu-build.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,30 +61,3 @@ jobs:
6161
cd ../rustls-wolfcrypt-provider
6262
cargo clippy --all-features -- -D warnings
6363
64-
- name: Run tests of rustls v0.23.35
65-
run: |
66-
mkdir rustlsv0.23.35-test-workspace
67-
cd rustlsv0.23.35-test-workspace
68-
git clone https://github.com/rustls/rustls.git
69-
cd rustls
70-
git fetch --tags
71-
selected_tag=$(git tag -l "v/0\.23\.35")
72-
git checkout "$selected_tag"
73-
cd ..
74-
git clone https://github.com/helkoulak/rustls-wolfcrypt-provider.git
75-
cd rustls-wolfcrypt-provider/
76-
git checkout quic-support
77-
cd wolfcrypt-rs/
78-
make build
79-
cd ../rustls-wolfcrypt-provider/
80-
cargo build --all-features --release
81-
cd ../..
82-
git clone https://github.com/helkoulak/rustls_v0.23.35_test_files.git
83-
cp -r ./rustls_v0.23.35_test_files/tests .
84-
cp ./rustls_v0.23.35_test_files/Cargo.toml .
85-
cp ./rustls_v0.23.35_test_files/provider_files/Cargo.toml ./rustls-wolfcrypt-provider/rustls-wolfcrypt-provider/
86-
rm -rf rustls_v0.23.35_test_files
87-
cargo test -p tests --test all_suites --all-features
88-
cd ..
89-
rm -rf rustlsv0.23.35-test-workspace
90-
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Ubuntu rustls tests
2+
3+
on:
4+
push:
5+
branches: [ 'main' ]
6+
pull_request:
7+
branches: [ 'main' ]
8+
9+
jobs:
10+
ubuntu-build:
11+
name: Build and Test (Ubuntu)
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Install Build Prerequisites
17+
run: |
18+
sudo apt-get update
19+
sudo apt-get install -y build-essential autoconf libtool
20+
21+
- name: Install Rust
22+
uses: dtolnay/rust-toolchain@master
23+
with:
24+
toolchain: stable
25+
components: rustfmt, clippy
26+
27+
- name: Cache Rust dependencies
28+
uses: actions/cache@v3
29+
with:
30+
path: |
31+
~/.cargo/registry
32+
~/.cargo/git
33+
target
34+
key: ubuntu-cargo-${{ hashFiles('**/Cargo.lock') }}
35+
restore-keys: |
36+
ubuntu-cargo-
37+
38+
39+
- name: Checkout rustls v0.23.35
40+
uses: actions/checkout@v4
41+
with:
42+
repository: rustls/rustls
43+
ref: v0.23.35
44+
path: rustlsv0.23.35-test-workspace/rustls
45+
46+
- name: Checkout rustls-wolfcrypt-provider (quic-support)
47+
uses: actions/checkout@v4
48+
with:
49+
repository: helkoulak/rustls-wolfcrypt-provider
50+
ref: quic-support
51+
path: rustlsv0.23.35-test-workspace/rustls-wolfcrypt-provider
52+
53+
- name: Build wolfcrypt-rs
54+
working-directory: rustlsv0.23.35-test-workspace/rustls-wolfcrypt-provider/wolfcrypt-rs
55+
run: make build
56+
57+
- name: Build rustls-wolfcrypt-provider
58+
working-directory: rustlsv0.23.35-test-workspace/rustls-wolfcrypt-provider
59+
run: cargo build --all-features --release
60+
61+
- name: Checkout rustls v0.23.35 test files
62+
uses: actions/checkout@v4
63+
with:
64+
repository: helkoulak/rustls_v0.23.35_test_files
65+
path: rustlsv0.23.35-test-workspace/rustls_v0.23.35_test_files
66+
67+
- name: Prepare test workspace
68+
working-directory: rustlsv0.23.35-test-workspace
69+
run: |
70+
cp -r rustls_v0.23.35_test_files/tests .
71+
cp rustls_v0.23.35_test_files/Cargo.toml .
72+
cp rustls_v0.23.35_test_files/provider_files/Cargo.toml \
73+
rustls-wolfcrypt-provider/rustls-wolfcrypt-provider/
74+
75+
- name: Run test suite
76+
working-directory: rustlsv0.23.35-test-workspace
77+
run: |
78+
cargo test -p tests --test all_suites \
79+
--features wolfcrypt-provider,tls12,fips,zlib,prefer-post-quantum,logging \
80+
--no-default-features
81+

0 commit comments

Comments
 (0)