Merge branch 'main' into pdf2htmlex-conan

opendocument-app · Aug 21, 2024 · 4e090c4 · 4e090c4
2 parents 35298f9 + b9f8e02
commit 4e090c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml
@@ -32,7 +32,7 @@ jobs:
       - name: conan config
         run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
       - name: conan install
-        run: conan install . --output-folder=build --build=missing
+        run: conan install . --output-folder=build --build=never
 
       - name: cmake
         run: >

diff --git a/scripts/conan b/scripts/conan
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-conan install . --output-folder=cmake-build-relwithdebinfo --build=missing -s build_type=RelWithDebInfo -s "&:build_type=RelWithDebInfo"
-conan install . --output-folder=cmake-build-debug --build=missing -s build_type=RelWithDebInfo -s "&:build_type=Debug"
-conan install . --output-folder=cmake-build-release --build=missing -s build_type=RelWithDebInfo -s "&:build_type=Release"
+conan install . --output-folder=cmake-build-relwithdebinfo --build=missing -s build_type=Release -s "&:build_type=RelWithDebInfo"
+conan install . --output-folder=cmake-build-debug --build=missing -s build_type=Release -s "&:build_type=Debug"
+conan install . --output-folder=cmake-build-release --build=never -s build_type=Release -s "&:build_type=Release"