Skip to content

Commit

Permalink
OpenCyphal#56 adding GCC7
Browse files Browse the repository at this point in the history
Also had to remove qemu (deprecated for Ubuntu 22.04 I guess?) but we weren't using it.
  • Loading branch information
thirtytwobits committed Feb 13, 2025
1 parent 11a2413 commit 3f5304f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ like [libcanard](https://github.com/OpenCyphal/libcanard) and

| tag | Python | GCC (native) | GCC (arm-none-eabi) | Clang (native) | Cmake | Host Platforms | Other Utilities |
|----------|--------|--------------|---------------------|----------------|-------|----------------|-----------------|
| [ts22.4.11](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed) | 3.10 | 12.3.0 | 13.3.1 | 18.1.3 | 3.30.1 | <ul><li>linux/amd64</li><li>linux/arm64</li></ul> | <li>can-utils</li><li>doxygen 1.10.0</li><li>nvm</li><li>node 20.x</li><li>nox</li><li>govr</li><li>gcc-multilib (amd64 only)</li><li>gcc7</li></ul> |
| [ts22.4.10](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed) | 3.10 | 12.3.0 | 13.3.1 | 18.1.3 | 3.30.1 | <ul><li>linux/amd64</li><li>linux/arm64</li></ul> | <ul><li>qemu</li><li>can-utils</li><li>doxygen 1.10.0</li><li>nvm</li><li>node 20.x</li><li>nox</li><li>govr</li><li>gcc-multilib (amd64 only)</li></ul> |
| [ts22.4.8](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed) | 3.10 | 12.3.0 | (N/A) | 18.1.3 | 3.22.1 | <ul><li>linux/amd64</li><li>linux/arm64</li></ul> | <ul><li>qemu</li><li>can-utils</li><li>doxygen 1.10.0</li><li>nvm</li><li>node 20.x</li><li>nox</li><li>govr</li><li>gcc-multilib (amd64 only)</li></ul> |
| [ts22.4.7](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed) | 3.10 | 12.3.0 | (N/A) | 18.1.3 | 3.22.1 | <ul><li>linux/amd64</li><li>linux/arm64</li></ul> | <ul><li>qemu</li><li>can-utils</li><li>doxygen 1.10.0</li><li>nvm</li><li>node 20.x</li><li>nox</li><li>govr</li></ul> |
Expand Down
2 changes: 1 addition & 1 deletion toolshed/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN ./provision.sh
RUN ./provision-${TARGETARCH}.sh
RUN ./post-provision.sh

# INSTALL THE PATH FOR INTERATIVE SESSIONS
# INSTALL THE PATH FOR INTERACTIVE SESSIONS
RUN echo "export PATH=$PATH" >> ~/.bashrc

# LEAVE THE WORKDIR AS /repo
Expand Down
2 changes: 2 additions & 0 deletions toolshed/pre-provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ cat kitware-archive-latest.asc | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/ki

apt-get -y install software-properties-common
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6AF7F09730B3F0A4
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 16FAAD7AF99A65E2
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
apt-add-repository 'deb https://ports.ubuntu.com/ubuntu-ports focal main universe'
add-apt-repository -y ppa:deadsnakes/ppa

# setup locales in the container so Python can default to utf-8.
Expand Down
2 changes: 1 addition & 1 deletion toolshed/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ apt-get -y install lcov
apt-get -y install valgrind
apt-get -y install graphviz
apt-get -y install curl
apt-get -y install qemu
apt-get -y install ninja-build
apt-get -y install can-utils
apt-get -y install lsb-release
apt-get -y install wget
apt-get -y install gnupg
apt-get -y install vim
apt-get -y install g++-7
apt-get -y install g++-10
apt-get -y install g++-11
apt-get -y install g++-12

0 comments on commit 3f5304f

Please sign in to comment.