From 666a03cc36800fdd49c11d20e4d113e6d586569e Mon Sep 17 00:00:00 2001 From: Edi Septriyanto Date: Thu, 12 Aug 2021 00:05:38 +0700 Subject: [PATCH 1/2] Fix curl error --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca64d52..490caf0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,9 +39,10 @@ jobs: run: | sudo apt-get update -qq -y sudo apt-get install -qq -y bash curl - sudo curl -s -o /usr/local/bin/shunit2 https://raw.githubusercontent.com/kward/shunit2/master/shunit2 + sudo curl -sLO https://raw.githubusercontent.com/kward/shunit2/master/shunit2 + sudo mv shunit2 /usr/local/bin/ sudo chmod a+x /usr/local/bin/shunit2 - sudo curl -s -o shellcheck-v0.7.2.linux.x86_64.tar.xz https://github.com/koalaman/shellcheck/releases/download/v0.7.2/shellcheck-v0.7.2.linux.x86_64.tar.xz + sudo curl -sLO https://github.com/koalaman/shellcheck/releases/download/v0.7.2/shellcheck-v0.7.2.linux.x86_64.tar.xz sudo tar -xf shellcheck-v0.7.2.linux.x86_64.tar.xz sudo mv shellcheck-v0.7.2/shellcheck /usr/local/bin/ sudo chmod a+x /usr/local/bin/shellcheck From 80bd06dd96b1ad87fd23debd057abddd4e84c264 Mon Sep 17 00:00:00 2001 From: Edi Septriyanto Date: Thu, 12 Aug 2021 00:39:29 +0700 Subject: [PATCH 2/2] Fix test error --- .github/workflows/main.yml | 18 ++++++++++-------- scripts/install_nginx.sh | 2 ++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 490caf0..acfcee3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 # Prepare testing environment @@ -37,20 +37,21 @@ jobs: # Install Dependencies - name: Install testing dependencies run: | - sudo apt-get update -qq -y - sudo apt-get install -qq -y bash curl - sudo curl -sLO https://raw.githubusercontent.com/kward/shunit2/master/shunit2 - sudo mv shunit2 /usr/local/bin/ - sudo chmod a+x /usr/local/bin/shunit2 - sudo curl -sLO https://github.com/koalaman/shellcheck/releases/download/v0.7.2/shellcheck-v0.7.2.linux.x86_64.tar.xz + set -x + sudo apt-get update -q -y + sudo apt-get install -q -y bash curl + sudo curl -sSL -o /usr/local/bin/shunit2 https://raw.githubusercontent.com/kward/shunit2/master/shunit2 + sudo chmod +x /usr/local/bin/shunit2 + sudo curl -sSLO https://github.com/koalaman/shellcheck/releases/download/v0.7.2/shellcheck-v0.7.2.linux.x86_64.tar.xz sudo tar -xf shellcheck-v0.7.2.linux.x86_64.tar.xz sudo mv shellcheck-v0.7.2/shellcheck /usr/local/bin/ - sudo chmod a+x /usr/local/bin/shellcheck + sudo chmod +x /usr/local/bin/shellcheck # Shellcheck Tests - name: Run shellcheck testing env: TERM: xterm-256color run: | + set -x shellcheck -s bash -x install.sh shellcheck -s bash -x remove.sh shellcheck -s bash -x lib/lemper-*.sh @@ -64,6 +65,7 @@ jobs: env: TERM: xterm-256color run: | + set -x sudo bash scripts/cleanup_server.sh sudo bash scripts/install_dependencies.sh sudo bash shunit2/run_test.sh diff --git a/scripts/install_nginx.sh b/scripts/install_nginx.sh index d6dfea8..6c58a45 100755 --- a/scripts/install_nginx.sh +++ b/scripts/install_nginx.sh @@ -199,6 +199,7 @@ function init_nginx_install() { fi # NJS is a subset of the JavaScript language that allows extending nginx functionality. + # shellcheck disable=SC2153 if "${NGX_HTTP_JS}"; then echo "Adding ngx-http-js module..." #EXTRA_MODULE_PKGS=("${EXTRA_MODULE_PKGS[@]}" "libnginx-mod-js") @@ -801,6 +802,7 @@ function init_nginx_install() { fi # NJS is a subset of the JavaScript language that allows extending nginx functionality. + # shellcheck disable=SC2153 if "${NGX_HTTP_JS}"; then echo "Adding ngx-http-js module..." run git clone https://github.com/nginx/njs.git