cloud/h2o
1
0
Fork 0
mirror of https://github.com/h2o/h2o.git synced 2025-05-14 09:42:33 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

update ci to ubuntu2404 (noble)

Browse Source
This commit is contained in:
Joe Calderon 2025-02-12 14:49:01 -08:00 committed by Kazuho Oku
parent b438f61c37
commit cbd1b3a387
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
command: make -f misc/docker-ci/check.mk ossl1.1.0+fuzz BUILD_ARGS=-j6 TEST_ENV='TEST_JOBS=4 TEST_PLATFORM=github-actions'
- name: OpenSSL 1.1.1
command: make -f misc/docker-ci/check.mk ossl1.1.1 BUILD_ARGS=-j6 TEST_ENV='TEST_JOBS=4 TEST_PLATFORM=github-actions'
- name: OpenSSL 3.0 (Ubuntu 22.04 / DTrace)
- name: OpenSSL 3.0 (Ubuntu 24.04 / DTrace)
command: make -f misc/docker-ci/check.mk ossl3.0 BUILD_ARGS=-j6 TEST_ENV='TEST_JOBS=4 TEST_PLATFORM=github-actions'
- name: boringssl
command: make -f misc/docker-ci/check.mk boringssl BUILD_ARGS=-j6 TEST_ENV='TEST_JOBS=4 TEST_PLATFORM=github-actions'

8
misc/docker-ci/check.mk
View File

@ -40,7 +40,7 @@ ossl1.1.1:
TMP_SIZE='$(TMP_SIZE)'
ossl3.0:
docker run $(DOCKER_RUN_OPTS) h2oserver/h2o-ci:ubuntu2204 \
docker run $(DOCKER_RUN_OPTS) h2oserver/h2o-ci:ubuntu2404 \
env DTRACE_TESTS=1 \
make -f $(SRC_DIR)/misc/docker-ci/check.mk _check \
CMAKE_ARGS='-DCMAKE_C_FLAGS=-Werror=format' \
@ -49,7 +49,7 @@ ossl3.0:
TMP_SIZE='$(TMP_SIZE)'
boringssl:
docker run $(DOCKER_RUN_OPTS) h2oserver/h2o-ci:ubuntu2204 \
docker run $(DOCKER_RUN_OPTS) h2oserver/h2o-ci:ubuntu2404 \
make -f $(SRC_DIR)/misc/docker-ci/check.mk _check \
CMAKE_ARGS='-DOPENSSL_ROOT_DIR=/opt/boringssl' \
BUILD_ARGS='$(BUILD_ARGS)' \
@ -57,7 +57,7 @@ boringssl:
TMP_SIZE='$(TMP_SIZE)'
asan:
docker run $(DOCKER_RUN_OPTS) h2oserver/h2o-ci:ubuntu2004 \
docker run $(DOCKER_RUN_OPTS) h2oserver/h2o-ci:ubuntu2404 \
make -f $(SRC_DIR)/misc/docker-ci/check.mk _check \
CMAKE_ARGS='-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address' \
BUILD_ARGS='$(BUILD_ARGS)' \
@ -66,7 +66,7 @@ asan:
# https://clang.llvm.org/docs/SourceBasedCodeCoverage.html
coverage:
docker run $(DOCKER_RUN_OPTS) h2oserver/h2o-ci:ubuntu2204 \
docker run $(DOCKER_RUN_OPTS) h2oserver/h2o-ci:ubuntu2404 \
make -f $(SRC_DIR)/misc/docker-ci/check.mk _check _coverage_report \
CMAKE_ARGS='-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="-fprofile-instr-generate -fcoverage-mapping -mllvm -runtime-counter-relocation" -DCMAKE_CXX_FLAGS= -DCMAKE_BUILD_TYPE=Debug -DWITH_H2OLOG=OFF' \
BUILD_ARGS='$(BUILD_ARGS)' \

8
t/40server-push-attrs.t
View File

@ -32,7 +32,7 @@ hosts:
mruby.handler: |
Proc.new do |env|
attr = env["QUERY_STRING"]
[399, {"link" => "</index.js>; rel=preload; as=script; #{attr}"}, []]
[399, {"link" => "</index.js>;rel=preload;as=script;#{attr}"}, []]
end
file.dir: @{[DOC_ROOT]}
/assets:
@ -69,15 +69,15 @@ unlike $resp, qr{link:\s*\n}, "push-only doesn't appear in the link header";
# mruby
$resp = `nghttp -vn --stat 'https://127.0.0.1:$server->{tls_port}/mruby/'`;
like $resp, qr{\nid\s*responseEnd\s.*\s/index\.js}is, "index.js is pushed";
like $resp, qr{link: </index.js>; rel=preload; as=script;}, "Found link header";
like $resp, qr{link: </index.js>;rel=preload;as=script;}, "Found link header";
$resp = `nghttp -vn --stat 'https://127.0.0.1:$server->{tls_port}/mruby/?nopush'`;
unlike $resp, qr{\nid\s*responseEnd\s.*\s/index\.js}is, "index.js is NOT pushed";
like $resp, qr{link: </index.js>; rel=preload; as=script;}, "Found link header";
like $resp, qr{link: </index.js>;rel=preload;as=script;}, "Found link header";
$resp = `nghttp -vn --stat 'https://127.0.0.1:$server->{tls_port}/mruby/?x-http2-push-only'`;
like $resp, qr{\nid\s*responseEnd\s.*\s/index\.js}is, "index.js is pushed";
unlike $resp, qr{link: </index.js>; rel=preload; as=script;}, "Didn't find link header";
unlike $resp, qr{link: </index.js>;rel=preload;as=script;}, "Didn't find link header";
done_testing;