Skip to content

Commit 76cb772

Browse files
committed
Support our new platform identifier
1 parent cf0c870 commit 76cb772

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/workflows/dist.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,9 @@ jobs:
162162
max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
163163
matrix:
164164
container:
165-
- robotpy/roborio-cross-ubuntu:2023.1
166-
- robotpy/raspbian-cross-ubuntu:2023.1
165+
- wpilib/roborio-cross-ubuntu:2024-22.04-py312
166+
- wpilib/raspbian-cross-ubuntu:bullseye-22.04-py312
167+
- wpilib/aarch64-cross-ubuntu:bullseye-22.04-py312
167168

168169
container:
169170
image: "${{ matrix.container }}"
@@ -185,6 +186,11 @@ jobs:
185186
name: dist
186187
path: dist
187188

189+
- name: Install setuptools
190+
run: |
191+
/build/venv/bin/build-pip --disable-pip-version-check install setuptools
192+
/build/venv/bin/cross-pip --disable-pip-version-check install setuptools
193+
188194
- name: Install
189195
working-directory: dist
190196
run: |

robotpy_build/platforms.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def __post_init__(self):
3434

3535
# key is python platform, value is information about wpilib maven artifacts
3636
_platforms = {
37-
"linux-athena": WPILibMavenPlatform("athena", defines=["__FRC_ROBORIO__"]),
37+
"linux-roborio": WPILibMavenPlatform("athena", defines=["__FRC_ROBORIO__"]),
3838
"linux-raspbian": WPILibMavenPlatform("arm32", defines=["__RASPBIAN__"]),
3939
"linux-armv7l": WPILibMavenPlatform("arm32"),
4040
"linux-x86_64": WPILibMavenPlatform(X86_64),
@@ -77,9 +77,7 @@ def get_platform(name: typing.Optional[str] = None) -> WPILibMavenPlatform:
7777

7878
distro_id = distro.id()
7979

80-
if distro_id in ("nilrt", "nilrt-academic"):
81-
pyplatform = "linux-athena"
82-
elif distro_id == "raspbian":
80+
if distro_id == "raspbian":
8381
pyplatform = "linux-raspbian"
8482

8583
except Exception:

0 commit comments

Comments
 (0)