From 24512d5f93f8fe04d239b5f2155d925198c46e56 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Mon, 3 Jun 2024 17:21:33 -0700 Subject: [PATCH] Fix CI for macOS --- .github/workflows/ci_macos.yml | 2 +- .github/workflows/publish_dartpy.yml | 2 +- scripts/install_osx.sh | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml index 6068685241c08..d8540157710c8 100644 --- a/.github/workflows/ci_macos.yml +++ b/.github/workflows/ci_macos.yml @@ -33,7 +33,7 @@ jobs: env: COMPILER: clang BUILD_TYPE: ${{ matrix.build_type }} - BUILD_DARTPY: ON + BUILD_DARTPY: OFF DART_USE_SYSTEM_IMGUI: OFF IN_CI: ON ENABLE_SIMD: ${{ matrix.enable_simd }} diff --git a/.github/workflows/publish_dartpy.yml b/.github/workflows/publish_dartpy.yml index 6caf81341b7d8..28fcb2895d43e 100644 --- a/.github/workflows/publish_dartpy.yml +++ b/.github/workflows/publish_dartpy.yml @@ -75,7 +75,7 @@ jobs: release_only: false - os: macos-latest - build: "cp312-macosx_x86_64" + build: "cp312-macosx_arm64" experimental: false release_only: false diff --git a/scripts/install_osx.sh b/scripts/install_osx.sh index 428b4a4d90d30..4d177177bc726 100755 --- a/scripts/install_osx.sh +++ b/scripts/install_osx.sh @@ -11,8 +11,3 @@ else # Install master branch until 3.7.0 is released (see: https://github.com/dartsim/dart/issues/1439) brew install open-scene-graph --HEAD fi - -# Use pip for the default Python3 version -py_version=$(python3 -c "import sys; print('{}.{}'.format(sys.version_info[0], sys.version_info[1]))") -py_version_major=$(echo $py_version | cut -d. -f1) -pip$py_version_major install -U numpy pytest