build for linux/arm64 (#358)

gardener · Dec 4, 2023 · 652906c · 652906c
1 parent 3b57cbf
commit 652906c
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 100 deletions.
diff --git a/.github/workflows/update-gardenctl-v2.yaml b/.github/workflows/update-gardenctl-v2.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Upload binaries to release
         uses: AButler/upload-release-assets@c94805dc72e4b20745f543da0f62eaee7722df7a # pin@v2.0.2
         with:
-          files: 'bin/darwin-amd64/gardenctl_v2_darwin_amd64;bin/darwin-arm64/gardenctl_v2_darwin_arm64;bin/linux-amd64/gardenctl_v2_linux_amd64;bin/windows-amd64/gardenctl_v2_windows_amd64.exe'
+          files: 'bin/darwin-amd64/gardenctl_v2_darwin_amd64;bin/darwin-arm64/gardenctl_v2_darwin_arm64;bin/linux-amd64/gardenctl_v2_linux_amd64;bin/linux-arm64/gardenctl_v2_linux_arm64;bin/windows-amd64/gardenctl_v2_windows_amd64.exe'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           release-tag: ${{ env.latest_release_filtered_tag }}
       - name: Get token for gardener-github-pkg-mngr app
@@ -39,7 +39,8 @@ jobs:
           darwin_sha256sum_amd64=$(sha256sum bin/darwin-amd64/gardenctl_v2_darwin_amd64 | awk '{print $1}')
           darwin_sha256sum_arm64=$(sha256sum bin/darwin-arm64/gardenctl_v2_darwin_arm64 | awk '{print $1}')
           linux_sha256sum_amd64=$(sha256sum bin/linux-amd64/gardenctl_v2_linux_amd64 | awk '{print $1}')
-          data='{"event_type": "update", "client_payload": { "component": "gardenctl-v2", "tag": "'"$latest_release_filtered_tag"'", "darwin_sha_amd64": "'"$darwin_sha256sum_amd64"'", "darwin_sha_arm64": "'"$darwin_sha256sum_arm64"'", "linux_sha_amd64": "'"$linux_sha256sum_amd64"'"}}'
+          linux_sha256sum_arm64=$(sha256sum bin/linux-arm64/gardenctl_v2_linux_arm64 | awk '{print $1}')
+          data='{"event_type": "update", "client_payload": { "component": "gardenctl-v2", "tag": "'"$latest_release_filtered_tag"'", "darwin_sha_amd64": "'"$darwin_sha256sum_amd64"'", "darwin_sha_arm64": "'"$darwin_sha256sum_arm64"'", "linux_sha_amd64": "'"$linux_sha256sum_amd64"'", "linux_sha_arm64": "'"$linux_sha256sum_arm64"'"}}'
           echo "${data}"
           curl -X POST https://api.github.com/repos/${{ github.repository_owner }}/homebrew-tap/dispatches \
           -H 'Accept: application/vnd.github.everest-preview+json' \

diff --git a/Makefile b/Makefile
@@ -69,12 +69,16 @@ generate-sequential: gen-markdown $(MOCKGEN)  ## Run go generate
 ##@ Build
 
 .PHONY: build
-build: build-darwin-amd64 build-darwin-arm64 build-linux-amd64 build-windows-amd64 ## Build gardenctl binary for darwin, linux and windows.
+build: build-darwin-amd64 build-darwin-arm64 build-linux-amd64 build-linux-arm64 build-windows-amd64 ## Build gardenctl binary for darwin, linux and windows.
 
 .PHONY: build-linux-amd64
-build-linux-amd64: ## Build gardenctl binary for linux.
+build-linux-amd64: ## Build gardenctl binary for Linux on Intel processors.
 	@./hack/build-linux-amd64.sh
 
+.PHONY: build-linux-arm64
+build-linux-arm64: ## Build gardenctl binary for Linux on ARM processors.
+	@./hack/build-linux-arm64.sh
+
 .PHONY: build-darwin-amd64
 build-darwin-amd64: ## Build gardenctl binary for darwin on Intel processors.
 	@./hack/build-darwin-amd64.sh
@@ -84,5 +88,5 @@ build-darwin-arm64: ## Build gardenctl binary for darwin on Apple Silicon proces
 	@./hack/build-darwin-arm64.sh
 
 .PHONY: build-windows-amd64
-build-windows-amd64: ## Build gardenctl binary for windows.
+build-windows-amd64: ## Build gardenctl binary for Windows on Intel processors.
 	@./hack/build-windows-amd64.sh
diff --git a/hack/build-darwin-amd64.sh b/hack/build-darwin-amd64.sh
@@ -1,39 +1,19 @@
 #!/usr/bin/env bash
 
-# SPDX-FileCopyrightText: 2021 SAP SE or an SAP affiliate company and Gardener contributors
+# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
 #
 # SPDX-License-Identifier: Apache-2.0
 
-set -e
-
 # For the build step concourse will set the following environment variables:
 # SOURCE_PATH - path to component repository root directory.
-# BINARY_PATH - path to an existing (empty) directory to place build results into.
 
 if [[ -z "${MAIN_REPO_DIR}" ]]; then
   export MAIN_REPO_DIR="$(readlink -f $(dirname ${0})/..)"
 else
   export MAIN_REPO_DIR="$(readlink -f "${MAIN_REPO_DIR}")"
 fi
 
-if [[ -z "${BINARY_PATH}" ]]; then
-  export BINARY_PATH="${MAIN_REPO_DIR}/bin"
-else
-  export BINARY_PATH="$(readlink -f "${BINARY_PATH}")"
-fi
-
-pushd "${MAIN_REPO_DIR}" > /dev/null
-
-if [[ -z "${LD_FLAGS}" ]]; then
-  export LD_FLAGS=$(./hack/get-build-ld-flags.sh)
-fi
-###############################################################################
-
-out_file="${BINARY_PATH}"/darwin-amd64/gardenctl_v2_darwin_amd64
-
-echo "building for darwin-amd64: ${out_file}"
-CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 GO111MODULE=on go build \
-		-ldflags "${LD_FLAGS}" \
-		-o "${out_file}" main.go
+export GOOS=darwin
+export GOARCH=amd64
 
-popd > /dev/null
+${MAIN_REPO_DIR}/hack/build.sh
diff --git a/hack/build-darwin-arm64.sh b/hack/build-darwin-arm64.sh
@@ -4,36 +4,16 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-set -e
-
 # For the build step concourse will set the following environment variables:
 # SOURCE_PATH - path to component repository root directory.
-# BINARY_PATH - path to an existing (empty) directory to place build results into.
 
 if [[ -z "${MAIN_REPO_DIR}" ]]; then
   export MAIN_REPO_DIR="$(readlink -f $(dirname ${0})/..)"
 else
   export MAIN_REPO_DIR="$(readlink -f "${MAIN_REPO_DIR}")"
 fi
 
-if [[ -z "${BINARY_PATH}" ]]; then
-  export BINARY_PATH="${MAIN_REPO_DIR}/bin"
-else
-  export BINARY_PATH="$(readlink -f "${BINARY_PATH}")"
-fi
-
-pushd "${MAIN_REPO_DIR}" > /dev/null
-
-if [[ -z "${LD_FLAGS}" ]]; then
-  export LD_FLAGS=$(./hack/get-build-ld-flags.sh)
-fi
-###############################################################################
-
-out_file="${BINARY_PATH}"/darwin-arm64/gardenctl_v2_darwin_arm64
-
-echo "building for darwin-arm64: ${out_file}"
-CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 GO111MODULE=on go build \
-		-ldflags "${LD_FLAGS}" \
-		-o "${out_file}" main.go
+export GOOS=darwin
+export GOARCH=arm64
 
-popd > /dev/null
+${MAIN_REPO_DIR}/hack/build.sh
diff --git a/hack/build-linux-amd64.sh b/hack/build-linux-amd64.sh
@@ -1,39 +1,19 @@
 #!/usr/bin/env bash
 
-# SPDX-FileCopyrightText: 2021 SAP SE or an SAP affiliate company and Gardener contributors
+# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
 #
 # SPDX-License-Identifier: Apache-2.0
 
-set -e
-
 # For the build step concourse will set the following environment variables:
 # SOURCE_PATH - path to component repository root directory.
-# BINARY_PATH - path to an existing (empty) directory to place build results into.
 
 if [[ -z "${MAIN_REPO_DIR}" ]]; then
   export MAIN_REPO_DIR="$(readlink -f $(dirname ${0})/..)"
 else
   export MAIN_REPO_DIR="$(readlink -f "${MAIN_REPO_DIR}")"
 fi
 
-if [[ -z "${BINARY_PATH}" ]]; then
-  export BINARY_PATH="${MAIN_REPO_DIR}/bin"
-else
-  export BINARY_PATH="$(readlink -f "${BINARY_PATH}")"
-fi
-
-pushd "${MAIN_REPO_DIR}" > /dev/null
-
-if [[ -z "${LD_FLAGS}" ]]; then
-  export LD_FLAGS=$(./hack/get-build-ld-flags.sh)
-fi
-###############################################################################
-
-out_file="${BINARY_PATH}"/linux-amd64/gardenctl_v2_linux_amd64
-
-echo "building for linux-amd64: ${out_file}"
-CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build \
-		-ldflags "${LD_FLAGS}" \
-		-o "${out_file}" main.go
+export GOOS=linux
+export GOARCH=amd64
 
-popd > /dev/null
+${MAIN_REPO_DIR}/hack/build.sh
diff --git a/hack/build-linux-arm64.sh b/hack/build-linux-arm64.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# For the build step concourse will set the following environment variables:
+# SOURCE_PATH - path to component repository root directory.
+
+if [[ -z "${MAIN_REPO_DIR}" ]]; then
+  export MAIN_REPO_DIR="$(readlink -f $(dirname ${0})/..)"
+else
+  export MAIN_REPO_DIR="$(readlink -f "${MAIN_REPO_DIR}")"
+fi
+
+export GOOS=linux
+export GOARCH=arm64
+
+${MAIN_REPO_DIR}/hack/build.sh
diff --git a/hack/build-windows-amd64.sh b/hack/build-windows-amd64.sh
@@ -1,39 +1,19 @@
 #!/usr/bin/env bash
 
-# SPDX-FileCopyrightText: 2021 SAP SE or an SAP affiliate company and Gardener contributors
+# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
 #
 # SPDX-License-Identifier: Apache-2.0
 
-set -e
-
 # For the build step concourse will set the following environment variables:
 # SOURCE_PATH - path to component repository root directory.
-# BINARY_PATH - path to an existing (empty) directory to place build results into.
 
 if [[ -z "${MAIN_REPO_DIR}" ]]; then
   export MAIN_REPO_DIR="$(readlink -f $(dirname ${0})/..)"
 else
   export MAIN_REPO_DIR="$(readlink -f "${MAIN_REPO_DIR}")"
 fi
 
-if [[ -z "${BINARY_PATH}" ]]; then
-  export BINARY_PATH="${MAIN_REPO_DIR}/bin"
-else
-  export BINARY_PATH="$(readlink -f "${BINARY_PATH}")"
-fi
-
-pushd "${MAIN_REPO_DIR}" > /dev/null
-
-if [[ -z "${LD_FLAGS}" ]]; then
-  export LD_FLAGS=$(./hack/get-build-ld-flags.sh)
-fi
-###############################################################################
-
-out_file="${BINARY_PATH}"/windows-amd64/gardenctl_v2_windows_amd64.exe
-
-echo "building for windows-amd64: ${out_file}"
-CGO_ENABLED=0 GOOS=windows GOARCH=amd64 GO111MODULE=on go build \
-		-ldflags "${LD_FLAGS}" \
-		-o "${out_file}" main.go
+export GOOS=windows
+export GOARCH=amd64
 
-popd > /dev/null
+${MAIN_REPO_DIR}/hack/build.sh
diff --git a/hack/build.sh b/hack/build.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set -e
+
+# For the build step concourse will set the following environment variables:
+# SOURCE_PATH - path to component repository root directory.
+# BINARY_PATH - path to an existing (empty) directory to place build results into.
+
+if [[ -z "${MAIN_REPO_DIR}" ]]; then
+  export MAIN_REPO_DIR="$(readlink -f $(dirname ${0})/..)"
+else
+  export MAIN_REPO_DIR="$(readlink -f "${MAIN_REPO_DIR}")"
+fi
+
+if [[ -z "${BINARY_PATH}" ]]; then
+  export BINARY_PATH="${MAIN_REPO_DIR}/bin"
+else
+  export BINARY_PATH="$(readlink -f "${BINARY_PATH}")"
+fi
+
+pushd "${MAIN_REPO_DIR}" > /dev/null
+
+if [[ -z "${LD_FLAGS}" ]]; then
+  export LD_FLAGS=$("${MAIN_REPO_DIR}/hack/get-build-ld-flags.sh")
+fi
+###############################################################################
+
+out_file="${BINARY_PATH}/${GOOS}-${GOARCH}/gardenctl_v2_${GOOS}_${GOARCH}"
+
+echo "building for ${GOOS}-${GOARCH}: ${out_file}"
+CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} GO111MODULE=on go build \
+		-ldflags "${LD_FLAGS}" \
+		-o "${out_file}" main.go
+
+popd > /dev/null