Skip to content

YETUS-1269. Download pre-built checkmake binaries instead of compiling from source #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndimiduk wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −13
Open

YETUS-1269. Download pre-built checkmake binaries instead of compiling from source #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asf-site-src/source/documentation/in-progress/precommit/plugins/checkmake.html.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 6 additions & 12 deletions precommit/src/main/shell/test-patch-docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

####
Expand Down