Skip to content

Commit

Permalink
Only build build-harness from the build-harness project (bug in #299) (
Browse files Browse the repository at this point in the history
  • Loading branch information
Nuru authored Nov 17, 2021
1 parent 8a9f428 commit fc87eaa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ RUN apk --update --no-cache add \
yq@cloudposse && \
sed -i /PATH=/d /etc/profile

# Use Terraform 0.13 by default
# Use Terraform 1.x by default
ARG DEFAULT_TERRAFORM_VERSION=1
RUN update-alternatives --set terraform /usr/share/terraform/$DEFAULT_TERRAFORM_VERSION/bin/terraform && \
mkdir -p /build-harness/vendor && \
Expand Down
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ auto-label:
for module in $(MODULES); do \
echo "$${module%/}: $${module}**"; \
done > .github/$@.yml

# builder/build is defined in templates/Makefile.build-harness
build: builder/build

endif

# Import Makefiles into current context
Expand All @@ -54,6 +58,3 @@ ifndef TRANSLATE_COLON_NOTATION
endif

endif

# builder/build is defined in templates/Makefile.build-harness
build: builder/build

0 comments on commit fc87eaa

Please sign in to comment.