Skip to content

Commit a54d810

Browse files
authored
fix: ci error about runner and gm (#102)
1 parent 802cc05 commit a54d810

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

.github/workflows/ci.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- "1.25.3.1"
1515
- "1.27.1.1"
1616

17-
runs-on: "ubuntu-20.04"
17+
runs-on: "ubuntu-latest"
1818

1919
env:
2020
OPENRESTY_VERSION: ${{ matrix.op_version }}
@@ -24,8 +24,10 @@ jobs:
2424
- name: Check out code
2525
uses: actions/checkout@v2
2626

27-
- name: Set up Clang
28-
uses: egor-tensin/setup-clang@v1
27+
- name: Set up build environment
28+
run: |
29+
sudo apt update
30+
sudo apt install -y git wget build-essential
2931
3032
- name: Get dependencies
3133
run: |
@@ -43,7 +45,7 @@ jobs:
4345
run: |
4446
wget https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-base.sh
4547
chmod +x build-apisix-base.sh
46-
OR_PREFIX=$OPENRESTY_PREFIX CC="clang -fsanitize=address -fcolor-diagnostics -Qunused-arguments" \
48+
OR_PREFIX=$OPENRESTY_PREFIX CC="gcc -fsanitize=address -fdiagnostics-color=always -Wno-unused-but-set-variable -Wno-unused-parameter" \
4749
cc_opt="-Werror" ./build-apisix-base.sh latest
4850
4951

.github/workflows/gm.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ jobs:
1616
- name: Check out code
1717
uses: actions/checkout@v2
1818

19-
- name: Set up Clang
20-
uses: egor-tensin/setup-clang@v1
19+
- name: Set up build environment
20+
run: |
21+
sudo apt update
22+
sudo apt install -y git wget build-essential
2123
2224
- name: Get dependencies
2325
run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl
@@ -29,9 +31,7 @@ jobs:
2931
3032
- name: Install SSL lib
3133
run: |
32-
# TODO: use a fixed release once they have created one.
33-
# See https://github.com/Tongsuo-Project/Tongsuo/issues/318
34-
git clone https://github.com/api7/tongsuo --depth 1
34+
git clone -b 8.4.0 --depth 1 https://github.com/Tongsuo-Project/Tongsuo tongsuo
3535
pushd tongsuo
3636
./config shared enable-ntls -g --prefix=/usr/local/tongsuo
3737
make -j2
@@ -45,12 +45,13 @@ jobs:
4545
- name: Install
4646
run: |
4747
wget https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-base.sh
48+
sed -i '/--with-http_v3_module[[:space:]]*\\$/d' build-apisix-base.sh ## tongsuo does not support quic tls
4849
chmod +x build-apisix-base.sh
4950
export openssl_prefix=/usr/local/tongsuo
5051
5152
export cc_opt="-I${openssl_prefix}/include -Werror"
5253
export ld_opt="-L${openssl_prefix}/lib64 -Wl,-rpath,${openssl_prefix}/lib64"
53-
OR_PREFIX=$OPENRESTY_PREFIX CC="clang -fsanitize=address -fcolor-diagnostics -Qunused-arguments" \
54+
OR_PREFIX=$OPENRESTY_PREFIX CC="gcc -fsanitize=address -fdiagnostics-color=always -Wno-unused-but-set-variable -Wno-unused-parameter" \
5455
./build-apisix-base.sh latest
5556
5657
- name: Script

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: "ubuntu-20.04"
11+
runs-on: "ubuntu-latest"
1212

1313
steps:
1414
- name: Check out code

t/gm.t

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ SSL_do_handshake() failed
364364
}
365365
366366
--- error_log
367-
New, TLSv1.2, Cipher is ECDHE-RSA-AES256-GCM-SHA384
367+
New, TLSv1.3, Cipher is TLS_AES_256_GCM_SHA384
368368
--- no_error_log
369369
[error]
370370
[alert]

0 commit comments

Comments
 (0)