Skip to content

Commit

Permalink
refactor(http3): enable http3 directive only in http3 CI (#11027)
Browse files Browse the repository at this point in the history
  • Loading branch information
zll600 authored Mar 14, 2024
1 parent 963207f commit ee2a759
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/http3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ jobs:
- lua-resty-events
test_dir:
- t/http3/admin
- t/plugin/[a-k]*
- t/plugin/[l-z]*
- t/admin t/cli t/config-center-yaml t/control t/core t/debug t/discovery t/error_page t/misc
- t/node t/pubsub t/router t/script t/secret t/stream-node t/utils t/wasm t/xds-library t/xrpc

runs-on: ${{ matrix.platform }}
timeout-minutes: 90
Expand Down Expand Up @@ -72,13 +76,13 @@ jobs:
id: test_env
run: |
test_dir="${{ matrix.test_dir }}"
if [[ $test_dir =~ 't/http3/plugin' ]]; then
if [[ $test_dir =~ 't/plugin' ]]; then
echo "type=plugin" >>$GITHUB_OUTPUT
fi
if [[ $test_dir =~ 't/http3/admin' ]]; then
if [[ $test_dir =~ 't/admin' || $test_dir =~ 't/http3/admin' ]]; then
echo "type=first" >>$GITHUB_OUTPUT
fi
if [[ $test_dir =~ ' t/http3/xrpc' ]]; then
if [[ $test_dir =~ ' t/xrpc' ]]; then
echo "type=last" >>$GITHUB_OUTPUT
fi
Expand Down Expand Up @@ -183,6 +187,11 @@ jobs:
sudo cp curl /usr/bin
curl -V
- name: Enable http3 directive for test-nginx
shell: bash
run: |
sed -i 's/http3 off/http3 on/g' t/APISIX.pm
- name: Linux Script
env:
TEST_FILE_SUB_DIR: ${{ matrix.test_dir }}
Expand Down
2 changes: 1 addition & 1 deletion t/APISIX.pm
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ _EOC_
listen 1994 quic reuseport;
listen 1994 ssl;
http2 on;
http3 on;
http3 off;
ssl_certificate cert/apisix.crt;
ssl_certificate_key cert/apisix.key;
lua_ssl_trusted_certificate cert/apisix.crt;
Expand Down

0 comments on commit ee2a759

Please sign in to comment.