Skip to content

Commit

Permalink
Upgrade to bookworm compilers
Browse files Browse the repository at this point in the history
  • Loading branch information
Gold856 committed Dec 24, 2024
1 parent 8a1e1ca commit 9e95c0d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
- container: wpilib/systemcore-cross-ubuntu:2025-22.04
artifact-name: SystemCore
build-options: "-Pplatform=linux-systemcore"
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
- container: wpilib/raspbian-cross-ubuntu:bookworm-22.04
artifact-name: Arm32
build-options: "-Pplatform=linux-arm32"
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04
- container: wpilib/aarch64-cross-ubuntu:bookworm-22.04
artifact-name: Arm64
build-options: "-Pplatform=linux-arm64"
- container: wpilib/ubuntu-base:22.04
Expand All @@ -37,9 +37,6 @@ jobs:
submodules: 'true'
- run: sudo apt-get update && sudo apt-get install ant -y && sudo rm -rf /var/lib/apt/lists/* && sudo rm -f /bin/ant && sudo ln -s /usr/share/ant/bin/ant /bin/ant
name: Install Ant
- run: rm -rf /usr/local/arm-linux-gnueabihf && curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-9/armhf-raspi-bullseye-2023-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
name: Replace arm32 compiler
if: matrix.artifact-name == 'Arm32'
- run: ./gradlew build -PjenkinsBuild ${{ matrix.build-options }}
name: Build with Gradle
- uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion arm-pi-gnueabihf.toolchain.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version")
set(GNU_MACHINE "armv6-bullseye-linux-gnueabi" CACHE STRING "GNU compiler triple")
set(GNU_MACHINE "armv6-bookworm-linux-gnueabi" CACHE STRING "GNU compiler triple")
set(ARM_LINUX_SYSROOT /usr/local/arm-linux-gnueabihf/sysroot)

if(COMMAND toolchain_save_config)
Expand Down

0 comments on commit 9e95c0d

Please sign in to comment.