Skip to content

Commit 0c40fe7

Browse files
committed
workflows removed vcpkg libmysql port workaround
Vcpkg libmysql port was updated to v8.0.39.
1 parent bc4f236 commit 0c40fe7

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

.github/workflows/vcpkg-linux-drivers.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,7 @@ jobs:
203203
# Install libmysql separately so I will see what's up if it fails
204204
- name: vcpkg install libmysql (classic mode)
205205
if: matrix.build-type.key == 'debug'
206-
run: >-
207-
# Temporary GCC14 workaround
208-
CFLAGS="-Wno-implicit-function-declaration -Wno-int-conversion"
206+
run: |
209207
vcpkg install libmysql
210208
211209
- name: vcpkg install ${{ matrix.qt.vcpkg-qt }} (classic mode)
@@ -215,9 +213,7 @@ jobs:
215213
216214
- name: vcpkg install ${{ matrix.qt.vcpkg-tinyorm }} (classic mode)
217215
if: matrix.build-type.key == 'debug'
218-
run: >-
219-
# Temporary GCC14 workaround
220-
CFLAGS="-Wno-implicit-function-declaration -Wno-int-conversion"
216+
run: |
221217
vcpkg install ${{ matrix.qt.vcpkg-tinyorm-features }} --clean-after-build
222218
223219
# Prepare TinyORM-HelloWorld-TinyDrivers project
@@ -275,11 +271,9 @@ jobs:
275271
# CMAKE_DISABLE_PRECOMPILE_HEADERS=ON is correct (no need to use PCH for one TU)
276272
# VCPKG_APPLOCAL_DEPS=OFF is correct as everything is linked statically on Linux
277273
# Don't use ccache for the VcpkgManifest method as the vcpkg has its own binary caching
278-
# CFLAGS is a temporary GCC14 workaround because of libedit dependency of libmysql
279274
- name: HelloWorld-TinyDrivers cmake configure (${{ env.HelloWorldVcpkgManifestBuildName }})
280275
working-directory: HelloWorld-TinyDrivers
281276
run: >-
282-
CFLAGS="-Wno-implicit-function-declaration -Wno-int-conversion"
283277
cmake --log-level=DEBUG --log-context
284278
-S .
285279
-B "$HelloWorldVcpkgManifestBuildTree"

0 commit comments

Comments
 (0)