Merge pull request #266 from rendhalver/ci-updates

CI fixes before the golang CLI
openshift · Apr 17, 2024 · 98a483c · 98a483c
2 parents 96e2e5d + a0210c5
commit 98a483c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.ci/pull-request-check.sh b/.ci/pull-request-check.sh
@@ -3,7 +3,8 @@
 set -euo pipefail
 
 # Build the images
-./.ci/build.sh
+make BUILD_ARGS="--no-cache" build-image-amd64
+# make BUILD_ARGS="--no-cache" build-image-arm64
 
 make TAG=latest-amd64 ARCHITECTURE=amd64 tag
 # make TAG=latest-arm64 ARCHITECTURE=arm64 tag
diff --git a/.ci/release-build.sh b/.ci/release-build.sh
@@ -3,11 +3,13 @@
 set -euo pipefail
 
 # Build the images
-./.ci/build.sh
+make BUILD_ARGS="--no-cache" build-image-amd64
+# make BUILD_ARGS="--no-cache" build-image-arm64
 
 make TAG=latest-amd64 ARCHITECTURE=amd64 tag
 # make TAG=latest-arm64 ARCHITECTURE=arm64 tag
 
+make registry-login
 make TAG=latest-amd64 ARCHITECTURE=amd64 push
 # make TAG=latest-arm64 ARCHITECTURE=arm64 push
 

diff --git a/Makefile b/Makefile
@@ -22,6 +22,14 @@ init:
 build:
 	bash build.sh
 
+.PHONY: build-image-amd64
+build-image-amd64:
+	@${CONTAINER_ENGINE} build $(BUILD_ARGS) --platform=linux/amd64 -t $(IMAGE_NAME):$(TAG)-amd64 .
+
+.PHONY: build-image-arm64
+build-image-arm64:
+	@${CONTAINER_ENGINE} build $(BUILD_ARGS) --platform=linux/arm64 -t $(IMAGE_NAME):$(TAG)-arm64 .
+
 .PHONY: registry-login
 registry-login:
 	@test "${REGISTRY_USER}" != "" && test "${REGISTRY_TOKEN}" != "" || (echo "REGISTRY_USER and REGISTRY_TOKEN must be defined" && exit 1)