Skip to content

Commit 43f61a4

Browse files
committed
CI: Move native-dispatcher tests to Linux
1 parent b620bb4 commit 43f61a4

File tree

1 file changed

+29
-6
lines changed

1 file changed

+29
-6
lines changed

.circleci/config.yml

+29-6
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,34 @@ commands:
8383
glean_parser coverage --allow-reserved -c glean_coverage.txt -f codecovio -o codecov.json glean-core/metrics.yaml
8484
bin/codecov.sh -X yaml -f codecov.json
8585
86+
test-rust-native-dispatcher:
87+
steps:
88+
- run:
89+
name: Install required dependencies
90+
command: |
91+
sudo apt update
92+
sudo apt install -y cmake ninja-build clang
93+
- run:
94+
name: Install libdispatch
95+
command: |
96+
cd ~
97+
git clone https://github.com/apple/swift-corelibs-libdispatch
98+
cd swift-corelibs-libdispatch
99+
mkdir build && cd build
100+
cmake -G Ninja \
101+
-DCMAKE_C_COMPILER=clang \
102+
-DCMAKE_CXX_COMPILER=clang++ \
103+
-DCMAKE_BUILD_WITH_INSTALL_RPATH=On \
104+
..
105+
ninja
106+
sudo ninja install
107+
108+
- run:
109+
name: Run Rust tests with native dispatcher
110+
command: |
111+
export LD_LIBRARY_PATH=/usr/local/lib
112+
cargo test --verbose --jobs 6 --features native-dispatcher -- --nocapture
113+
86114
install-rustup:
87115
steps:
88116
- run:
@@ -324,6 +352,7 @@ jobs:
324352
resource_class: "medium+"
325353
steps:
326354
- test-rust
355+
- test-rust-native-dispatcher
327356

328357
Rust tests - beta:
329358
docker:
@@ -529,12 +558,6 @@ jobs:
529558
keys:
530559
- v2-cargo-cache-{{arch}}-{{checksum "buildtype.txt"}}-{{checksum "Cargo.lock"}}
531560

532-
# Experimental - we might move this to Linux with an appropriate libdispatch later
533-
- run:
534-
name: Run Rust tests with native dispatcher
535-
command: |
536-
cargo test --verbose --jobs 6 --features native-dispatcher -- --nocapture
537-
538561
- run:
539562
name: Run iOS build
540563
command: bash bin/run-ios-build.sh

0 commit comments

Comments
 (0)