Skip to content

Commit 8796ea9

Browse files
committed
nightly fix - create package fix
- android windows use zip
1 parent 8cf8b46 commit 8796ea9

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: nightly-linux64
22

3+
# #used for testing the nightly
34
# on:
45
# push:
56
# paths-ignore:
@@ -65,4 +66,4 @@ jobs:
6566
with:
6667
token: ${{ secrets.GITHUB_TOKEN }}
6768
tag_name: "nightly"
68-
files: ${{ steps.createpackage.outputs.FILES_OUT }}
69+
files: out/of_v*.{tar.gz,zip}

scripts/dev/create_package.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,13 @@ function createPackage {
485485
# linux remove other platform projects from PG source and copy ofxGui
486486
if [ "$PKG_PLATFORM" = "linux" ] || [ "$PKG_PLATFORM" = "linux64" ] || [ "$PKG_PLATFORM" = "linuxarmv6l" ] || [ "$PKG_PLATFORM" = "linuxaarch64" ] || [ "$PKG_PLATFORM" = "linuxarmv7l" ] || [ "$PKG_PLATFORM" = "android" ]; then
487487
cd ${PKG_OFROOT}
488-
mv apps/projectGenerator/commandLine .
489-
rm -rf apps/projectGenerator
490-
mkdir apps/projectGenerator
491-
mv commandLine apps/projectGenerator/
492-
cd apps/projectGenerator/commandLine
488+
if [ -e apps/projectGenerator/commandLine ]; then
489+
mv apps/projectGenerator/commandLine .
490+
rm -rf apps/projectGenerator
491+
mkdir apps/projectGenerator
492+
mv commandLine apps/projectGenerator/
493+
cd apps/projectGenerator/commandLine
494+
fi
493495
deleteCodeblocks
494496
deleteVS
495497
deleteXcode
@@ -651,7 +653,7 @@ function createPackage {
651653
fi
652654

653655
#create compressed package
654-
if [[ "$PKG_PLATFORM" =~ ^(linux|linux64|android|linuxarmv6l|linuxarmv7l|linuxaarch64|macos|ios|osx)$ ]]; then
656+
if [[ "$PKG_PLATFORM" =~ ^(linux|linux64|android|linuxarmv6l|linuxarmv7l|linuxaarch64|macos|ios|osx)$ ]] && [ "${LIBS_ABI}" != "windows" ]; then
655657
if [ "$LIBS_ABI" = "" ]; then
656658
PKG_NAME=of_v${PKG_VERSION}_${PKG_PLATFORM}_release
657659
else

0 commit comments

Comments
 (0)