Skip to content

fix: ci error about runner and gm #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- "1.25.3.1"
- "1.27.1.1"

runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"

env:
OPENRESTY_VERSION: ${{ matrix.op_version }}
Expand All @@ -24,8 +24,10 @@ jobs:
- name: Check out code
uses: actions/checkout@v2

- name: Set up Clang
uses: egor-tensin/setup-clang@v1
- name: Set up build environment
run: |
sudo apt update
sudo apt install -y git wget build-essential

- name: Get dependencies
run: |
Expand All @@ -43,7 +45,7 @@ jobs:
run: |
wget https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-base.sh
chmod +x build-apisix-base.sh
OR_PREFIX=$OPENRESTY_PREFIX CC="clang -fsanitize=address -fcolor-diagnostics -Qunused-arguments" \
OR_PREFIX=$OPENRESTY_PREFIX CC="gcc -fsanitize=address -fdiagnostics-color=always -Wno-unused-but-set-variable -Wno-unused-parameter" \
cc_opt="-Werror" ./build-apisix-base.sh latest


Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/gm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ jobs:
- name: Check out code
uses: actions/checkout@v2

- name: Set up Clang
uses: egor-tensin/setup-clang@v1
- name: Set up build environment
run: |
sudo apt update
sudo apt install -y git wget build-essential

- name: Get dependencies
run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl
Expand All @@ -29,9 +31,7 @@ jobs:

- name: Install SSL lib
run: |
# TODO: use a fixed release once they have created one.
# See https://github.com/Tongsuo-Project/Tongsuo/issues/318
git clone https://github.com/api7/tongsuo --depth 1
git clone -b 8.4.0 --depth 1 https://github.com/Tongsuo-Project/Tongsuo tongsuo
pushd tongsuo
./config shared enable-ntls -g --prefix=/usr/local/tongsuo
make -j2
Expand All @@ -45,12 +45,13 @@ jobs:
- name: Install
run: |
wget https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-base.sh
sed -i '/--with-http_v3_module[[:space:]]*\\$/d' build-apisix-base.sh ## tongsuo does not support quic tls
chmod +x build-apisix-base.sh
export openssl_prefix=/usr/local/tongsuo

export cc_opt="-I${openssl_prefix}/include -Werror"
export ld_opt="-L${openssl_prefix}/lib64 -Wl,-rpath,${openssl_prefix}/lib64"
OR_PREFIX=$OPENRESTY_PREFIX CC="clang -fsanitize=address -fcolor-diagnostics -Qunused-arguments" \
OR_PREFIX=$OPENRESTY_PREFIX CC="gcc -fsanitize=address -fdiagnostics-color=always -Wno-unused-but-set-variable -Wno-unused-parameter" \
./build-apisix-base.sh latest

- name: Script
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build:
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"

steps:
- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion t/gm.t
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ SSL_do_handshake() failed
}

--- error_log
New, TLSv1.2, Cipher is ECDHE-RSA-AES256-GCM-SHA384
New, TLSv1.3, Cipher is TLS_AES_256_GCM_SHA384
--- no_error_log
[error]
[alert]
Expand Down