Update to 2024 compilers

wpilibsuite · Oct 8, 2023 · 2a8b0a0 · 2a8b0a0
1 parent c4d9c23
commit 2a8b0a0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ build/base:
 
 build/cross: build/base
 	cd roborio-cross-ubuntu && \
-	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu:2023-${UBUNTU} -f Dockerfile.2023 --build-arg UBUNTU=${UBUNTU} .
+	    docker build -t ${DOCKER_USER}/roborio-cross-ubuntu:2024-${UBUNTU} -f Dockerfile.2024 --build-arg UBUNTU=${UBUNTU} .
 	cd raspbian-cross-ubuntu && \
 	    docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu:bullseye-${UBUNTU} -f Dockerfile.bullseye --build-arg UBUNTU=${UBUNTU} .
 	cd aarch64-cross-ubuntu && \
@@ -40,7 +40,7 @@ push/base:
 	docker push ${DOCKER_USER}/gazebo-ubuntu:${UBUNTU}
 
 push/cross: push/base
-	docker push ${DOCKER_USER}/roborio-cross-ubuntu:2023-${UBUNTU}
+	docker push ${DOCKER_USER}/roborio-cross-ubuntu:2024-${UBUNTU}
 	docker push ${DOCKER_USER}/raspbian-cross-ubuntu:bullseye-${UBUNTU}
 	docker push ${DOCKER_USER}/aarch64-cross-ubuntu:bullseye-${UBUNTU}
 

diff --git a/aarch64-cross-ubuntu/Dockerfile.bullseye b/aarch64-cross-ubuntu/Dockerfile.bullseye
@@ -2,6 +2,6 @@ ARG UBUNTU=22.04
 FROM wpilib/ubuntu-base:${UBUNTU}
 
 # Install toolchain
-RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-7/arm64-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'
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/arm64-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
 WORKDIR /
diff --git a/raspbian-cross-ubuntu/Dockerfile.bullseye b/raspbian-cross-ubuntu/Dockerfile.bullseye
@@ -2,6 +2,6 @@ ARG UBUNTU=22.04
 FROM wpilib/ubuntu-base:${UBUNTU}
 
 # Install toolchain
-RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-7/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'
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-raspi-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
 WORKDIR /
diff --git a/roborio-cross-ubuntu/Dockerfile.2023 → roborio-cross-ubuntu/Dockerfile.2024 b/roborio-cross-ubuntu/Dockerfile.2023 → roborio-cross-ubuntu/Dockerfile.2024
@@ -2,6 +2,6 @@ ARG UBUNTU=22.04
 FROM wpilib/ubuntu-base:${UBUNTU}
 
 # Install toolchain
-RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-7/cortexa9_vfpv3-roborio-academic-2023-x86_64-linux-gnu-Toolchain-12.1.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/cortexa9_vfpv3-roborio-academic-2024-x86_64-linux-gnu-Toolchain-12.1.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
 
 WORKDIR /