0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change back to creating the macOS dmg from scratch.

Browse source 
On macOS 10.14 on travis, mounting the dmg template results in the job failing due to hanging indefinitely. This can be revisited when 10.15 is available, or perhaps dmgbuild could be used to add in the background image/ds_store metadata from scratch as well.
This commit is contained in:
Pentarctagon 2020-03-26 19:06:46 -05:00 • committed by Pentarctagon
parent 49b8ca5f9a
commit a6a927139b
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -38,7 +38,7 @@ jobs:
- os: osx
osx_image: xcode11.3
compiler: clang
env: TOOL=xcodebuild NLS=true CFG=Debug BRANCH=master
env: TOOL=xcodebuild NLS=true CFG=Debug BRANCH=master UPLOAD=true
- os: osx
osx_image: xcode11.3

6
utils/travis/steps/script.sh
View file

@ -9,11 +9,7 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
BUILD_RET=$?
if [ "$UPLOAD_ID" != "" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
hdiutil convert ../../packaging/macOS/Wesnoth_dmg_packaging_template.dmg -format UDRW -o "Wesnoth_RW.dmg"
hdiutil attach "Wesnoth_RW.dmg"
cp -R "build/$CFG/The Battle for Wesnoth.app/." "/Volumes/The Battle for Wesnoth/The Battle for Wesnoth.app"
hdiutil detach "/Volumes/The Battle for Wesnoth"
hdiutil convert "Wesnoth_RW.dmg" -format UDBZ -o "Wesnoth_${CFG}.dmg"
hdiutil create -volname "Wesnoth_${CFG}" -fs 'HFS+' -srcfolder "build/$CFG" -ov -format UDBZ "Wesnoth_${CFG}.dmg"
./../../utils/travis/sftp "Wesnoth_${CFG}.dmg"
fi