Skip to content

Commit

Permalink
Fix CI for macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
jslee02 committed Jun 4, 2024
1 parent aedacca commit 9bc3fe9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish_dartpy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
DART_IN_CI: ON

# macOS
MACOSX_DEPLOYMENT_TARGET: 10.15
MACOSX_DEPLOYMENT_TARGET: 14.0

# Windows
CMAKE_TOOLCHAIN_FILE: ""
Expand All @@ -144,7 +144,7 @@ jobs:
DART_IN_CI: ON

# macOS
MACOSX_DEPLOYMENT_TARGET: 10.15
MACOSX_DEPLOYMENT_TARGET: 14.0

# Windows
CMAKE_TOOLCHAIN_FILE: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand Down
1 change: 0 additions & 1 deletion dart/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ else()
# TODO: Improve this part to detect the system's architecture and apply the
# appropriate SIMD instructions.
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=neon")
# Remove SSE flags if set elsewhere
string(REPLACE "-msse" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
string(REPLACE "-msse2" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ archs = ["auto64"] # TODO: Add universal2 and arm64
before-all = [
"brew update > /dev/null",
"brew bundle || brew bundle",
"brew install open-scene-graph --HEAD",
"brew install open-scene-graph", # TODO: --HEAD is needed to build the latest version, but it's currently broken
"sw_vers",
]

Expand Down
5 changes: 0 additions & 5 deletions scripts/install_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9bc3fe9

Please sign in to comment.