diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7029197..2f3940a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,10 +36,10 @@ jobs: exit 1 fi - if [ "$reviewdog_return" -eq 1 ]; then - echo "reviewdog correctly returned failure: ${reviewdog_return}" + if [ "$reviewdog_return" -eq 0 ]; then + echo "reviewdog correctly returned success: ${reviewdog_return}" else - echo "reviewdog returned ${reviewdog_return}, expected '1'. Failing..." + echo "reviewdog returned ${reviewdog_return}, expected '0'. Failing..." exit 1 fi @@ -73,10 +73,10 @@ jobs: exit 1 fi - if [ "$reviewdog_return" -eq 1 ]; then - echo "reviewdog correctly returned failure: ${reviewdog_return}" + if [ "$reviewdog_return" -eq 0 ]; then + echo "reviewdog correctly returned success: ${reviewdog_return}" else - echo "reviewdog returned ${reviewdog_return}, expected '1'. Failing..." + echo "reviewdog returned ${reviewdog_return}, expected '0'. Failing..." exit 1 fi diff --git a/Dockerfile b/Dockerfile index 8d413ca..afd3d75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,12 +5,12 @@ ENV REVIEWDOG_VERSION=v0.9.17 SHELL ["/bin/ash", "-eo", "pipefail", "-c"] # hadolint ignore=DL3018 -RUN apk --no-cache --update add bash git curl \ +RUN apk --no-cache --update add bash git \ && rm -rf /var/cache/apk/* RUN wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s -- -b /usr/local/bin/ ${REVIEWDOG_VERSION} -RUN curl -L "$(curl -s https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip \ +RUN wget -O - -q $(wget -q https://api.github.com/repos/terraform-linters/tflint/releases/latest -O - | grep -o -E "https://.+?_linux_amd64.zip") > tflint.zip \ && unzip tflint.zip && rm tflint.zip \ && install tflint /usr/local/bin/