diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 746ab1265..2a83b9d01 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -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" @@ -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' @@ -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 diff --git a/devtools/__main__.py b/devtools/__main__.py index 85f27db91..60e1c15a1 100644 --- a/devtools/__main__.py +++ b/devtools/__main__.py @@ -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() diff --git a/rdev.toml b/rdev.toml index c11f024d3..42363ec43 100644 --- a/rdev.toml +++ b/rdev.toml @@ -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 diff --git a/subprojects/pyntcore/pyproject.toml b/subprojects/pyntcore/pyproject.toml index 81459f3ea..5e8d3a386 100644 --- a/subprojects/pyntcore/pyproject.toml +++ b/subprojects/pyntcore/pyproject.toml @@ -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] diff --git a/subprojects/robotpy-apriltag/pyproject.toml b/subprojects/robotpy-apriltag/pyproject.toml index 7e0c40273..87e5680f3 100644 --- a/subprojects/robotpy-apriltag/pyproject.toml +++ b/subprojects/robotpy-apriltag/pyproject.toml @@ -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] diff --git a/subprojects/robotpy-cscore/pyproject.toml b/subprojects/robotpy-cscore/pyproject.toml index 71501a086..43489a6e2 100644 --- a/subprojects/robotpy-cscore/pyproject.toml +++ b/subprojects/robotpy-cscore/pyproject.toml @@ -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 ] diff --git a/subprojects/robotpy-hal/pyproject.toml b/subprojects/robotpy-hal/pyproject.toml index 12f0be654..bc5c52839 100644 --- a/subprojects/robotpy-hal/pyproject.toml +++ b/subprojects/robotpy-hal/pyproject.toml @@ -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] diff --git a/subprojects/robotpy-halsim-ds-socket/pyproject.toml b/subprojects/robotpy-halsim-ds-socket/pyproject.toml index c0db87fa4..34713a1d6 100644 --- a/subprojects/robotpy-halsim-ds-socket/pyproject.toml +++ b/subprojects/robotpy-halsim-ds-socket/pyproject.toml @@ -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] diff --git a/subprojects/robotpy-halsim-gui/pyproject.toml b/subprojects/robotpy-halsim-gui/pyproject.toml index 8b33c0807..418a8e869 100644 --- a/subprojects/robotpy-halsim-gui/pyproject.toml +++ b/subprojects/robotpy-halsim-gui/pyproject.toml @@ -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] diff --git a/subprojects/robotpy-halsim-ws/pyproject.toml b/subprojects/robotpy-halsim-ws/pyproject.toml index ab8bd1622..9474a8bc1 100644 --- a/subprojects/robotpy-halsim-ws/pyproject.toml +++ b/subprojects/robotpy-halsim-ws/pyproject.toml @@ -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] diff --git a/subprojects/robotpy-romi/pyproject.toml b/subprojects/robotpy-romi/pyproject.toml index 9fd5b831d..a193ad486 100644 --- a/subprojects/robotpy-romi/pyproject.toml +++ b/subprojects/robotpy-romi/pyproject.toml @@ -12,7 +12,7 @@ install_requires = [ [build-system] requires = [ "robotpy-build~=2025.0.0", - "wpilib~=2025.1.1" + "wpilib~=2025.2" ] [tool.robotpy-build] diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml index 148d519f2..08b1567c6 100644 --- a/subprojects/robotpy-wpilib/pyproject.toml +++ b/subprojects/robotpy-wpilib/pyproject.toml @@ -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] diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index 29942cfca..12d720734 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -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 ] diff --git a/subprojects/robotpy-wpinet/pyproject.toml b/subprojects/robotpy-wpinet/pyproject.toml index e81904208..0939a4bed 100644 --- a/subprojects/robotpy-wpinet/pyproject.toml +++ b/subprojects/robotpy-wpinet/pyproject.toml @@ -43,5 +43,5 @@ install_requires = [ [build-system] requires = [ "robotpy-build~=2025.0.0", - "robotpy-wpiutil~=2025.1.1", + "robotpy-wpiutil~=2025.2", ] diff --git a/subprojects/robotpy-xrp/pyproject.toml b/subprojects/robotpy-xrp/pyproject.toml index 989fe06d5..43fb689cd 100644 --- a/subprojects/robotpy-xrp/pyproject.toml +++ b/subprojects/robotpy-xrp/pyproject.toml @@ -17,7 +17,7 @@ robotpysimext = [ [build-system] requires = [ "robotpy-build~=2025.0.0", - "wpilib~=2025.1.1" + "wpilib~=2025.2" ] [tool.robotpy-build]