workflow: fix version string to follow VERSION-NB

ayufan-rock64 · Nov 11, 2023 · eb9582f · eb9582f
1 parent 70e62c4
commit eb9582f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -15,7 +15,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Configure version
-      run: echo "VERSION=$(cat VERSION).$(($RELEASE_START+$GITHUB_RUN_NUMBER))" >> $GITHUB_ENV
+      run: echo "VERSION=$(cat VERSION)-$(($RELEASE_START+$GITHUB_RUN_NUMBER))" >> $GITHUB_ENV
     - name: Cleanup old packages
       run: rm -f *.tar.xz
     - name: Install keyring

diff --git a/Makefile b/Makefile
@@ -27,6 +27,6 @@ targets:
 		"$(word 1,$(subst -, , $@))-$(word 2,$(subst -, , $@))-$(word 3,$(subst -, , $@))" \
 		"$(word 1,$(subst -, , $@))" \
 		"$(word 2,$(subst -, , $@))" \
-		"$(word 5,$(subst -, , $(basename $@)))"
+		"$(lastword $(subst -, , $(basename $@)))"
 
 $(foreach arch,$(ARCHS),$(addsuffix -$(arch), $(VARIANTS)): %-$(arch): %-$(VERSION)-$(arch).tar.xz)