From 6251eb44361fd5163684548b41a5cc1a74b56da5 Mon Sep 17 00:00:00 2001 From: monkeyDluffy6017 Date: Sun, 8 Oct 2023 22:21:53 +0800 Subject: [PATCH] ci: fix ci problem --- .../build_and_test_with_resty_events.yml | 1 - .../build_and_test_with_worker_events.yml | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_and_test_with_resty_events.yml b/.github/workflows/build_and_test_with_resty_events.yml index a72f4cb..46cbab7 100644 --- a/.github/workflows/build_and_test_with_resty_events.yml +++ b/.github/workflows/build_and_test_with_resty_events.yml @@ -21,7 +21,6 @@ jobs: sudo systemctl disable nginx sudo systemctl stop nginx - - name: Set environment variables env: OPENRESTY_VER: ${{ matrix.openresty-version }} diff --git a/.github/workflows/build_and_test_with_worker_events.yml b/.github/workflows/build_and_test_with_worker_events.yml index bf9ddba..55e0f7a 100644 --- a/.github/workflows/build_and_test_with_worker_events.yml +++ b/.github/workflows/build_and_test_with_worker_events.yml @@ -21,12 +21,13 @@ jobs: sudo systemctl disable nginx sudo systemctl stop nginx - - name: Set environment variables env: OPENRESTY_VER: ${{ matrix.openresty-version }} + LUAROCKS_VER: 3.9.0 run: | echo "/usr/local/openresty/nginx/sbin" >> $GITHUB_PATH + echo "LUAROCKS=$LUAROCKS_VER" >> $GITHUB_ENV - name: Checkout lua-resty-healthcheck uses: actions/checkout@v3 @@ -42,7 +43,17 @@ jobs: sudo apt-get -y install openresty=$OPENRESTY_VER-1~focal1 - name: Install LuaRocks - run: sudo apt-get install -y luarocks + run: | + curl -sSLO https://luarocks.org/releases/luarocks-$LUAROCKS.tar.gz + tar -xzf luarocks-$LUAROCKS.tar.gz + cd luarocks-$LUAROCKS + ./configure \ + --prefix=$INSTALL_ROOT \ + --lua-suffix=jit \ + --with-lua=$INSTALL_ROOT/luajit \ + --with-lua-include=$INSTALL_ROOT/luajit/include/luajit-2.1 + make build + make install - name: Install manual dependencies run: | @@ -55,9 +66,6 @@ jobs: cpanm --notest --local-lib=$HOME/perl5 local::lib && eval $(perl -I $HOME/perl5/lib/perl5/ -Mlocal::lib) cpanm --notest Test::Nginx - - name: Checkout lua-resty-healthcheck - uses: actions/checkout@v3 - - name: Install lua-resty-healthcheck run: sudo luarocks make