From 609f882da0f751cfc015ab2a2816bc2df37e1bc2 Mon Sep 17 00:00:00 2001 From: Matt M Date: Tue, 17 Sep 2024 16:00:02 -0700 Subject: [PATCH] oops --- .github/workflows/python.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 926dd52b6f..08bc0a3e75 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -103,6 +103,7 @@ jobs: - container: wpilib/roborio-cross-ubuntu:2024-22.04-py312 name: roborio arch-override: linuxathena + build-options: "-Ponlylinuxathena" # - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py38 # name: raspbian-py38 @@ -123,6 +124,7 @@ jobs: - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py310 name: raspbian-aarch64-py310 arch-override: linuxarm64 + build-options: "-Ponlylinuxarm64" # - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py311 # name: raspbian-aarch64-py311 # - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py312 @@ -137,16 +139,16 @@ jobs: submodules: 'recursive' fetch-depth: 0 - - name: Install RoboRIO Toolchain - run: ./gradlew installRoboRioToolchain - if: matrix.os.name == 'roborio' - - name: Install Java 17 uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin + - name: Install RoboRIO Toolchain + run: ./gradlew installRoboRioToolchain + if: matrix.os.name == 'roborio' + - name: Install setuptools + wheel run: | /build/venv/bin/build-pip --disable-pip-version-check install -U "setuptools==63.4.3; python_version < '3.12'" @@ -169,8 +171,8 @@ jobs: - run: git fetch --tags --force - run: | chmod +x gradlew - ./gradlew photon-targeting:build photon-lib:build -i -PpythonExecutable=/build/venv/bin/cross-python -PArchOverride=${{ matrix.os.arch-override }} - ./gradlew photon-lib:installPhotonlibpyNative -PpythonExecutable=/build/venv/bin/cross-python -PArchOverride=${{ matrix.os.arch-override }} + ./gradlew photon-targeting:build photon-lib:build -i -PpythonExecutable=/build/venv/bin/cross-python -PArchOverride=${{ matrix.os.arch-override }} ${{ matrix.os.build-options }} + ./gradlew photon-lib:installPhotonlibpyNative -PpythonExecutable=/build/venv/bin/cross-python -PArchOverride=${{ matrix.os.arch-override }} ${{ matrix.os.build-options }} - name: Build wheel working-directory: ./photon-lib/py