Skip to content

Commit

Permalink
Fix fips buildbox
Browse files Browse the repository at this point in the history
BUILDBOX_FIPS was removed, replaced by BUILDBOX_CENTOS7_FIPS.
Unfortunately I missed updating this target in #26859.
This subsequently broke e CI.
  • Loading branch information
wadells committed Jun 15, 2023
1 parent 5de613c commit f82b5ec
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions build.assets/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ include grpcbox.mk
# target. The other solution was to remove the 'buildbox' dependency from the 'release' target, but this would
# make it harder to run `make -C build.assets release` locally as the buildbox would not automatically be built.
BUILDBOX_NAME=$(BUILDBOX)
BUILDBOX_FIPS_NAME=$(BUILDBOX_FIPS)

DOCSBOX=ghcr.io/gravitational/docs

Expand Down Expand Up @@ -435,9 +434,9 @@ release-arm64: buildbox-arm
# CI should not use this target, it should use named Makefile targets like release-amd64-fips.
#
.PHONY:release-fips
release-fips: buildbox-fips
release-fips: buildbox-centos7-fips
@if [ -z ${VERSION} ]; then echo "VERSION is not set"; exit 1; fi
docker run $(DOCKERFLAGS) -i $(NOROOT) $(BUILDBOX_FIPS_NAME) \
docker run $(DOCKERFLAGS) -i $(NOROOT) $(BUILDBOX_CENTOS7_FIPS) \
/usr/bin/make -C e release -e ADDFLAGS="$(ADDFLAGS)" OS=$(OS) ARCH=$(ARCH) RUNTIME=$(GOLANG_VERSION) FIPS=yes VERSION=$(VERSION) GITTAG=v$(VERSION) REPRODUCIBLE=yes

#
Expand Down

0 comments on commit f82b5ec

Please sign in to comment.