File tree Expand file tree Collapse file tree 3 files changed +15
-12
lines changed Expand file tree Collapse file tree 3 files changed +15
-12
lines changed Original file line number Diff line number Diff line change @@ -18,13 +18,15 @@ jobs:
18
18
compiler_package : g++
19
19
with_qt6 : false
20
20
with_native_notifications : true
21
+ cmake_preset : Debug
21
22
22
23
- os : ubuntu-20.04
23
24
buildname : Linux-Clang
24
25
compiler : clang++
25
26
compiler_package : clang
26
27
with_qt6 : false
27
28
with_native_notifications : true
29
+ cmake_preset : Debug
28
30
29
31
- os : ubuntu-latest
30
32
buildname : Qt 6
33
35
with_qt6 : true
34
36
with_native_notifications : false
35
37
coverage : true
38
+ cmake_preset : Debug
36
39
compiler_flags : >-
37
40
--coverage
38
41
-fprofile-arcs
70
73
- name : Build with CMake
71
74
uses : lukka/run-cmake@v10
72
75
with :
73
- configurePreset : Debug
74
- buildPreset : Debug
76
+ configurePreset : ' ${{ matrix.cmake_preset }} '
77
+ buildPreset : ' ${{ matrix.cmake_preset }} '
75
78
configurePresetAdditionalArgs : >-
76
79
[
77
80
'-DCMAKE_CXX_COMPILER=${{matrix.compiler}}',
85
88
run : mkdir -p ~/.gnupg && chmod go-rwx ~/.gnupg
86
89
87
90
- name : Run tests
88
- working-directory : ' ${{runner.workspace}}/install/bin'
91
+ working-directory : ' ${{runner.workspace}}/install/copyq/ bin'
89
92
run : ' ${{github.workspace}}/utils/github/test-linux.sh'
90
93
91
94
- name : Update coverage
94
97
COVERALLS_REPO_TOKEN : ' ${{secrets.COVERALLS_REPO_TOKEN}}'
95
98
run : >-
96
99
'${{github.workspace}}/utils/github/coverage-linux.sh'
97
- '${{runner.workspace}}/build'
100
+ '${{runner.workspace}}/build/copyq/${{ matrix.cmake_preset }} '
Original file line number Diff line number Diff line change @@ -56,11 +56,11 @@ jobs:
56
56
run : mkdir -p ~/.gnupg && chmod go-rwx ~/.gnupg
57
57
58
58
- name : Create macOS bundle
59
- working-directory : ' ${{runner.workspace}}/build'
59
+ working-directory : ' ${{runner.workspace}}/build/copyq/${{ matrix.cmake_preset }} '
60
60
run : ' ${{github.workspace}}/utils/github/bundle-macos.sh'
61
61
62
62
- name : Upload macOS bundle
63
63
uses : actions/upload-artifact@v4
64
64
with :
65
65
name : ' CopyQ${{ matrix.bundle_suffix }}.dmg'
66
- path : ' ${{runner.workspace}}/build/CopyQ.dmg'
66
+ path : ' ${{runner.workspace}}/build/copyq/${{ matrix.cmake_preset }}/ CopyQ.dmg'
Original file line number Diff line number Diff line change 4
4
{
5
5
"name" : " Debug" ,
6
6
"generator" : " Ninja" ,
7
- "binaryDir" : " ${sourceParentDir}/build" ,
8
- "installDir" : " ${sourceParentDir}/install" ,
7
+ "binaryDir" : " ${sourceParentDir}/build/copyq/${presetName} " ,
8
+ "installDir" : " ${sourceParentDir}/install/copyq/${presetName} " ,
9
9
"cacheVariables" : {
10
10
"WITH_TESTS" : " TRUE" ,
11
11
"PEDANTIC" : " TRUE" ,
16
16
{
17
17
"name" : " macOS-10" ,
18
18
"generator" : " Ninja" ,
19
- "binaryDir" : " ${sourceParentDir}/build" ,
20
- "installDir" : " ${sourceParentDir}/build" ,
19
+ "binaryDir" : " ${sourceParentDir}/build/copyq/${presetName} " ,
20
+ "installDir" : " ${sourceParentDir}/build/copyq/${presetName} " ,
21
21
"cacheVariables" : {
22
22
"WITH_QT6" : " TRUE" ,
23
23
"WITH_TESTS" : " TRUE" ,
31
31
{
32
32
"name" : " macOS-12-m1" ,
33
33
"generator" : " Ninja" ,
34
- "binaryDir" : " ${sourceParentDir}/build" ,
35
- "installDir" : " ${sourceParentDir}/build" ,
34
+ "binaryDir" : " ${sourceParentDir}/build/copyq/${presetName} " ,
35
+ "installDir" : " ${sourceParentDir}/build/copyq/${presetName} " ,
36
36
"cacheVariables" : {
37
37
"WITH_QT6" : " TRUE" ,
38
38
"WITH_TESTS" : " TRUE" ,
You can’t perform that action at this time.
0 commit comments