From 76cb7729ee01d83c56bb9d8bae3c8e02ed54a80e Mon Sep 17 00:00:00 2001
From: Dustin Spicuzza <dustin@virtualroadside.com>
Date: Mon, 23 Oct 2023 01:07:45 -0400
Subject: [PATCH] Support our new platform identifier

---
 .github/workflows/dist.yml | 10 ++++++++--
 robotpy_build/platforms.py |  6 ++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index a954b4b3..c359c336 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -162,8 +162,9 @@ jobs:
       max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
       matrix:
         container:
-        - robotpy/roborio-cross-ubuntu:2023.1
-        - robotpy/raspbian-cross-ubuntu:2023.1
+        - wpilib/roborio-cross-ubuntu:2024-22.04-py312
+        - wpilib/raspbian-cross-ubuntu:bullseye-22.04-py312
+        - wpilib/aarch64-cross-ubuntu:bullseye-22.04-py312
 
     container:
       image: "${{ matrix.container }}"
@@ -185,6 +186,11 @@ jobs:
         name: dist
         path: dist
 
+    - name: Install setuptools
+      run: |
+        /build/venv/bin/build-pip --disable-pip-version-check install setuptools
+        /build/venv/bin/cross-pip --disable-pip-version-check install setuptools
+
     - name: Install
       working-directory: dist
       run: |
diff --git a/robotpy_build/platforms.py b/robotpy_build/platforms.py
index 3d69868c..dc474e12 100644
--- a/robotpy_build/platforms.py
+++ b/robotpy_build/platforms.py
@@ -34,7 +34,7 @@ def __post_init__(self):
 
 # key is python platform, value is information about wpilib maven artifacts
 _platforms = {
-    "linux-athena": WPILibMavenPlatform("athena", defines=["__FRC_ROBORIO__"]),
+    "linux-roborio": WPILibMavenPlatform("athena", defines=["__FRC_ROBORIO__"]),
     "linux-raspbian": WPILibMavenPlatform("arm32", defines=["__RASPBIAN__"]),
     "linux-armv7l": WPILibMavenPlatform("arm32"),
     "linux-x86_64": WPILibMavenPlatform(X86_64),
@@ -77,9 +77,7 @@ def get_platform(name: typing.Optional[str] = None) -> WPILibMavenPlatform:
 
                 distro_id = distro.id()
 
-                if distro_id in ("nilrt", "nilrt-academic"):
-                    pyplatform = "linux-athena"
-                elif distro_id == "raspbian":
+                if distro_id == "raspbian":
                     pyplatform = "linux-raspbian"
 
             except Exception: