From 6c648c8286f6bfbcd85622870f2fdf945cdf1bcd Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Thu, 18 Apr 2024 15:17:20 +0100 Subject: [PATCH] build: Probe qml (#1869) --- .github/workflows/package/osx/action.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package/osx/action.yml b/.github/workflows/package/osx/action.yml index 9925c89de4..b5106356da 100644 --- a/.github/workflows/package/osx/action.yml +++ b/.github/workflows/package/osx/action.yml @@ -45,7 +45,7 @@ runs: packageName=Dissolve-GUI-${{ runner.arch }}-${{ env.dissolveVersion }} # Prepare the dmg file content - ./prep-dmg -a Dissolve-GUI-${{ runner.arch }} -v ${{ env.dissolveVersion }} -b build/bin/dissolve-gui.app/Contents/MacOS/dissolve-gui -d ${Qt6_ROOT} -i icon/icon-1024x1024.png -p build/bin/dissolve-gui.app/Contents/Info.plist + ./prep-dmg -a Dissolve-GUI-${{ runner.arch }} -v ${{ env.dissolveVersion }} -b build/bin/dissolve-gui.app/Contents/MacOS/dissolve-gui -d ${Qt6_ROOT} -i icon/icon-1024x1024.png -p build/bin/dissolve-gui.app/Contents/Info.plist -q src/gui/qml # Copy dependencies into Frameworks folder in app bundle cp -v ./build/antlr4-cppruntime/lib/*.dylib ${packageName}/${appDirName}/Contents/Frameworks/ @@ -62,16 +62,17 @@ runs: appName=Dissolve-GUI-${{ runner.arch }} appDirName=${appName}.app packageName=Dissolve-GUI-${{ runner.arch }}-${{ env.dissolveVersion }} + dmgName=Dissolve-GUI-${{ env.dissolveVersion }}-${{ runner.arch }} # Fix icon name in plist sed -i -e "s/Dissolve.icns/${appName}.icns/g" ${packageName}/${appDirName}/Contents/Info.plist # Create DMG - dmgbuild -s ci/osx/dmgbuild-settings.py -D app=./${packageName}/${appDirName} -D icon=./Dissolve-GUI-${{ env.dissolveVersion }}/${appDirName}/Contents/Resources/${appName}.icns "Dissolve GUI" ${packageName}.dmg + dmgbuild -s ci/osx/dmgbuild-settings.py -D app=./${packageName}/${appDirName} -D icon=./Dissolve-GUI-${{ env.dissolveVersion }}/${appDirName}/Contents/Resources/${appName}.icns "Dissolve GUI" ${dmgName}.dmg # Collect artifacts mkdir packages - mv ${packageName}.dmg packages/ + mv ${dmgName}.dmg packages/ - name: Upload Package Artifacts uses: actions/upload-artifact@v4