Skip to content

Commit

Permalink
Build: update macOS CI scripts
Browse files Browse the repository at this point in the history
- Remove macOS-12 build.
- Add builds for macOS-14 and macOS-15 with arm64 variants.
- Remove --user installs.

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
  • Loading branch information
srmainwaring committed Dec 30, 2024
1 parent d2ec631 commit 1f344bd
Show file tree
Hide file tree
Showing 8 changed files with 116 additions and 71 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/macos12-monterey-build-tools.yml

This file was deleted.

42 changes: 0 additions & 42 deletions .github/workflows/macos12-monterey-ci.yml

This file was deleted.

9 changes: 6 additions & 3 deletions .github/workflows/macos13-ventura-build-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ jobs:

- name: Install Build Tools
run: |
pip3 install --user vcstool
pip3 install --user colcon-common-extensions
python3 -m venv /Users/runner/venv
source /Users/runner/venv/bin/activate
python3 -m pip install vcstool
python3 -m pip install colcon-common-extensions
- name: Check Build Tools
run: |
source /Users/runner/venv/bin/activate
which pip3
which python3
python3 --version
export PATH=$PATH:/Users/runner/Library/Python/3.11/bin:/Users/runner/Library/Python/3.12/bin
export PATH=$PATH:/Users/runner/Library/Python/3.12/bin:/Users/runner/Library/Python/3.13/bin
colcon graph
4 changes: 2 additions & 2 deletions .github/workflows/macos13-ventura-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
- name: Install Build Tools
run: |
python3 -m pip install --user vcstool
python3 -m pip install --user colcon-common-extensions
python3 -m pip install vcstool
python3 -m pip install colcon-common-extensions
- name: Build Wave Sim
run: |
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/macos14-arm64-sonoma-build-tools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: macOS Sonoma Build Tools (arm64)

on: [pull_request]

jobs:
macos-14-arm64-ci:
runs-on: macos-14-arm64
name: macOS Sonoma Build Tools (arm64)
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install Build Tools
run: |
python3 -m venv /Users/runner/venv
source /Users/runner/venv/bin/activate
python3 -m pip install vcstool
python3 -m pip install colcon-common-extensions
- name: Check Build Tools
run: |
source /Users/runner/venv/bin/activate
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
27 changes: 27 additions & 0 deletions .github/workflows/macos14-sonoma-build-tools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: macOS Sonoma Build Tools

on: [pull_request]

jobs:
macos-14-ci:
runs-on: macos-14
name: macOS Sonoma Build Tools
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install Build Tools
run: |
python3 -m venv /Users/runner/venv
source /Users/runner/venv/bin/activate
python3 -m pip install vcstool
python3 -m pip install colcon-common-extensions
- name: Check Build Tools
run: |
source /Users/runner/venv/bin/activate
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
27 changes: 27 additions & 0 deletions .github/workflows/macos15-arm64-sequoia-build-tools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: macOS Sequoia Build Tools (arm64)

on: [pull_request]

jobs:
macos-15-arm64-ci:
runs-on: macos-15-arm64
name: macOS Sequoia Build Tools (arm64)
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install Build Tools
run: |
python3 -m venv /Users/runner/venv
source /Users/runner/venv/bin/activate
python3 -m pip install vcstool
python3 -m pip install colcon-common-extensions
- name: Check Build Tools
run: |
source /Users/runner/venv/bin/activate
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
27 changes: 27 additions & 0 deletions .github/workflows/macos15-sequoia-build-tools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: macOS Sequoia Build Tools

on: [pull_request]

jobs:
macos-15-ci:
runs-on: macos-15
name: macOS Sequoia Build Tools (arm64)
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install Build Tools
run: |
python3 -m venv /Users/runner/venv
source /Users/runner/venv/bin/activate
python3 -m pip install vcstool
python3 -m pip install colcon-common-extensions
- name: Check Build Tools
run: |
source /Users/runner/venv/bin/activate
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 1f344bd

Please sign in to comment.