From e6ac96095150dc14cae0273fc6219efbf3bff2b2 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 11 Jul 2024 18:09:48 +0200 Subject: [PATCH] make targets separated by OS Signed-off-by: Avi Deitcher --- .github/workflows/release.yml | 4 ++-- Makefile | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d82224f5f..86034e751 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: - name: Build run: | - make build-targets-all + make build-targets-linux build-targets-windows env: GOPATH: ${{runner.workspace}} @@ -58,7 +58,7 @@ jobs: - name: Build run: | - make build-target-macos + make build-targets-macos env: GOPATH: ${{runner.workspace}} diff --git a/Makefile b/Makefile index 1b58e4cbc..8487b0dfd 100644 --- a/Makefile +++ b/Makefile @@ -119,22 +119,27 @@ endif ./scripts/update-component-sha.sh --image $${img}$(image); \ done -.PHONY: build-targets-all -build-targets-all: bin - $(MAKE) GOOS=darwin GOARCH=amd64 LOCAL_TARGET=$(CURDIR)/bin/linuxkit-darwin-amd64 local-build - file bin/linuxkit-darwin-amd64 +.PHONY: build-targets-all build-targets-linux build-targets-windows build-targets-macos checksum-targets + +build-targets-all: build-targets-linux build-targets-windows build-targets-macos + +build-targets-linux: bin $(MAKE) GOOS=linux GOARCH=arm64 LOCAL_TARGET=$(CURDIR)/bin/linuxkit-linux-arm64 local-build file bin/linuxkit-linux-arm64 $(MAKE) GOOS=linux GOARCH=amd64 LOCAL_TARGET=$(CURDIR)/bin/linuxkit-linux-amd64 local-build file bin/linuxkit-linux-amd64 $(MAKE) GOOS=linux GOARCH=s390x LOCAL_TARGET=$(CURDIR)/bin/linuxkit-linux-s390x local-build file bin/linuxkit-linux-s390x + +build-targets-windows: bin $(MAKE) GOOS=windows GOARCH=amd64 LOCAL_TARGET=$(CURDIR)/bin/linuxkit-windows-amd64.exe local-build file bin/linuxkit-windows-amd64.exe -build-target-macos: bin +build-targets-macos: bin $(MAKE) GOOS=darwin GOARCH=arm64 LOCAL_TARGET=$(CURDIR)/bin/linuxkit-darwin-arm64 local-build file bin/linuxkit-darwin-arm64 + $(MAKE) GOOS=darwin GOARCH=amd64 LOCAL_TARGET=$(CURDIR)/bin/linuxkit-darwin-amd64 local-build + file bin/linuxkit-darwin-amd64 checksum-targets: bin cd bin && openssl sha256 -r linuxkit-* | tr -d '*' > checksums.txt