msys: change version injection mechanism

cppfw · Jan 23, 2024 · c240e54 · c240e54
1 parent 3b53dea
commit c240e54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -253,8 +253,9 @@ jobs:
         key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
     - name: git clone
       uses: myci-actions/checkout@master
-    - name: prepare pacman package
-      run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
+    - name: set PACKAGE_VERSION
+      uses: myci-actions/export-env-var@master
+      with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
     - 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.in → msys2/PKGBUILD b/msys2/PKGBUILD.in → msys2/PKGBUILD
@@ -17,10 +17,12 @@ else
 	exit 1
 fi
 
+[ -z "$PACKAGE_VERSION" ] && echo "ERROR: PACKAGE_VERSION env var is not set" && exit 1;
+
 packageName=ruisapp
 
 pkgname="${pkgPrefix}${packageName}"
-pkgver=$(version)
+pkgver=$PACKAGE_VERSION
 pkgrel=1
 epoch=
 pkgdesc="Platform abstraction layer for 'ruis'"