Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions .github/docker/ubuntu18.04/c4core-install
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ case $what in
$script gcc-14
;;
clang-all)
$script clang-18
$script clang-17
$script clang-16
$script clang-15
Expand Down Expand Up @@ -302,6 +303,18 @@ case $what in
apt-get install -y \
clang-17 clang-tidy-17
;;
clang++-18|clang-18)
apt-get update
apt-get install -y \
wget \
software-properties-common
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | apt-key add -
apt-add-repository --yes --no-update ppa:ubuntu-toolchain-r/test
apt-add-repository --yes --no-update "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-18 main"
apt-get update
apt-get install -y \
clang-18 clang-tidy-18
;;
arm-none-eabi)
# taken from: https://askubuntu.com/questions/1243252/how-to-install-arm-none-eabi-gdb-on-ubuntu-20-04-lts-focal-fossa/1371525#1371525
apt-get update
Expand Down
13 changes: 13 additions & 0 deletions .github/docker/ubuntu22.04/c4core-install
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ case $what in
$script gcc-14
;;
clang-all)
$script clang-19
$script clang-18
$script clang-17
$script clang-16
Expand Down Expand Up @@ -274,6 +275,18 @@ case $what in
apt-get install -y \
clang-18 clang-tidy-18
;;
clang++-19|clang-19)
apt-get update
apt-get install -y \
wget \
software-properties-common
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | apt-key add -
apt-add-repository --yes --no-update ppa:ubuntu-toolchain-r/test
apt-add-repository --yes --no-update "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main"
apt-get update
apt-get install -y \
clang-19 clang-tidy-19
;;
arm-none-eabi)
# taken from: https://askubuntu.com/questions/1243252/how-to-install-arm-none-eabi-gdb-on-ubuntu-20-04-lts-focal-fossa/1371525#1371525
apt-get update
Expand Down
6 changes: 6 additions & 0 deletions .github/docker/ubuntu24.04/c4core-install
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ case $what in
$script gcc-4.8
;;
clang-all)
$script clang-19
$script clang-18
$script clang-17
$script clang-16
Expand Down Expand Up @@ -333,6 +334,11 @@ case $what in
apt-get install -y \
clang-18 clang-tidy-18
;;
clang++-19|clang-19)
apt-get update
apt-get install -y \
clang-19 clang-tidy-19
;;
arm-none-eabi)
apt-get update
apt-get install -y \
Expand Down
8 changes: 7 additions & 1 deletion .github/reqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ function _c4_gather_compilers()
{
cxx=$1
case $cxx in
g++-14 ) _c4_addgcc 14 ;;
g++-13 ) _c4_addgcc 13 ;;
g++-12 ) _c4_addgcc 12 ;;
g++-11 ) _c4_addgcc 11 ;;
Expand All @@ -248,6 +249,10 @@ function _c4_gather_compilers()
g++-5 ) _c4_addgcc 5 ;;
g++-4.9 ) _c4_addgcc 4.9 ;; # https://askubuntu.com/questions/1036108/install-gcc-4-9-at-ubuntu-18-04
g++-4.8 ) _c4_addgcc 4.8 ;;
clang++-19 ) _c4_addclang 19 ;;
clang++-18 ) _c4_addclang 18 ;;
clang++-17 ) _c4_addclang 17 ;;
clang++-16 ) _c4_addclang 16 ;;
clang++-15 ) _c4_addclang 15 ;;
clang++-14 ) _c4_addclang 14 ;;
clang++-13 ) _c4_addclang 13 ;;
Expand Down Expand Up @@ -342,10 +347,11 @@ function _c4_addgcc()
# add a clang compiler
function _c4_addclang()
{
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
clversion=$1
case $clversion in
# in 18.04, clang9 and later require PPAs
9 | 10 | 11 | 12 | 13 | 14 | 15)
9 | 10 | 11 | 12 | 13)
_add_apt clang-$clversion "deb http://apt.llvm.org/$UBUNTU_RELEASE_NAME/ llvm-toolchain-$UBUNTU_RELEASE_NAME-$clversion main"
# libstdc++ is required
_c4_addgcc 11
Expand Down
4 changes: 2 additions & 2 deletions .github/setenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,12 @@ function _c4skipbitlink()

function c4_build_test()
{
c4_build_target $* test-build
c4_build_target $* c4core-test-build
}

function c4_run_test()
{
c4_run_target $* test
c4_run_target $* c4core-test-run
}

function c4_build_target() # runs in parallel
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows-in/clang.ys
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,14 @@ jobs:
# matrix:
# include:
# # these jobs take much longer, so run only one bitlink pair per job to profit from parallelism
# - {std: 11, cxx: clang++-10, bt: Debug , bitlinks: shared64, os: ubuntu-20.04}
# - {std: 11, cxx: clang++-10, bt: Release, bitlinks: shared64, os: ubuntu-20.04}
# - {std: 14, cxx: clang++-10, bt: Debug , bitlinks: shared64, os: ubuntu-20.04}
# - {std: 14, cxx: clang++-10, bt: Release, bitlinks: shared64, os: ubuntu-20.04}
# - {std: 17, cxx: clang++-10, bt: Debug , bitlinks: shared64, os: ubuntu-20.04}
# - {std: 17, cxx: clang++-10, bt: Release, bitlinks: shared64, os: ubuntu-20.04}
# - {std: 20, cxx: clang++-10, bt: Debug , bitlinks: shared64, os: ubuntu-20.04}
# - {std: 20, cxx: clang++-10, bt: Release, bitlinks: shared64, os: ubuntu-20.04}
# - {std: 11, cxx: clang++-10, bt: Debug , bitlinks: shared64, os: ubuntu-22.04}
# - {std: 11, cxx: clang++-10, bt: Release, bitlinks: shared64, os: ubuntu-22.04}
# - {std: 14, cxx: clang++-10, bt: Debug , bitlinks: shared64, os: ubuntu-22.04}
# - {std: 14, cxx: clang++-10, bt: Release, bitlinks: shared64, os: ubuntu-22.04}
# - {std: 17, cxx: clang++-10, bt: Debug , bitlinks: shared64, os: ubuntu-22.04}
# - {std: 17, cxx: clang++-10, bt: Release, bitlinks: shared64, os: ubuntu-22.04}
# - {std: 20, cxx: clang++-10, bt: Debug , bitlinks: shared64, os: ubuntu-22.04}
# - {std: 20, cxx: clang++-10, bt: Release, bitlinks: shared64, os: ubuntu-22.04}
# env: {STD: "${{matrix.std}}", CXX_: "${{matrix.cxx}}", BT: "${{matrix.bt}}", BITLINKS: "${{matrix.bitlinks}}", VG: "${{matrix.vg}}", SAN: "${{matrix.san}}", LINT: "${{matrix.lint}}", OS: "${{matrix.os}}"}
# steps:
# - {name: checkout, uses: actions/checkout@v4, with: {submodules: recursive}}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows-in/gcc.ys
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,12 @@ jobs:
matrix:
include:
# these jobs take much longer, so run only one bitlink pair per job to profit from parallelism
- {std: 11, bt: Debug , toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc, os: ubuntu-20.04}
- {std: 11, bt: Release, toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc, os: ubuntu-20.04}
- {std: 14, bt: Debug , toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc, os: ubuntu-20.04}
- {std: 14, bt: Release, toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc, os: ubuntu-20.04}
- {std: 17, bt: Debug , toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc, os: ubuntu-20.04}
- {std: 17, bt: Release, toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc, os: ubuntu-20.04}
- {std: 11, bt: Debug , toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc}
- {std: 11, bt: Release, toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc}
- {std: 14, bt: Debug , toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc}
- {std: 14, bt: Release, toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc}
- {std: 17, bt: Debug , toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc}
- {std: 17, bt: Release, toolchain: cmake/Toolchain-Arm-ubuntu.cmake, cxx: arm-linux-gnueabihf-gcc}
env:: -{'TOOLCHAIN' '${{matrix.toolchain}}'} +
load('share/env.yaml')
steps:
Expand Down
Loading
Loading