Run conan again for each build; Build with newer macOS runner

laggykiller · Feb 28, 2024 · 677aaec · 677aaec
1 parent e0c878e
commit 677aaec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,14 +60,14 @@ jobs:
               APNGASM_COMPILE_TARGET=x86_64
               _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64
               MACOSX_DEPLOYMENT_TARGET=10.15
-          - os: macos-12
+          - os: macos-14
             cibw_archs: arm64
             cibw_build: "*"
             cibw_environment: >
               APNGASM_COMPILE_TARGET=armv8
               _PYTHON_HOST_PLATFORM=macosx-11.0-arm64
               MACOSX_DEPLOYMENT_TARGET=11.0
-          - os: macos-12
+          - os: macos-14
             cibw_archs: universal2
             cibw_build: "*"
             cibw_environment: >

diff --git a/scripts/get_deps.py b/scripts/get_deps.py
@@ -83,7 +83,7 @@ def install_deps(arch: str):
     print("build: " + str(build))
     print("options: " + str(options))
 
-    subprocess.run(["conan", "profile", "detect"])
+    subprocess.run(["conan", "profile", "detect", "-f"])
 
     conan_output = os.path.join("conan_output", arch)
 
@@ -106,17 +106,9 @@ def install_deps(arch: str):
 
 def main():
     arch = get_arch()
-    if arch == "universal2":
-        conan_output = "conan_output/x86_64"
-    else:
-        conan_output = "conan_output/" + arch
-    if os.path.isdir(conan_output):
-        print("Dependencies found at:" + conan_output)
-        print("Skip conan install...")
-        return
 
     if arch != "universal2":
-        conan_output = install_deps(arch)
+        install_deps(arch)
     else:
         # Repeat to install the other architecture version of libwebp
         conan_output_x64 = install_deps("x86_64")