From 1fae584eea2de2f41a9e1a0b92d5e759fb6d2a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Mon, 5 Aug 2024 23:10:31 +0200 Subject: [PATCH 1/3] tools/cross-compile.sh: Remove unused variables --- tools/cross-compile.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/cross-compile.sh b/tools/cross-compile.sh index a79acf25..5c64d180 100755 --- a/tools/cross-compile.sh +++ b/tools/cross-compile.sh @@ -2,10 +2,7 @@ set -e -HASH="$(git rev-parse --short HEAD)" VERSION="$(go run tools/build-version.go)" -DATE="$(go run tools/build-date.go)" -ADDITIONAL_GO_LINKER_FLAGS="$(go run tools/info-plist.go $VERSION)" mkdir -p binaries mkdir -p micro-$VERSION From a9c359a719ae95a5e108474d4b3d5b8cf188a74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Mon, 5 Aug 2024 23:12:42 +0200 Subject: [PATCH 2/3] tools/cross-compile.sh: Make VERSION configurable --- tools/cross-compile.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/cross-compile.sh b/tools/cross-compile.sh index 5c64d180..a5ca2091 100755 --- a/tools/cross-compile.sh +++ b/tools/cross-compile.sh @@ -2,7 +2,10 @@ set -e -VERSION="$(go run tools/build-version.go)" +VERSION="$1" +if [ -z "$VERSION" ]; then + VERSION="$(go run tools/build-version.go)" +fi mkdir -p binaries mkdir -p micro-$VERSION From d744872f4c3b70d409c4e2086758827572838115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Mon, 5 Aug 2024 23:25:15 +0200 Subject: [PATCH 3/3] nightly: Call `tools/cross-compile.sh` with `nightly` as argument --- .github/workflows/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 12647e65..bd2daf73 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -25,7 +25,7 @@ jobs: fetch-tags: true - name: Build - run: tools/cross-compile.sh + run: tools/cross-compile.sh nightly - name: Tag uses: rickstaa/action-create-tag@v1