Skip to content

Commit

Permalink
Build: update macOS CI scripts
Browse files Browse the repository at this point in the history
Signed-off-by: Rhys Mainwaring <[email protected]>
  • Loading branch information
srmainwaring committed Dec 30, 2024
1 parent 8b08d9d commit 1b1780d
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/brew_install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ brew tap osrf/simulation

# packages to install
PKGS=(
gz-garden
gz-harmonic
cgal
fftw
)
Expand Down
5 changes: 1 addition & 4 deletions .github/scripts/macos_build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Configure build dependencies
# https://gazebosim.org/docs/garden/install_osx_src#install-dependencies
# https://gazebosim.org/docs/harmonic/install_osx_src#install-dependencies

# [email protected]
export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/[email protected]
Expand All @@ -10,9 +10,6 @@ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/opt/[email protected]/lib/pkgc
# qt5
export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/qt@5

# Python scripts installed with: `pip3 install --user <package>`
export PATH=$PATH:$HOME/Library/Python/3.11/bin:$HOME/Library/Python/3.12/bin

# Use desktop_notification- to suppress error:
# ERROR:colcon.colcon_notification.desktop_notification.terminal_notifier:
# Could not find the colcon-terminal-notifier.app in the install prefix '/Users/runner/Library/Python/3.12'
Expand Down
3 changes: 0 additions & 3 deletions .github/scripts/macos_test.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#!/bin/bash

# Python scripts installed with: `pip3 install --user <package>`
export PATH=$PATH:$HOME/Library/Python/3.11/bin:$HOME/Library/Python/3.12/bin

colcon test --merge-install
colcon test-result --all --verbose
1 change: 0 additions & 1 deletion .github/workflows/macos13-ventura-build-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ jobs:
which pip3
which python3
python3 --version
export PATH=$PATH:/Users/runner/Library/Python/3.12/bin:/Users/runner/Library/Python/3.13/bin
colcon graph
1 change: 0 additions & 1 deletion .github/workflows/macos14-sonoma-build-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ jobs:
which pip3
which python3
python3 --version
export PATH=$PATH:/Users/runner/Library/Python/3.12/bin:/Users/runner/Library/Python/3.13/bin
colcon graph
1 change: 0 additions & 1 deletion .github/workflows/macos15-sequoia-build-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ jobs:
which pip3
which python3
python3 --version
export PATH=$PATH:/Users/runner/Library/Python/3.12/bin:/Users/runner/Library/Python/3.13/bin
colcon graph

0 comments on commit 1b1780d

Please sign in to comment.