Skip to content

Commit 1b6230c

Browse files
committed
ci: cap thread count for rpc-tests and run all options for release PRs
1 parent 8749af2 commit 1b6230c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/rpc-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ jobs:
2424
# Apple Intel (this runner has better support to nested virtualization)
2525
- macos-15-large
2626
exclude:
27-
# Only run Linux x64 tests on pull request to save some time
28-
- sys:
29-
${{ github.event_name != 'push' && 'ubuntu-jammy-8-cores-arm64' }}
30-
- sys: ${{ github.event_name != 'push' && 'macos-15-large' }}
27+
# Only run Linux x64 on non-release PRs to save CI minutes
28+
- sys: ${{ github.event_name != 'push' && !startsWith(github.ref_name, 'release/') && 'ubuntu-jammy-8-cores-arm64' }}
29+
- sys: ${{ github.event_name != 'push' && !startsWith(github.ref_name, 'release/') && 'macos-15-large' }}
3130
runs-on: ${{ matrix.sys }}
3231
env:
33-
TEST_THREADS: ${{ contains(matrix.sys, 'macos') && '--test-threads=1' || '' }} # macOS has limited resources, so we run tests (that rely on `testcontainers`) with 1 thread
32+
TEST_THREADS: ${{ contains(matrix.sys, 'macos') && '2' || '4' }} # macOS has limited resources
3433
steps:
3534
- uses: stellar/quickstart@main
3635
with:
3736
tag: future
37+
enable: core,rpc
3838
- uses: actions/checkout@v5
3939
- uses: stellar/actions/rust-cache@main
4040
- run: rustup update
@@ -60,4 +60,4 @@ jobs:
6060
- run: make build-test-wasms
6161
- run:
6262
RUST_BACKTRACE=1 cargo test --features it --package soroban-test --test it --
63-
integration $TEST_THREADS
63+
integration --test-threads=$TEST_THREADS

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ test: build-test
5454

5555
# expects a quickstart container running with the rpc exposed at localhost:SOROBAN_PORT
5656
rpc-test:
57-
cargo test --features it --test it -- integration
57+
cargo test --features it --test it -- integration --test-threads=4
5858

5959
check:
6060
cargo clippy --all-targets

0 commit comments

Comments
 (0)