rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More MacOS CI Updates

This commit is contained in:
Joseph Donofry 2020-12-08 16:32:04 -05:00
parent 0310c98046
commit 79e7eac7fc
No known key found for this signature in database
GPG Key ID: E8A1D78EF044B0CB
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.ci/macos/deploy.sh
View File

@ -16,15 +16,17 @@ PATH=/usr/local/opt/qt/bin/:${PATH}
mkdir -p nheko.app/Contents/Frameworks mkdir -p nheko.app/Contents/Frameworks
find "${ICU_LIB}" -type l -name "*.dylib" -exec cp -a -n {} nheko.app/Contents/Frameworks/ \; || true find "${ICU_LIB}" -type l -name "*.dylib" -exec cp -a -n {} nheko.app/Contents/Frameworks/ \; || true
sudo macdeployqt nheko.app -dmg -always-overwrite -qmldir=../resources/qml/ macdeployqt nheko.app -dmg -always-overwrite -qmldir=../resources/qml/
user=$(id -nu) user=$(id -nu)
sudo chown "${user}" nheko.dmg chown "${user}" nheko.dmg
mv nheko.dmg .. mv nheko.dmg ..
) )
dmgbuild -s ./.ci/macos/settings.json "Nheko" nheko.dmg dmgbuild -s ./.ci/macos/settings.json "Nheko" nheko.dmg
VERSION=${CI_COMMIT_SHORT_SHA}
if [ -n "$VERSION" ]; then if [ -n "$VERSION" ]; then
mv nheko.dmg "nheko-${VERSION}.dmg" mv nheko.dmg "nheko-${VERSION}.dmg"
mkdir artifacts mkdir artifacts

8
.gitlab-ci.yml
View File

@ -54,7 +54,6 @@ build-macos:
- brew update - brew update
- brew bundle --file=./.ci/macos/Brewfile - brew bundle --file=./.ci/macos/Brewfile
script: script:
- export VERSION=$(git describe)
- export PATH=/usr/local/opt/qt/bin/:${PATH} - export PATH=/usr/local/opt/qt/bin/:${PATH}
- export CMAKE_PREFIX_PATH=/usr/local/opt/qt5 - export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
- cmake -GNinja -H. -Bbuild - cmake -GNinja -H. -Bbuild
@ -69,11 +68,12 @@ build-macos:
- cmake --build build - cmake --build build
after_script: after_script:
- ./.ci/macos/deploy.sh - ./.ci/macos/deploy.sh
- ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${VERSION}.dmg - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}.dmg
artifacts: artifacts:
paths: paths:
- artifacts/nheko-${VERSION}.dmg - artifacts/nheko-${CI_COMMIT_SHORT_SHA}.dmg
name: nheko-${CI_COMMIT_REF_NAME}-${VERSION}-macos name: nheko-${CI_COMMIT_SHORT_SHA}-macos
expose_as: 'macos-dmg'
cache: cache:
key: "${CI_JOB_NAME}" key: "${CI_JOB_NAME}"
paths: paths: