Skip to content

Commit f856356

Browse files
committed
chore
1 parent c6563f5 commit f856356

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ concurrency:
2828
env:
2929
CARGO_TERM_COLOR: always
3030
RUST_BACKTRACE: 1
31+
# Tool versions
32+
RUST_TOOLCHAIN: '1.85.0'
33+
NEXTEST_VERSION: '0.9.100'
3134

3235
jobs:
3336
lint:
@@ -41,7 +44,7 @@ jobs:
4144
submodules: true
4245

4346
- name: Setup Rust toolchain
44-
uses: dtolnay/rust-toolchain@1.85.0
47+
uses: dtolnay/rust-toolchain@${{ env.RUST_TOOLCHAIN }}
4548
with:
4649
components: rustfmt, clippy
4750

@@ -107,7 +110,7 @@ jobs:
107110
submodules: true
108111

109112
- name: Setup Rust toolchain
110-
uses: dtolnay/rust-toolchain@1.85.0
113+
uses: dtolnay/rust-toolchain@${{ env.RUST_TOOLCHAIN }}
111114

112115
- name: Setup Rust cache
113116
uses: Swatinem/rust-cache@v2
@@ -121,7 +124,7 @@ jobs:
121124
- name: Install cargo-nextest
122125
uses: taiki-e/install-action@v2
123126
with:
124-
tool: cargo-nextest
127+
tool: cargo-nextest@${{ env.NEXTEST_VERSION }}
125128

126129
- name: Run unit tests with nextest
127130
run: |

.github/workflows/e2e-tests.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ env:
1717
CARGO_TERM_COLOR: always
1818
RUST_BACKTRACE: 1
1919
# Define the path to the single, consolidated Docker Compose file.
20-
COMPOSE_FILE: ./dt-tests/tests/docker/docker-compose.yml
20+
COMPOSE_FILE: ./dt-tests/docker/docker-compose.yml
21+
# Tool versions
22+
RUST_TOOLCHAIN: "1.85.0"
23+
NEXTEST_VERSION: "0.9.100"
2124

2225
jobs:
2326
# This job dynamically builds the test matrix.
@@ -48,9 +51,9 @@ jobs:
4851
echo "✅ A specific suite was provided. Running for: $SUITES"
4952
else
5053
# If no suite is specified, discover all available suites by listing directories.
51-
# This command lists directories, excludes non-test directories, and formats them into a JSON array.
54+
# Exclude non-test directories like test_runner and log_reader, then format into a JSON array.
5255
echo "ℹ️ No specific suite provided. Discovering all available test suites..."
53-
SUITES=$(ls -d */ | grep -v -E 'test_runner' | sed 's/\///' | jq -R . | jq -s . | jq -c .)
56+
SUITES=$(ls -d */ | grep -v -E 'test_runner|log_reader' | sed 's/\///' | jq -R . | jq -s . | jq -c .)
5457
echo "Discovered suites: $SUITES"
5558
fi
5659
echo "suites=$SUITES" >> $GITHUB_OUTPUT
@@ -76,6 +79,8 @@ jobs:
7679

7780
- name: Setup Rust Toolchain
7881
uses: actions-rust-lang/setup-rust-toolchain@v1
82+
with:
83+
toolchain: ${{ env.RUST_TOOLCHAIN }}
7984

8085
- name: Cache Rust Dependencies
8186
uses: Swatinem/rust-cache@v2
@@ -85,7 +90,7 @@ jobs:
8590
- name: Install cargo-nextest
8691
uses: taiki-e/install-action@v2
8792
with:
88-
tool: cargo-nextest
93+
tool: cargo-nextest@${{ env.NEXTEST_VERSION }}
8994

9095
- name: Start Required Services
9196
run: |

0 commit comments

Comments
 (0)