diff --git a/.gitea/workflows/arch.yaml b/.gitea/workflows/arch.yaml index 8d6eb8a..5fdfd66 100644 --- a/.gitea/workflows/arch.yaml +++ b/.gitea/workflows/arch.yaml @@ -34,7 +34,7 @@ jobs: run: | echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV - name: Retrieving artifact files - run: mkdir bforce && cp /builder/bforce-r*.pkg.tar.zst bforce + run: mkdir bforce && cp /builder/bforce-*.pkg.tar.zst bforce - name: Try to upload artifacts uses: actions/upload-artifact@v3 with: diff --git a/archlinux/PKGBUILD.ci b/archlinux/PKGBUILD.ci index ce44e5f..0510dc4 100644 --- a/archlinux/PKGBUILD.ci +++ b/archlinux/PKGBUILD.ci @@ -26,9 +26,9 @@ prepare() { pkgver() { cd "$pkgname" if [ "${GITHUB_REF_TYPE}" = "tags" ]; then - printf "r%s.%s.%s" "$(git rev-list --count ${GITHUB_SHA})" "$(git rev-parse --short ${GITHUB_SHA})" "${GITHUB_REF_NAME}" - else printf "v%s" "${GITHUB_REF_NAME}" + else + printf "r%s.%s.%s" "$(git rev-list --count ${GITHUB_SHA})" "$(git rev-parse --short ${GITHUB_SHA})" "${GITHUB_REF_NAME}" fi }