Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Arm GNU Toolchain and GCC to version 13 #66

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upgrade Arm GNU Toolchain and GCC to version 13 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dbf3ea
Upgrade Toolchain to 13.1
wassr Jul 30, 2024
6fd5a23
Upgrade Catch2 to fix compile error
wassr Jul 30, 2024
919561c
Update clang to 18
wassr Aug 18, 2024
4febdd3
Update IWYU to 0.22
wassr Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions full/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}') \
Expand Down
4 changes: 2 additions & 2 deletions libraries.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rodos,0dd30adb373972b9adf2a4a4eb0b068130f45f53,https://github.com/SpaceTeam/rodos.git
etl,cceb5038664a4fa363e79709bc08bd0bb356ae50,https://github.com/ETLCPP/etl.git
Catch2,v3.1.0,https://github.com/catchorg/Catch2.git
Catch2,v3.3.0,https://github.com/catchorg/Catch2.git
littlefs,8e53bfeda7716ed7056a2b519bba45f40dea7df0,https://github.com/SpaceTeam/littlefs.git
strong_type,v15,https://github.com/rollbear/strong_type.git
include-what-you-use,0.19,https://github.com/include-what-you-use/include-what-you-use.git
include-what-you-use,0.22,https://github.com/include-what-you-use/include-what-you-use.git
31 changes: 16 additions & 15 deletions linux-x86/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
FROM ubuntu:23.04
FROM ubuntu:24.04

ENV HOME="/"

RUN dpkg --add-architecture i386 && apt-get update -qq && apt-get install -y -qq \
ca-certificates \
ccache \
clang-format-15 \
clang-tidy-15 \
clangd-15 \
clang-format-18 \
clang-tidy-18 \
clangd-18 \
cppcheck \
g++-12 \
g++-12-multilib \
gcc-12 \
gcc-12-multilib \
g++-13 \
g++-13-multilib \
gcc-13 \
gcc-13-multilib \
gdb \
git \
lcov \
libc6-dbg:i386 \
libclang-15-dev \
libclang-18-dev \
make \
ninja-build \
pipx \
Expand All @@ -30,11 +30,12 @@ RUN dpkg --add-architecture i386 && apt-get update -qq && apt-get install -y -qq
&& rm -rf /var/lib/apt/lists/*

# Setup tools versions
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/clang-format clang-format /usr/bin/clang-format-18 18
RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-18 18
RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-18 18
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
Expand All @@ -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) \
Expand Down
Loading