diff --git a/.gitea/workflows/arch.yaml b/.gitea/workflows/arch.yaml index c4fae03..8d6eb8a 100644 --- a/.gitea/workflows/arch.yaml +++ b/.gitea/workflows/arch.yaml @@ -3,14 +3,14 @@ run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀 on: - push - workflow_dispatch - +if: ${{ github.ref }} == 'refs/head/master' jobs: build-arch: runs-on: arch-latest - if: ${{ github.ref }} == 'refs/head/master' + branches: - 'master' - - 'zx' + steps: - name: Checking environment continue-on-error: true diff --git a/.gitea/workflows/debpkg.yaml b/.gitea/workflows/debpkg.yaml index e85f7d7..72bd633 100644 --- a/.gitea/workflows/debpkg.yaml +++ b/.gitea/workflows/debpkg.yaml @@ -1,6 +1,8 @@ name: Debian build run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀 -on: [push] +on: + - push + - workflow_dispatch jobs: build-ubuntu: runs-on: ubuntu-latest diff --git a/archlinux/PKGBUILD.ci b/archlinux/PKGBUILD.ci index 44e120f..f26bb27 100644 --- a/archlinux/PKGBUILD.ci +++ b/archlinux/PKGBUILD.ci @@ -6,7 +6,7 @@ arch=('i686' 'x86_64' 'aarch64') url="https://prj.zxalexis.ru/gitea/zx/bforce/" license=('GPL2') source=( - "${pkgname}::git+https://prj.zxalexis.ru/gitea/${GITHUB_REF_NAME}/bforce.git" + "${pkgname}::git+https://prj.zxalexis.ru/gitea/zx/bforce.git" ) makedepends=('git' 'gcc' 'make' 'glibc') provides=('bforce') @@ -25,7 +25,10 @@ prepare() { pkgver() { cd "$pkgname" - printf "r%s.%s.%s" "$(git rev-list --count ${GITHUB_SHA})" "$(git rev-parse --short ${GITHUB_SHA})" "${GITHUB_REF_NAME}" + 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}" } package() {