Skip to content

Commit 4f62c50

Browse files
committed
Can't leave well enough alone, can we?
1 parent 09a43cc commit 4f62c50

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/cpp_integration_tests.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ jobs:
77
- uses: actions/checkout@v4
88
- id: install_conan
99
uses: turtlebrowser/get-conan@main
10-
- id: patch_conan
11-
run: conan profile detect && conan profile update settings.compiler.libcxx=libstdc++11 default
1210
- id: run_conan
13-
run: cd ${GITHUB_WORKSPACE}/test && conan install --generator cmake_find_package --install-folder ../build_test/conan-dependencies .
11+
run: cd ${GITHUB_WORKSPACE}/test &&
12+
conan install --generator cmake_find_package -of ../build_test/conan-dependencies . --settings=compiler.libcxx=libstdc++11
1413
- id: cmake
1514
run: cd ${GITHUB_WORKSPACE}/test && cmake -DCMAKE_BUILD_TYPE=Debug -B../build_test -S.
1615
- id: make

.github/workflows/qt_integration_tests.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ jobs:
99
- uses: actions/checkout@v4
1010
- id: install_conan
1111
uses: turtlebrowser/get-conan@main
12-
- id: patch_conan
13-
run: conan profile detect && conan profile update settings.compiler.libcxx=libstdc++11 default
1412
- id: run_conan
15-
run: cd ${GITHUB_WORKSPACE}/test && conan install --generator cmake_find_package --install-folder ../build_test/conan-dependencies .
13+
run: cd ${GITHUB_WORKSPACE}/test &&
14+
conan install --generator cmake_find_package -of ../build_test/conan-dependencies . --settings=compiler.libcxx=libstdc++11
1615
- id: cmake
1716
run: cd ${GITHUB_WORKSPACE}/test && cmake -DCMAKE_BUILD_TYPE=Debug -DTEST_QT=ON -B../build_test -S.
1817
- id: make

0 commit comments

Comments
 (0)