Upgrade Toolchain to 13.1

SpaceTeam · Jul 30, 2024 · 4dbf3ea · 4dbf3ea
1 parent d162565
commit 4dbf3ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/full/Dockerfile b/full/Dockerfile
@@ -3,13 +3,13 @@ FROM tuwienspaceteam/sts1-cobc:latest-linux-x86
 RUN apt-get update -qq && apt-get install -y sudo -qq
 
 # Install toolchain
-RUN wget https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz -nv \
-&& wget https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc -nv \
-&& sha256sum --check arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc \
-&& tar -xvf arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz -C /opt \
-&& rm arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc
+RUN wget https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz -nv \
+&& wget https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc -nv \
+&& sha256sum --check arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc \
+&& tar -xvf arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz -C /opt \
+&& rm arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc
 
-ENV PATH="/opt/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi/bin:${PATH}"
+ENV PATH="/opt/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi/bin:${PATH}"
 
 RUN GCC_VERSION=$(gcc -dumpfullversion | awk -F. '{print $1}') \
 && ARM_GCC_VERSION=$(arm-none-eabi-gcc -dumpfullversion | awk -F. '{print $1}') \

diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile
@@ -9,10 +9,10 @@ RUN dpkg --add-architecture i386 && apt-get update -qq && apt-get install -y -qq
     clang-tidy-15 \
     clangd-15 \
     cppcheck \
-    g++-12 \
-    g++-12-multilib \
-    gcc-12 \
-    gcc-12-multilib \
+    g++-13 \
+    g++-13-multilib \
+    gcc-13 \
+    gcc-13-multilib \
     gdb \
     git \
     lcov \
@@ -33,8 +33,9 @@ RUN dpkg --add-architecture i386 && apt-get update -qq && apt-get install -y -qq
 RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 15
 RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 15
 RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-15 15
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12
+RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
+RUN update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-13 13
 
 # Install CMake 3.22
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-linux-x86_64.tar.gz -q
@@ -49,7 +50,7 @@ RUN sudo cmake --version
 ENV CTCACHE_DIR="/.cache/clang-tidy"
 RUN mkdir -p ${CTCACHE_DIR}
 
-RUN wget https://raw.githubusercontent.com/matus-chochlik/ctcache/main/clang-tidy-cache -O /usr/local/bin/clang-tidy-cache && chmod +x /usr/local/bin/clang-tidy-cache
+RUN wget https://raw.githubusercontent.com/matus-chochlik/ctcache/main/src/ctcache/clang_tidy_cache.py -O /usr/local/bin/clang-tidy-cache && chmod +x /usr/local/bin/clang-tidy-cache
 
 # Check for possible mismatch between g++ and gcov versions
 RUN GCC_VERSION=$(g++ -dumpfullversion) \