Skip to content

ci: Build on macOS 14 (ARM) runners #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 22, 2025
Merged

ci: Build on macOS 14 (ARM) runners #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3990f4
Updated dependencies
auscompgeek Jan 19, 2025
bc13eb9
Target macOS 13.3
auscompgeek Jan 11, 2025
d8f08e1
ci: Build on macOS 14 (ARM) runners
auscompgeek Jan 18, 2025
80d7612
ci: Use sccache on macOS
auscompgeek Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/dist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ concurrency:
cancel-in-progress: true

env:
SCCACHE_CACHE_MULTIARCH: "1"
SCCACHE_WEBDAV_ENDPOINT: "https://frcmaven.wpi.edu/artifactory/wpilib-generic-cache-cmake-local"
SCCACHE_WEBDAV_KEY_PREFIX: "sccache-robotpy"

Expand Down Expand Up @@ -72,7 +73,7 @@ jobs:
max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
fail-fast: true
matrix:
os: ["ubuntu-22.04", "macos-13", "windows-2022"]
os: ["ubuntu-22.04", "macos-14", "windows-2022"]
python_version:
- '3.9'
- '3.10'
Expand All @@ -96,7 +97,7 @@ jobs:
shell: bash
id: ccache
run: |
if [[ "${{ runner.os }}" == "Windows" ]]; then
if [[ "${{ runner.os }}" != "Linux" ]]; then
echo "VARIANT=sccache" >> $GITHUB_OUTPUT
else
echo "VARIANT=ccache" >> $GITHUB_OUTPUT
Expand Down
2 changes: 1 addition & 1 deletion devtools/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# MACOSX_DEPLOYMENT_TARGET is required for linking to WPILib
if sys.platform == "darwin":
os.environ["MACOSX_DEPLOYMENT_TARGET"] = "13"
os.environ["MACOSX_DEPLOYMENT_TARGET"] = "13.3"


@click.group()
Expand Down
26 changes: 13 additions & 13 deletions rdev.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,53 +26,53 @@ robotpy_build_req = "~=2025.0.0"
#

[subprojects."robotpy-wpiutil"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = true

[subprojects."robotpy-wpinet"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = true

[subprojects.pyntcore]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = true

[subprojects."robotpy-hal"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = true

[subprojects."robotpy-wpimath"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = true

[subprojects."robotpy-cscore"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = true

[subprojects."robotpy-apriltag"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = true

[subprojects."robotpy-wpilib"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = true

[subprojects."robotpy-halsim-ds-socket"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = false

[subprojects."robotpy-halsim-ws"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = false

[subprojects."robotpy-halsim-gui"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = false

[subprojects."robotpy-romi"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = false

[subprojects."robotpy-xrp"]
min_version = "2025.1.1"
min_version = "2025.2"
roborio = false
4 changes: 2 additions & 2 deletions subprojects/pyntcore/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ install_requires = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-wpiutil~=2025.1.1",
"robotpy-wpinet~=2025.1.1",
"robotpy-wpiutil~=2025.2",
"robotpy-wpinet~=2025.2",
]

[tool.robotpy-build]
Expand Down
4 changes: 2 additions & 2 deletions subprojects/robotpy-apriltag/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ install_requires = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-wpiutil~=2025.1.1",
"robotpy-wpimath~=2025.1.1",
"robotpy-wpiutil~=2025.2",
"robotpy-wpimath~=2025.2",
]

[tool.robotpy-build]
Expand Down
6 changes: 3 additions & 3 deletions subprojects/robotpy-cscore/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ install_requires = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-wpiutil~=2025.1.1",
"robotpy-wpinet~=2025.1.1",
"pyntcore~=2025.1.1",
"robotpy-wpiutil~=2025.2",
"robotpy-wpinet~=2025.2",
"pyntcore~=2025.2",
# "numpy", # required for pybind11-stubgen to not complain, broken in raspbian CI
]

Expand Down
2 changes: 1 addition & 1 deletion subprojects/robotpy-hal/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install_requires = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-wpiutil~=2025.1.1",
"robotpy-wpiutil~=2025.2",
]

[tool.robotpy-build]
Expand Down
4 changes: 2 additions & 2 deletions subprojects/robotpy-halsim-ds-socket/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ robotpysimext = ["ds-socket = halsim_ds_socket"]
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-hal~=2025.1.1",
"robotpy-wpinet~=2025.1.1",
"robotpy-hal~=2025.2",
"robotpy-wpinet~=2025.2",
]

[tool.robotpy-build]
Expand Down
8 changes: 4 additions & 4 deletions subprojects/robotpy-halsim-gui/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ install_requires = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-wpiutil~=2025.1.1",
"robotpy-wpimath~=2025.1.1",
"robotpy-hal~=2025.1.1",
"pyntcore~=2025.1.1",
"robotpy-wpiutil~=2025.2",
"robotpy-wpimath~=2025.2",
"robotpy-hal~=2025.2",
"pyntcore~=2025.2",
]

[tool.robotpy-build]
Expand Down
4 changes: 2 additions & 2 deletions subprojects/robotpy-halsim-ws/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ robotpysimext = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-hal~=2025.1.1",
"robotpy-wpinet~=2025.1.1",
"robotpy-hal~=2025.2",
"robotpy-wpinet~=2025.2",
]

[tool.robotpy-build]
Expand Down
2 changes: 1 addition & 1 deletion subprojects/robotpy-romi/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install_requires = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"wpilib~=2025.1.1"
"wpilib~=2025.2"
]

[tool.robotpy-build]
Expand Down
8 changes: 4 additions & 4 deletions subprojects/robotpy-wpilib/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ robotpy = ["run = wpilib._impl.start:Main"]
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-wpiutil~=2025.1.1",
"robotpy-wpimath~=2025.1.1",
"robotpy-hal~=2025.1.1",
"pyntcore~=2025.1.1",
"robotpy-wpiutil~=2025.2",
"robotpy-wpimath~=2025.2",
"robotpy-hal~=2025.2",
"pyntcore~=2025.2",
]

[tool.robotpy-build]
Expand Down
2 changes: 1 addition & 1 deletion subprojects/robotpy-wpimath/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install_requires = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-wpiutil~=2025.1.1",
"robotpy-wpiutil~=2025.2",
# "numpy", # broken in raspbian CI
]

Expand Down
2 changes: 1 addition & 1 deletion subprojects/robotpy-wpinet/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ install_requires = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"robotpy-wpiutil~=2025.1.1",
"robotpy-wpiutil~=2025.2",
]
2 changes: 1 addition & 1 deletion subprojects/robotpy-xrp/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ robotpysimext = [
[build-system]
requires = [
"robotpy-build~=2025.0.0",
"wpilib~=2025.1.1"
"wpilib~=2025.2"
]

[tool.robotpy-build]
Expand Down
Loading