mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-23 19:38:48 +03:00
Compare commits
3 commits
9364d36827
...
4789cc683b
Author | SHA1 | Date | |
---|---|---|---|
|
4789cc683b | ||
|
60c19bf1d1 | ||
|
014e55d738 |
2 changed files with 4 additions and 10 deletions
|
@ -15,6 +15,8 @@ export PATH
|
||||||
CMAKE_PREFIX_PATH="${QT_BASEPATH}/lib/cmake"
|
CMAKE_PREFIX_PATH="${QT_BASEPATH}/lib/cmake"
|
||||||
export CMAKE_PREFIX_PATH
|
export CMAKE_PREFIX_PATH
|
||||||
|
|
||||||
|
export CMAKE_BUILD_PARALLEL_LEVEL="$(sysctl -n hw.ncpu)"
|
||||||
|
|
||||||
cmake -GNinja -S. -Bbuild \
|
cmake -GNinja -S. -Bbuild \
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
-DCMAKE_INSTALL_PREFIX="nheko.temp" \
|
-DCMAKE_INSTALL_PREFIX="nheko.temp" \
|
||||||
|
@ -31,7 +33,7 @@ cmake --install build
|
||||||
git clone https://github.com/Nheko-Reborn/qt-jdenticon.git
|
git clone https://github.com/Nheko-Reborn/qt-jdenticon.git
|
||||||
( cd qt-jdenticon
|
( cd qt-jdenticon
|
||||||
qmake
|
qmake
|
||||||
make -j 4
|
make -j "$CMAKE_BUILD_PARALLEL_LEVEL"
|
||||||
cp libqtjdenticon.dylib ../../nheko.temp/nheko.app/Contents/MacOS
|
cp libqtjdenticon.dylib ../../nheko.temp/nheko.app/Contents/MacOS
|
||||||
)
|
)
|
||||||
# "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/
|
# "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/
|
||||||
|
|
|
@ -266,18 +266,10 @@ build-macos:
|
||||||
|
|
||||||
build-macos-as:
|
build-macos-as:
|
||||||
extends: build-macos
|
extends: build-macos
|
||||||
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3
|
image: ghcr.io/cirruslabs/macos-sequoia-xcode:16.1
|
||||||
tags: [macos-tart]
|
tags: [macos-tart]
|
||||||
before_script:
|
before_script:
|
||||||
# The following update-reset is a workaround for this issue: https://github.com/Homebrew/homebrew-bundle/issues/1179
|
|
||||||
- brew update-reset
|
|
||||||
- brew upgrade
|
|
||||||
- brew bundle --file .ci/macos/Brewfile
|
- brew bundle --file .ci/macos/Brewfile
|
||||||
### CMake 3.29 issue with re2 workaround.
|
|
||||||
- brew uninstall cmake
|
|
||||||
- curl "https://raw.githubusercontent.com/Homebrew/homebrew-core/9ae2628ed1337f342960fd6c2598ae69cf057615/Formula/c/cmake.rb" -o /tmp/cmake.rb
|
|
||||||
- brew install -s /tmp/cmake.rb
|
|
||||||
### End Cmake 3.29 issue with re2 workaround.
|
|
||||||
- pipx install aqtinstall
|
- pipx install aqtinstall
|
||||||
- pipx ensurepath
|
- pipx ensurepath
|
||||||
- . ~/.zshrc
|
- . ~/.zshrc
|
||||||
|
|
Loading…
Reference in a new issue