From 6ccbd46aabd1d69b53f83148f861fbe275167146 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Tue, 23 Jan 2024 21:25:06 +0200 Subject: [PATCH] Revert "msys: change version injection mechanism" This reverts commit c240e54bc7ec3841e59c3a2bffae91ccff3d4f53. --- .github/workflows/ci.yml | 5 ++--- msys2/{PKGBUILD => PKGBUILD.in} | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) rename msys2/{PKGBUILD => PKGBUILD.in} (91%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 583786a..57db732 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -253,9 +253,8 @@ jobs: key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg - name: git clone uses: myci-actions/checkout@master - - name: set PACKAGE_VERSION - uses: myci-actions/export-env-var@master - with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)} + - name: prepare pacman package + run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in - name: build # to make makepkg-mingw build only one architecture we need to set the MINGW_ARCH env: {MINGW_ARCH: '${{ matrix.repo }}'} diff --git a/msys2/PKGBUILD b/msys2/PKGBUILD.in similarity index 91% rename from msys2/PKGBUILD rename to msys2/PKGBUILD.in index f71a76c..d441ce9 100644 --- a/msys2/PKGBUILD +++ b/msys2/PKGBUILD.in @@ -17,12 +17,10 @@ else exit 1 fi -[ -z "$PACKAGE_VERSION" ] && echo "ERROR: PACKAGE_VERSION env var is not set" && exit 1; - packageName=ruisapp pkgname="${pkgPrefix}${packageName}" -pkgver=$PACKAGE_VERSION +pkgver=$(version) pkgrel=1 epoch= pkgdesc="Platform abstraction layer for 'ruis'"