Skip to content

Commit def094d

Browse files
authored
fix: windows hpc image build failure#7
1 parent e195012 commit def094d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

release-tools/build.make

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -175,17 +175,6 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
175175
--label revision=$(REV) \
176176
.; \
177177
done; \
178-
if [ -f "$$dockerfile_windows_hp" ]; then \
179-
docker buildx build --push \
180-
--tag $(IMAGE_NAME):$$tag-amd64-windows-hp \
181-
--platform=windows/amd64 \
182-
--file $$dockerfile_windows_hp \
183-
--build-arg binary=./bin/$*.exe \
184-
--label revision=$(REV) \
185-
.; \
186-
docker manifest create --amend $(IMAGE_NAME):$$tag-windows-hp $(IMAGE_NAME):$$tag-amd64-windows-hp; \
187-
docker manifest push -p $(IMAGE_NAME):$$tag-windows-hp; \
188-
fi; \
189178
images=$$(echo "$$build_platforms" | tr ';' '\n' | while read -r os arch buildx_platform suffix base_image addon_image; do \
190179
escaped_base_image=$${base_image/:/-}; \
191180
escaped_buildx_platform=$${buildx_platform//\//-}; \
@@ -203,6 +192,17 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
203192
fi; \
204193
done; \
205194
docker manifest push -p $(IMAGE_NAME):$$tag; \
195+
if [ -f "$$dockerfile_windows_hp" ]; then \
196+
docker buildx build --push \
197+
--tag $(IMAGE_NAME):$$tag-amd64-windows-hp \
198+
--platform=windows/amd64 \
199+
--file $$dockerfile_windows_hp \
200+
--build-arg binary=./bin/$*.exe \
201+
--label revision=$(REV) \
202+
.; \
203+
docker manifest create --amend $(IMAGE_NAME):$$tag-windows-hp $(IMAGE_NAME):$$tag-amd64-windows-hp; \
204+
docker manifest push -p $(IMAGE_NAME):$$tag-windows-hp; \
205+
fi; \
206206
}; \
207207
if [ $(PULL_BASE_REF) = "master" ] || [ $(PULL_BASE_REF) = "main" ]; then \
208208
: "creating or overwriting canary image"; \

0 commit comments

Comments
 (0)