From eb9582f4b96b957f459b0337471ae8d1dcd8ef6d Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Sat, 11 Nov 2023 17:55:18 +0100 Subject: [PATCH] workflow: fix version string to follow VERSION-NB --- .github/workflows/build.yaml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5f4fb15..49fca7c 100644 --- 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 index f5cfc83..acf964b 100644 --- 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)