From 19ea82a72aec59d4156901d0a69b74fe04b75a81 Mon Sep 17 00:00:00 2001 From: PancakeTAS Date: Fri, 25 Jul 2025 19:51:04 +0200 Subject: [PATCH] workflows: fix workflow --- .github/workflows/package.yml | 3 ++- scripts/package/package.sh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 763da14..3df0132 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -19,13 +19,14 @@ jobs: uses: actions/download-artifact@v4 with: name: lsfg-vk_TEST + path: . github-token: ${{ secrets.GITHUB_TOKEN }} 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 - ./scripts/package/package.sh + bash ./scripts/package/package.sh - name: Upload lsfg-vk for dpkg uses: actions/upload-artifact@v4 with: diff --git a/scripts/package/package.sh b/scripts/package/package.sh index ba363ec..463e16a 100755 --- a/scripts/package/package.sh +++ b/scripts/package/package.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if [ -z "$VERSION" ]; then echo "VERSION environment variable is not set." exit 1 @@ -41,8 +41,8 @@ envsubst < scripts/package/rpm.spec > rpm/lsfg-vk.spec mkdir -pv rpm/SOURCES cp -v bin/lsfg-vk-ui rpm/SOURCES -cp lib/liblsfg-vk.so rpm/SOURCES -cp share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json rpm/SOURCES +cp -v lib/liblsfg-vk.so rpm/SOURCES +cp -v share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json rpm/SOURCES 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"