projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Modernize (and fix) deployment on macOS
[quassel.git]
/
.github
/
workflows
/
main.yml
diff --git
a/.github/workflows/main.yml
b/.github/workflows/main.yml
index
58c0fdf
..
2bcfc19
100644
(file)
--- a/
.github/workflows/main.yml
+++ b/
.github/workflows/main.yml
@@
-19,7
+19,7
@@
jobs:
strategy:
fail-fast: false
matrix:
strategy:
fail-fast: false
matrix:
- dist: [ debian-stable, debian-testing, ubuntu-xenial, ubuntu-bionic, ubuntu-
eoan, ubuntu-focal
]
+ dist: [ debian-stable, debian-testing, ubuntu-xenial, ubuntu-bionic, ubuntu-
focal, ubuntu-groovy
]
cxx: [ 'g++', 'clang++' ]
with-kde: [ -DWITH_KDE=ON ]
extra-options: [ -DWITH_WEBENGINE=ON ]
cxx: [ 'g++', 'clang++' ]
with-kde: [ -DWITH_KDE=ON ]
extra-options: [ -DWITH_WEBENGINE=ON ]
@@
-93,6
+93,12
@@
jobs:
CCACHE_MAXSIZE: 100M
steps:
CCACHE_MAXSIZE: 100M
steps:
+ - name: Select Xcode version
+ uses: maxim-lobanov/setup-xcode@v1
+ with:
+ # Newer Xcode versions may not officially be supported by Qt
+ xcode-version: '10.3'
+
- name: Check out source code
uses: actions/checkout@v2
with:
- name: Check out source code
uses: actions/checkout@v2
with:
@@
-136,24
+142,25
@@
jobs:
mkdir build
cd build && cmake $GITHUB_WORKSPACE \
-GNinja \
mkdir build
cd build && cmake $GITHUB_WORKSPACE \
-GNinja \
+ -DWANT_CORE=ON \
+ -DWANT_QTCLIENT=ON \
+ -DWANT_MONO=ON \
-DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \
-DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \
+ -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/bundles \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTING=ON \
-DFATAL_WARNINGS=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTING=ON \
-DFATAL_WARNINGS=OFF \
- -D
DEPLOY=ON
\
- -D
ENABLE_SHARED=OFF
+ -D
ENABLE_SHARED=OFF
\
+ -D
BUNDLE=ON \
- name: Build
- name: Build
- run: |
- # Deploy scripts require qmake in the path
- export PATH=$PATH:/usr/local/opt/qt5/bin
- cd build && ninja
+ run: cd build && ninja
- name: Run tests
run: cd build && ctest
- name: Install
- name: Run tests
run: cd build && ctest
- name: Install
- run: cd build &&
DESTDIR=$GITHUB_WORKSPACE/image
ninja install
+ run: cd build && ninja install
- name: Print ccache stats
run: ccache -s
- name: Print ccache stats
run: ccache -s
@@
-162,7
+169,7
@@
jobs:
uses: actions/upload-artifact@v2
with:
name: macOS
uses: actions/upload-artifact@v2
with:
name: macOS
- path: ${{ github.workspace }}/bu
ild
/*.dmg
+ path: ${{ github.workspace }}/bu
ndles
/*.dmg
# ------------------------------------------------------------------------------------------------------------------------------------------
build-windows:
# ------------------------------------------------------------------------------------------------------------------------------------------
build-windows: