Skip to content

Commit d81f96d

Browse files
committed
ci-basic.yml: test both with and without nu7/tx_v6 flags using a matrix
1 parent 4371740 commit d81f96d

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

.github/workflows/ci-basic.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ jobs:
77
test:
88
runs-on: ubuntu-latest
99

10+
strategy:
11+
matrix:
12+
nu7:
13+
- true
14+
- false
15+
1016
env:
1117
# Use system-installed RocksDB library instead of building from scratch
1218
ROCKSDB_LIB_DIR: /usr/lib
@@ -33,10 +39,24 @@ jobs:
3339
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler librocksdb-dev
3440
- name: Install formatting & linting tools
3541
run: rustup component add rustfmt clippy
36-
- name: Run tests
37-
run: timeout --preserve-status 1h cargo test --verbose --locked
42+
3843
- name: Verify working directory is clean
3944
run: git diff --exit-code
45+
46+
- name: Strip nu7/tx_v6 flags from config
47+
if: ${{ !matrix.nu7 }}
48+
run: |
49+
python3 - <<'EOF'
50+
import re
51+
cfg = open('.cargo/config.toml').read()
52+
# Remove tx_v6 and nu7 flags along with their preceding comments
53+
cfg = re.sub(r'[ \t]*#[^\n]*tx_v6[^\n]*\n[ \t]*"--cfg",[^\n]*tx_v6[^\n]*\n', '', cfg)
54+
cfg = re.sub(r'[ \t]*#[^\n]*nu7[^\n]*\n[ \t]*"--cfg",[^\n]*nu7[^\n]*\n', '', cfg)
55+
open('.cargo/config.toml', 'w').write(cfg)
56+
EOF
57+
58+
- name: Run tests
59+
run: timeout --preserve-status 1h cargo test --verbose --locked
4060
- name: Run doc check
4161
run: cargo doc --workspace --no-deps --all-features --document-private-items --locked
4262
- name: Run format check

0 commit comments

Comments
 (0)