Merge pull request #3418 from JoeKar/fix/nightly-assets

nightly: Fix asset names with `nightly` as version string
zyedidia · Aug 8, 2024 · 21bb61c · 21bb61c
2 parents 2259fd1 + d744872
commit 21bb61c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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

diff --git a/tools/cross-compile.sh b/tools/cross-compile.sh
@@ -2,10 +2,10 @@
 
 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)"
+VERSION="$1"
+if [ -z "$VERSION" ]; then
+	VERSION="$(go run tools/build-version.go)"
+fi
 
 mkdir -p binaries
 mkdir -p micro-$VERSION