Merge branch 'main' into ci/optimize

paulsengroup · Oct 17, 2024 · bdfea2d · bdfea2d
2 parents d19b659 + 52934ab
commit bdfea2d
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.github/workflows/build-conan-deps.yml b/.github/workflows/build-conan-deps.yml
@@ -151,7 +151,6 @@ jobs:
           conan profile detect --force
 
           conan install /tmp/conanfile.py \
-             --update                     \
              --build='missing'            \
              -s build_type=Release        \
              -s compiler.cppstd="$cppstd" \
@@ -283,10 +282,11 @@ jobs:
       - name: Install dependencies
         if: steps.cache-conan.outputs.cache-hit != 'true'
         run: |
-          conan install conanfile.py                  \
-             --build='missing'                        \
-             -s build_type=Release                    \
-             -s compiler.cppstd=${{ inputs.cppstd }}  \
+          conan install conanfile.py                     \
+             --build='missing'                           \
+             -s build_type=Release                       \
+             -s compiler.cppstd=${{ inputs.cppstd }}     \
+             -s:h os.version="$MACOSX_DEPLOYMENT_TARGET" \
              --options='*/*:shared=False'
 
       - name: Clean Conan cache (post-build)
@@ -392,7 +392,6 @@ jobs:
         if: steps.cache-conan.outputs.cache-hit != 'true'
         run: |
           conan install conanfile.py                  \
-             --update                                 \
              --build='missing'                        \
              -s build_type=Release                    \
              -s compiler.runtime_type=Release         \