Skip to content

Commit 07751b0

Browse files
committed
fix ci
1 parent 0e60c64 commit 07751b0

6 files changed

Lines changed: 16 additions & 11 deletions

File tree

.github/workflows/codecov.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env:
3131
jobs:
3232
lib-unit-test:
3333
name: lib unit test
34-
runs-on: ubuntu-latest
34+
runs-on: ubuntu-26.04
3535
steps:
3636
- name: Checkout sources
3737
uses: actions/checkout@v7
@@ -45,13 +45,14 @@ jobs:
4545
- name: Install build dependencies
4646
run: |
4747
sudo apt-get update
48-
sudo apt-get install capnproto libjemalloc-dev libmimalloc-dev libc-ares-dev libssl-dev liblua5.4-dev
48+
sudo apt-get install capnproto libjemalloc-dev libmimalloc-dev libc-ares-dev libssl-dev libpython3-dev liblua5.4-dev
4949
sudo apt-get install libbpf-dev linux-bpf-dev
5050
- name: Install binutils
5151
run: |
5252
cargo install cargo-binutils@0.3.6
5353
- name: run unit test
5454
run: |
55+
cargo clean
5556
./scripts/coverage/lib_unit_test.sh
5657
- name: Upload coverage data
5758
uses: codecov/codecov-action@v7
@@ -65,7 +66,7 @@ jobs:
6566
verbose: false
6667
vey-mkcert-test:
6768
name: vey-mkcert test
68-
runs-on: ubuntu-latest
69+
runs-on: ubuntu-26.04
6970
steps:
7071
- name: Checkout sources
7172
uses: actions/checkout@v7
@@ -98,7 +99,7 @@ jobs:
9899
verbose: false
99100
vey-keyless-test:
100101
name: vey-keyless test
101-
runs-on: ubuntu-latest
102+
runs-on: ubuntu-26.04
102103
steps:
103104
- name: Checkout sources
104105
uses: actions/checkout@v7
@@ -277,7 +278,7 @@ jobs:
277278
verbose: false
278279
vey-statsd-test:
279280
name: vey-statsd test
280-
runs-on: ubuntu-latest
281+
runs-on: ubuntu-26.04
281282
steps:
282283
- name: Checkout sources
283284
uses: actions/checkout@v7

.github/workflows/static.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: |
4747
sudo apt-get update
4848
sudo apt-get install capnproto musl-tools
49-
sudp apt-get install autoconf autopoint flex bison gawk
49+
sudo apt-get install autoconf autopoint flex bison gawk
5050
- name: Cargo build
5151
run: cargo build --target=x86_64-unknown-linux-musl --no-default-features --features secure-vendored-mimalloc,vendored-ebpf,${{ matrix.feature }},quic,vendored-c-ares
5252
musl-clang:
@@ -78,7 +78,7 @@ jobs:
7878
- name: Install dependencies
7979
run: |
8080
apk add --no-cache musl-dev linux-headers libc++-dev llvm-libunwind-static
81-
apk add --no-cache autoconf gettext flex bison gawk
81+
apk add --no-cache autoconf automake argp-standalone musl-fts-dev musl-obstack-dev musl-libintl gettext-tiny flex bison gawk
8282
apk add --no-cache clang lld capnproto-dev clang-libclang cmake make
8383
- name: Install Go for AWS-LC-FIPS
8484
if: contains(matrix.feature, 'vendored-aws-lc-fips')
@@ -114,7 +114,7 @@ jobs:
114114
- name: Install dependencies
115115
run: |
116116
apk add --no-cache musl-dev linux-headers libc++-dev libc++-static llvm-libunwind-static
117-
apk add --no-cache autoconf gettext flex bison gawk
117+
apk add --no-cache autoconf automake argp-standalone musl-fts-dev musl-obstack-dev musl-libintl gettext-tiny flex bison gawk
118118
apk add --no-cache clang lld capnproto-dev clang-libclang cmake make
119119
- name: Cargo build
120120
run: cargo $UNSTABLE_OPTIONS build --no-default-features --features secure-vendored-mimalloc,vendored-ebpf,${{ matrix.feature }},quic,vendored-c-ares

lib/vey-reuseport/build.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ fn compile_single(name: &str) {
6565
}
6666
}
6767

68+
if let Ok(dir) = env::var("DEP_BPF_INCLUDE") {
69+
cmd.arg("-I").arg(&dir);
70+
}
71+
6872
cmd.arg("-g")
6973
.arg("-O2")
7074
.arg("-target")

scripts/coverage/vey-bench/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ docker compose -f "${PROJECT_DIR}"/scripts/coverage/vey-bench/docker-compose.yml
99
PROXY_PID=$!
1010

1111
# start vey-statsd
12-
wait4x tcp 127.0.0.1:8181
12+
wait4x http http://127.0.0.1:8181
1313
[ -n "${INFLUX_TOKEN}" ] || INFLUX_TOKEN=$(curl -X POST http://127.0.0.1:8181/api/v3/configure/token/admin | jq ".token" -r)
1414
export INFLUX_TOKEN
1515
"${PROJECT_DIR}"/target/debug/vey-statsd -c "${RUN_DIR}"/vey-statsd.yaml -G ${TEST_NAME} &

scripts/coverage/vey-proxy/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ DCGEN_PID=$!
3131
IPLOC_PID=$!
3232

3333
# start vey-statsd
34-
wait4x tcp 127.0.0.1:8181
34+
wait4x http http://127.0.0.1:8181
3535
[ -n "${INFLUXDB3_AUTH_TOKEN}" ] || INFLUXDB3_AUTH_TOKEN=$(curl -X POST http://127.0.0.1:8181/api/v3/configure/token/admin | jq ".token" -r)
3636
export INFLUXDB3_AUTH_TOKEN
3737
"${PROJECT_DIR}"/target/debug/vey-statsd -c "${RUN_DIR}"/vey-statsd.yaml -G ${TEST_NAME} &

scripts/coverage/vey-statsd/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
docker compose -f "${PROJECT_DIR}"/scripts/coverage/vey-statsd/docker-compose.yml up -d
33

44
# get influxdb auth token
5-
wait4x tcp 127.0.0.1:8181
5+
wait4x http http://127.0.0.1:8181
66
[ -n "${INFLUXDB3_AUTH_TOKEN}" ] || INFLUXDB3_AUTH_TOKEN=$(curl -X POST http://127.0.0.1:8181/api/v3/configure/token/admin | jq ".token" -r)
77
export INFLUXDB3_AUTH_TOKEN
88

0 commit comments

Comments
 (0)