diff --git a/asf-site-src/source/documentation/in-progress/precommit/plugins/checkmake.html.md b/asf-site-src/source/documentation/in-progress/precommit/plugins/checkmake.html.md index df8b7130..45df5ad9 100644 --- a/asf-site-src/source/documentation/in-progress/precommit/plugins/checkmake.html.md +++ b/asf-site-src/source/documentation/in-progress/precommit/plugins/checkmake.html.md @@ -27,7 +27,7 @@ Test # Description -Runs [checkmake](https://github.com/mrtazz/checkmake) when the presence of a Makefile is found. +Runs [checkmake](https://github.com/checkmake/checkmake) when the presence of a Makefile is found. # Environment Variables diff --git a/precommit/src/main/shell/test-patch-docker/Dockerfile b/precommit/src/main/shell/test-patch-docker/Dockerfile index a658158d..d79d57ca 100644 --- a/precommit/src/main/shell/test-patch-docker/Dockerfile +++ b/precommit/src/main/shell/test-patch-docker/Dockerfile @@ -199,20 +199,14 @@ RUN curl -sSL \ #### # checkmake (Makefile linter) -# -# requires go 1.15 as of 2021-03-02 -# #### FROM yetusbase AS yetuscheckmake -ARG CHECKMAKE_VERSION=0.2.2 +ARG CHECKMAKE_VERSION=0.3.2 SHELL ["/bin/bash", "-o", "pipefail", "-c"] -ENV BUILDER_NAME='Apache Yetus' -ENV BUILDER_EMAIL='dev@apache.yetus.org' -RUN git clone \ - https://github.com/mrtazz/checkmake.git /tmp/checkmake \ - && git -C /tmp/checkmake checkout $CHECKMAKE_VERSION \ - && GOOS=linux CGO_ENABLED=0 make -C /tmp/checkmake binaries \ - && make -C /tmp/checkmake test +RUN curl -sSL \ + https://github.com/checkmake/checkmake/releases/download/v$CHECKMAKE_VERSION/checkmake-v$CHECKMAKE_VERSION."$(go env GOOS)"."$(go env GOARCH)" \ + -o /usr/local/bin/checkmake \ + && chmod +x /usr/local/bin/checkmake #### # golangci-lint (Multi-tool golang linter) @@ -429,7 +423,7 @@ COPY --from=yetusbats /opt/bats /opt/bats RUN ln -s /opt/bats/bin/bats /usr/local/bin/bats COPY --from=yetusrevive /usr/local/bin/revive /usr/local/bin -COPY --from=yetuscheckmake /tmp/checkmake/checkmake /usr/local/bin +COPY --from=yetuscheckmake /usr/local/bin/checkmake /usr/local/bin COPY --from=yetusgolangci /usr/local/bin/golangci-lint /usr/local/bin ####