Skip to content

Commit 918afa3

Browse files
committed
Update linux_server_build.yml, master_build.yml, pr_build.yml, and 1 more file
1 parent 4b2ccac commit 918afa3

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.github/workflows/linux_server_build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ jobs:
135135
echo "REFNAME=${{ github.ref_name }}" >> $GITHUB_ENV
136136
137137
echo "JOB_NAME=${{matrix.os}}, ${{matrix.arch}}" >> $GITHUB_ENV
138+
echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
138139
139140
echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
140141
@@ -245,7 +246,7 @@ jobs:
245246
246247
- name: Install Conan dependencies
247248
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
249250

250251
- name: Configure CMake
251252
working-directory: build

.github/workflows/master_build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
echo "{github_sha_short}={`echo $GIT_COMMIT | cut -c1-7`}" >> $GITHUB_OUTPUT
7171
echo "JOB_NAME=build (${{matrix.os}}, ${{matrix.build_type}})" >> $GITHUB_ENV
7272
echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
73+
echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
7374
# Linux build variables
7475
if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then
7576
echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
@@ -181,7 +182,7 @@ jobs:
181182
182183
- name: Install Conan dependencies
183184
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
185186

186187
- name: Configure CMake
187188
working-directory: build

.github/workflows/pr_build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ jobs:
8989
echo "GIT_COMMIT_SHORT=`echo $GIT_COMMIT | cut -c1-7`" >> $GITHUB_ENV
9090
echo "JOB_NAME=${{matrix.os}}, ${{matrix.build_type}}" >> $GITHUB_ENV
9191
echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
92+
echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
9293
9394
# Linux build variables
9495
if [[ "${{ matrix.os }}" = "Ubuntu"* ]]; then
@@ -232,7 +233,7 @@ jobs:
232233
233234
- name: Install Conan dependencies
234235
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
236237

237238
- name: Configure CMake
238239
working-directory: build

.github/workflows/release_build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
5858
echo "JOB_NAME=${{matrix.os}}, ${{matrix.build_type}}" >> $GITHUB_ENV
5959
echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
60+
echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
6061
6162
echo "PYTHON_EXEC=python" >> $GITHUB_ENV
6263
echo "ZIP_COMMAND=7z" >> $GITHUB_ENV
@@ -101,7 +102,7 @@ jobs:
101102
102103
- name: Install Conan dependencies
103104
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
105106

106107
- name: Configure CMake
107108
working-directory: build

0 commit comments

Comments
 (0)