File tree 4 files changed +8
-4
lines changed
4 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -135,6 +135,7 @@ jobs:
135
135
echo "REFNAME=${{ github.ref_name }}" >> $GITHUB_ENV
136
136
137
137
echo "JOB_NAME=${{matrix.os}}, ${{matrix.arch}}" >> $GITHUB_ENV
138
+ echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
138
139
139
140
echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
140
141
@@ -245,7 +246,7 @@ jobs:
245
246
246
247
- name : Install Conan dependencies
247
248
shell : bash
248
- run : conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${{matrix.conan_qt} ^} -b missing -pr:b=default -of build
249
+ run : conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT ^} -b missing -pr:b=default -of build
249
250
250
251
- name : Configure CMake
251
252
working-directory : build
Original file line number Diff line number Diff line change 70
70
echo "{github_sha_short}={`echo $GIT_COMMIT | cut -c1-7`}" >> $GITHUB_OUTPUT
71
71
echo "JOB_NAME=build (${{matrix.os}}, ${{matrix.build_type}})" >> $GITHUB_ENV
72
72
echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
73
+ echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
73
74
# Linux build variables
74
75
if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then
75
76
echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
@@ -181,7 +182,7 @@ jobs:
181
182
182
183
- name : Install Conan dependencies
183
184
shell : bash
184
- run : conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${{matrix.conan_qt} ^} -b missing -pr:b=default -of build
185
+ run : conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT ^} -b missing -pr:b=default -of build
185
186
186
187
- name : Configure CMake
187
188
working-directory : build
Original file line number Diff line number Diff line change 89
89
echo "GIT_COMMIT_SHORT=`echo $GIT_COMMIT | cut -c1-7`" >> $GITHUB_ENV
90
90
echo "JOB_NAME=${{matrix.os}}, ${{matrix.build_type}}" >> $GITHUB_ENV
91
91
echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
92
+ echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
92
93
93
94
# Linux build variables
94
95
if [[ "${{ matrix.os }}" = "Ubuntu"* ]]; then
@@ -232,7 +233,7 @@ jobs:
232
233
233
234
- name : Install Conan dependencies
234
235
shell : bash
235
- run : conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${{matrix.conan_qt} ^} -b missing -pr:b=default -of build
236
+ run : conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT ^} -b missing -pr:b=default -of build
236
237
237
238
- name : Configure CMake
238
239
working-directory : build
Original file line number Diff line number Diff line change 57
57
58
58
echo "JOB_NAME=${{matrix.os}}, ${{matrix.build_type}}" >> $GITHUB_ENV
59
59
echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
60
+ echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
60
61
61
62
echo "PYTHON_EXEC=python" >> $GITHUB_ENV
62
63
echo "ZIP_COMMAND=7z" >> $GITHUB_ENV
@@ -101,7 +102,7 @@ jobs:
101
102
102
103
- name : Install Conan dependencies
103
104
shell : bash
104
- run : conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${{matrix.conan_qt} ^} -b missing -pr:b=default -of build
105
+ run : conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT ^} -b missing -pr:b=default -of build
105
106
106
107
- name : Configure CMake
107
108
working-directory : build
You can’t perform that action at this time.
0 commit comments