Skip to content

Commit 8b68bb1

Browse files
committed
no more checking for resources - they are always there,
1 parent b6d8656 commit 8b68bb1

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

.github/workflows/Build.yml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,14 @@ jobs:
188188
mkdir -p "$PACKAGE_DIR"/usr/lib/$PACKAGE_NAME
189189
mv ./*.so* "$PACKAGE_DIR/usr/lib/$PACKAGE_NAME/"
190190
191-
if [ -d "./resources" ]; then
192-
mkdir -p "$PACKAGE_DIR/usr/share/$PACKAGE_NAME/"
193-
cp -r ./resources "$PACKAGE_DIR/usr/share/$PACKAGE_NAME/"
194-
if [ -f "./resources/icon.png" ]; then
195-
ICON_DIR="usr/share/icons"
196-
mkdir -p "$PACKAGE_DIR/$ICON_DIR"
197-
ICON_PATH="$ICON_DIR/$PACKAGE_NAME.png"
198-
cp ./resources/icon.png "$PACKAGE_DIR/$ICON_PATH"
199-
DESKTOP_ICON_LINE="Icon=/$ICON_PATH"
200-
fi
201-
rm -rf resources
202-
fi
191+
mkdir -p "$PACKAGE_DIR/usr/share/$PACKAGE_NAME/"
192+
cp -r ./resources "$PACKAGE_DIR/usr/share/$PACKAGE_NAME/"
193+
ICON_DIR="usr/share/icons"
194+
mkdir -p "$PACKAGE_DIR/$ICON_DIR"
195+
ICON_PATH="$ICON_DIR/$PACKAGE_NAME.png"
196+
cp ./resources/icon.png "$PACKAGE_DIR/$ICON_PATH"
197+
DESKTOP_ICON_LINE="Icon=/$ICON_PATH"
198+
rm -rf resources
203199
204200
mkdir -p "$PACKAGE_DIR/usr/share/applications/"
205201
cat <<EOF > "$PACKAGE_DIR/usr/share/applications/$PACKAGE_NAME.desktop"
@@ -259,13 +255,8 @@ jobs:
259255
id: organize
260256
run: |
261257
rm -rf "Debian package" "Windows installer"
262-
if [ -d "build-win-msvc/resources" ]; then
263-
echo "resources-found=true" >> $GITHUB_OUTPUT
264-
mv build-win-msvc/resources .
265-
rm -rf */resources
266-
else
267-
echo "resources-found=false" >> $GITHUB_OUTPUT
268-
fi
258+
mv build-win-msvc/resources .
259+
rm -rf */resources
269260
270261
mkdir Release
271262
mkdir RelWithDebInfo
@@ -299,7 +290,6 @@ jobs:
299290
name: RelWithDebInfo Builds
300291

301292
- name: Upload resources zip
302-
if: steps.organize.outputs.resources-found == 'true'
303293
uses: actions/upload-artifact@v4
304294
with:
305295
path: resources/*

0 commit comments

Comments
 (0)