Skip to content

Commit ef9bc24

Browse files
Fix test agent tests in CI
1 parent 27bfe8e commit ef9bc24

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,21 @@ jobs:
5454
- name: "[${{ steps.rust-version.outputs.version}}] cargo build --workspace --exclude builder --verbose"
5555
shell: bash
5656
run: cargo build --workspace --exclude builder --verbose
57-
- name: "[${{ steps.rust-version.outputs.version}}] cargo nextest run --workspace --exclude builder --profile ci --verbose -E '!test(::require_test_agent::)'"
57+
- name: "[${{ steps.rust-version.outputs.version}}] cargo nextest run --workspace --exclude builder --profile ci --verbose -E '!test(require_test_agent::)'"
5858
shell: bash
5959
# Run doc tests with cargo test and run tests with nextest and generate junit.xml
60-
run: cargo test --workspace --exclude builder --doc --verbose && cargo nextest run --workspace --exclude builder --profile ci --verbose -E '!test(::require_test_agent::)'
60+
run: cargo test --workspace --exclude builder --doc --verbose && cargo nextest run --workspace --exclude builder --profile ci --verbose -E '!test(require_test_agent::)'
6161
env:
6262
RUST_BACKTRACE: 1
63-
- name: "[${{ steps.rust-version.outputs.version}}] Test agent tests: cargo nextest run --workspace --exclude builder --profile ci --verbose -E 'test(::require_test_agent::)'"
63+
- name: "[${{ steps.rust-version.outputs.version}}] Test agent tests: cargo nextest run --workspace --exclude builder --profile ci --verbose -E 'test(require_test_agent::)'"
6464
if: runner.os == 'Linux'
6565
shell: bash
66-
run: cargo nextest run --workspace --exclude builder --profile ci --verbose -E 'test(::require_test_agent::)'
66+
run: cargo nextest run --workspace --exclude builder --profile ci --verbose -E 'test(require_test_agent::)'
6767
env:
6868
RUST_BACKTRACE: 1
69-
- name: "[${{ steps.rust-version.outputs.version}}] RUSTFLAGS=\"-C prefer-dynamic\" cargo nextest run --package test_spawn_from_lib --features prefer-dynamic -E '!test(::require_test_agent::)'"
69+
- name: "[${{ steps.rust-version.outputs.version}}] RUSTFLAGS=\"-C prefer-dynamic\" cargo nextest run --package test_spawn_from_lib --features prefer-dynamic -E '!test(require_test_agent::)'"
7070
shell: bash
71-
run: cargo nextest run --package test_spawn_from_lib --features prefer-dynamic -E '!test(::require_test_agent::)'
71+
run: cargo nextest run --package test_spawn_from_lib --features prefer-dynamic -E '!test(require_test_agent::)'
7272
env:
7373
RUSTFLAGS: "-C prefer-dynamic"
7474
RUST_BACKTRACE: 1
@@ -220,8 +220,8 @@ jobs:
220220
rust_version: cross-centos7
221221
- run: cargo install cross || true
222222
- run: cross build --workspace --target x86_64-unknown-linux-gnu --exclude builder
223-
- run: cross test --workspace --target x86_64-unknown-linux-gnu --exclude builder -- --skip "::single_threaded_tests::" --skip "::require_test_agent::"
224-
- run: cross test --workspace --target x86_64-unknown-linux-gnu --exclude builder --exclude bin_tests -- --skip "::tests::" --skip "::api_tests::" --test-threads 1 --skip "::require_test_agent::"
223+
- run: cross test --workspace --target x86_64-unknown-linux-gnu --exclude builder -- --skip "::single_threaded_tests::" --skip "require_test_agent::"
224+
- run: cross test --workspace --target x86_64-unknown-linux-gnu --exclude builder --exclude bin_tests -- --skip "::tests::" --skip "::api_tests::" --test-threads 1 --skip "require_test_agent::"
225225

226226
ffi_bake:
227227
strategy:

tools/docker/Dockerfile.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ENV CARGO_HOME="/root/.cargo"
2020
WORKDIR /build
2121

2222
RUN apk update \
23-
&& apk add --no-cache \
23+
&& apk add --no-cache \
2424
build-base \
2525
cargo \
2626
cmake \
@@ -33,7 +33,7 @@ RUN apk update \
3333
unzip \
3434
bash \
3535
clang16-libclang \
36-
&& mkdir /usr/local/src
36+
&& mkdir /usr/local/src
3737

3838
# Tell docker to use bash as the default
3939
SHELL ["/bin/bash", "-c"]
@@ -45,7 +45,7 @@ SHELL ["/bin/bash", "-c"]
4545

4646
FROM alpine_base as alpine_aws_cli
4747
RUN apk add --no-cache aws-cli \
48-
&& rm -rf /var/cache/apk/*
48+
&& rm -rf /var/cache/apk/*
4949

5050
RUN aws --version # Just to make sure its installed alright
5151

0 commit comments

Comments
 (0)