diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8192b7..7cab8a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} @@ -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: | @@ -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 diff --git a/.github/workflows/gm.yml b/.github/workflows/gm.yml index d9dc8aa..ae9e646 100644 --- a/.github/workflows/gm.yml +++ b/.github/workflows/gm.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ea3ccf9..f309331 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-latest" steps: - name: Check out code diff --git a/t/gm.t b/t/gm.t index c5a3d69..91be80b 100644 --- a/t/gm.t +++ b/t/gm.t @@ -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]