From 6a2fa943c4479c1c17b31f3e7a76d5136f04c319 Mon Sep 17 00:00:00 2001 From: PancakeTAS Date: Thu, 28 Aug 2025 23:12:22 +0200 Subject: [PATCH] enhancement(flatpakui): also update packages --- .github/workflows/package.yml | 5 +-- .github/workflows/package_ci.yml | 45 +++++++++++++++++++++++ {scripts/package => package}/alpm.PKGINFO | 0 {scripts/package => package}/dpkg.control | 0 {scripts/package => package}/package.sh | 8 ++-- {scripts/package => package}/rpm.spec | 0 6 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/package_ci.yml rename {scripts/package => package}/alpm.PKGINFO (100%) rename {scripts/package => package}/dpkg.control (100%) rename {scripts/package => package}/package.sh (91%) rename {scripts/package => package}/rpm.spec (100%) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 7ae4668..5df4779 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -23,9 +23,8 @@ jobs: run-id: ${{ github.event.workflow_run.id }} - name: Package lsfg-vk for various distros run: | - export VERSION=$(grep -oP ' VERSION\s+\K[\d.]+' CMakeLists.txt) - chmod +x scripts/package/package.sh - bash ./scripts/package/package.sh + chmod +x ./package/package.sh + ./package/package.sh - name: Upload lsfg-vk for dpkg uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/package_ci.yml b/.github/workflows/package_ci.yml new file mode 100644 index 0000000..9b45559 --- /dev/null +++ b/.github/workflows/package_ci.yml @@ -0,0 +1,45 @@ +name: (CI) Package lsfg-vk + +on: + workflow_run: + workflows: ["(CI) Build lsfg-vk"] + types: + - completed + +jobs: + package: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' }} + steps: + # prepare system + - name: Checkout repository + uses: actions/checkout@v4 + - name: Download lsfg-vk artifacts + uses: actions/download-artifact@v4 + with: + name: lsfg-vk + path: . + github-token: ${{ secrets.GITHUB_TOKEN }} + run-id: ${{ github.event.workflow_run.id }} + - name: Package lsfg-vk for various distros + run: | + chmod +x ./package/package.sh + ./package/package.sh + - name: Upload lsfg-vk for dpkg + uses: actions/upload-artifact@v4 + with: + name: lsfg-vk.dpkg + path: | + *.deb + - name: Upload lsfg-vk for rpm + uses: actions/upload-artifact@v4 + with: + name: lsfg-vk.rpm + path: | + *.rpm + - name: Upload lsfg-vk for alpm + uses: actions/upload-artifact@v4 + with: + name: lsfg-vk.alpm + path: | + *.zst diff --git a/scripts/package/alpm.PKGINFO b/package/alpm.PKGINFO similarity index 100% rename from scripts/package/alpm.PKGINFO rename to package/alpm.PKGINFO diff --git a/scripts/package/dpkg.control b/package/dpkg.control similarity index 100% rename from scripts/package/dpkg.control rename to package/dpkg.control diff --git a/scripts/package/package.sh b/package/package.sh similarity index 91% rename from scripts/package/package.sh rename to package/package.sh index a9d98f6..cee5347 100755 --- a/scripts/package/package.sh +++ b/package/package.sh @@ -23,7 +23,7 @@ chmod 644 share/icons/hicolor/256x256/apps/gay.pancake.lsfg-vk-ui.png echo "Building ALPM package..." mkdir -pv alpm -envsubst < scripts/package/alpm.PKGINFO > alpm/.PKGINFO +envsubst < package/alpm.PKGINFO > alpm/.PKGINFO mkdir -pv alpm/usr/{bin,lib,share/vulkan/implicit_layer.d,share/applications,share/icons/hicolor/256x256/apps} cp -v bin/lsfg-vk-ui alpm/usr/bin/lsfg-vk-ui @@ -42,7 +42,7 @@ tar -cvzf "lsfg-vk-$VERSION.x86_64.tar.zst" -C alpm \ echo "Building DEB package..." mkdir -pv deb/DEBIAN -envsubst < scripts/package/dpkg.control > deb/DEBIAN/control +envsubst < package/dpkg.control > deb/DEBIAN/control mkdir -pv deb/usr/{bin,lib,share/vulkan/implicit_layer.d,share/applications,share/icons/hicolor/256x256/apps} cp -v bin/lsfg-vk-ui deb/usr/bin/lsfg-vk-ui @@ -60,7 +60,7 @@ dpkg-deb --root-owner-group --build deb "lsfg-vk-$VERSION.x86_64.deb" echo "Building RPM package..." mkdir -pv rpm -envsubst < scripts/package/rpm.spec > rpm/lsfg-vk.spec +envsubst < package/rpm.spec > rpm/lsfg-vk.spec mkdir -pv rpm/SOURCES cp -v bin/lsfg-vk-ui rpm/SOURCES @@ -73,7 +73,7 @@ cp -v share/icons/hicolor/256x256/apps/gay.pancake.lsfg-vk-ui.png \ rpm/SOURCES/gay.pancake.lsfg-vk-ui.png rpmbuild -bb rpm/lsfg-vk.spec --define "_topdir $(pwd)/rpm" -mv -v "rpm/RPMS/x86_64/lsfg-vk-$VERSION-1.x86_64.rpm" "lsfg-vk-$VERSION.x86_64.rpm" +mv -v "rpm/RPMS/x86_64/lsfg-vk-$RPM_VERSION-1.x86_64.rpm" "lsfg-vk-$VERSION.x86_64.rpm" # cleanup rm -rf alpm deb rpm diff --git a/scripts/package/rpm.spec b/package/rpm.spec similarity index 100% rename from scripts/package/rpm.spec rename to package/rpm.spec