Refactor ci_build_mac-amd64/arm64 to use build.py

Author: adamkewley

scripts/build.py

@@ -11,6 +11,8 @@
 import subprocess
 import time
 
+_dry_run = False
+
 def _envvar_as_tristate(key : str, default=None):
     value = os.getenv(key, default)
     if value is None:
@@ -23,7 +25,9 @@ def _run(args, extra_env_vars=None):
         extra_env_vars = {}
 
     logging.info(f"running: {' '.join(args)}")
-    subprocess.run(args, check=True, env={**os.environ, **extra_env_vars})
+
+    if not _dry_run:
+        subprocess.run(args, check=True, env={**os.environ, **extra_env_vars})
 
 def _log_dir_contents(path: str):
     logging.info(f"listing {path}")
@@ -41,7 +45,7 @@ def _generator_requires_architecture_flag(generator):
 def _is_multi_configuration_generator(generator):
     return generator is not None and ("Visual Studio" in generator or "Xcode" in generator or "Multi-Config" in generator)
 
-def _run_cmake_configure(source_dir, binary_dir, generator, architecture, cache_variables, extra_env_vars):
+def _run_cmake_configure(source_dir, binary_dir, generator, architecture, cache_variables, extra_env_vars=None):
     if extra_env_vars is None:
         extra_env_vars ={}
 
@@ -266,6 +270,7 @@ def build_osc(conf: BuildConfiguration):
                     concurrency=conf.concurrency,
                     target=conf.build_target
                 )
+                break
             except Exception as e:
                 if i+1 == conf.allowed_final_target_build_attempts:
                     raise

scripts/build_mac.sh

@@ -6,4 +6,9 @@
 
 set -xeuo pipefail
 
-OSC_OSX_ARCHITECTURES=x86_64 ./scripts/ci_build_mac.sh
+OSCDEPS_BUILD_ALWAYS=ON ./scripts/build.py \
+    --osx-architectures=x86_64 \
+    --osx-deployment-target=14.5 \
+    --allowed-final-target-build-attempts=8 \
+    --seconds-between-final-target-build-attempts=2
+

scripts/ci_build_mac-amd64.sh

@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
 #
 # Performs an end-to-end CI build of OpenSim Creator. This is what build
-# agents should run if they want to build release arm64 binaries of OpenSim
+# agents should run if they want to build release amd64 binaries of OpenSim
 # Creator on MacOS.
 
 set -xeuo pipefail
 
-OSC_OSX_ARCHITECTURES=arm64 ./scripts/ci_build_mac.sh
+OSCDEPS_BUILD_ALWAYS=ON ./scripts/build.py \
+    --osx-architectures=arm64 \
+    --osx-deployment-target=14.5 \
+    --allowed-final-target-build-attempts=8 \
+    --seconds-between-final-target-build-attempts=2
+