Skip to content

Commit

Permalink
Merge pull request #140 from biojppm/fix/ci
Browse files Browse the repository at this point in the history
Fix ci
  • Loading branch information
biojppm committed Jul 1, 2024
2 parents f4da688 + 97f0434 commit dde49da
Show file tree
Hide file tree
Showing 13 changed files with 109 additions and 54 deletions.
8 changes: 6 additions & 2 deletions .github/docker/build_and_push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

set -o pipefail

# https://stackoverflow.com/questions/44785585/how-can-i-delete-all-local-docker-images
# To run an image:
#
# docker run -it --network host -v ~/proj/rapidyaml:/rapidyaml --name c4core_ubuntu22 ghcr.io/biojppm/c4core/ubuntu22.04:latest /bin/bash
#
# To delete all containers including its volumes use,
#
Expand All @@ -13,7 +15,9 @@ set -o pipefail
# docker rmi -f $(docker images -aq)
#
# Remember, you should remove all the containers before removing all
# the images from which those containers were created.
# the images from which those containers were created. See
# https://stackoverflow.com/questions/44785585/how-can-i-delete-all-local-docker-images


if [ -z "$CR_USR" ] ; then
echo "error: \$CR_USR is not defined. Set it to a user name."
Expand Down
2 changes: 1 addition & 1 deletion .github/docker/ubuntu18.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source=https://github.com/biojppm/c4core
LABEL org.opencontainers.image.description="C++ build testing: gcc4.8-gcc11, clang3.9-clang16, arm-eabi-none, swig"
LABEL org.opencontainers.image.licenses=MIT
LABEL maintainer=dev@jpmag.me
LABEL version=1.1
LABEL version=1.2
SHELL ["/bin/bash", "-c"]

RUN apt-get update \
Expand Down
28 changes: 28 additions & 0 deletions .github/docker/ubuntu18.04/c4core-install
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ case $what in
$script gcc-11
#$script gcc-12 #not available in ubuntu 18.04
$script gcc-13
$script gcc-14
;;
clang-all)
$script clang-17
$script clang-16
$script clang-15
$script clang-14
Expand Down Expand Up @@ -143,6 +145,20 @@ case $what in
apt-get install -y \
cpp-13 gcc-13 g++-13 g++-13-multilib libstdc++-13-dev lib32stdc++-13-dev
;;
g++-14|gcc-14)
apt-get update
apt-get install -y \
wget \
software-properties-common
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6AF7F09730B3F0A4
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6AF7F09730B3F0A4
apt-add-repository --yes --no-update "deb http://dk.archive.ubuntu.com/ubuntu/ noble main"
apt-add-repository --yes --no-update "deb http://dk.archive.ubuntu.com/ubuntu/ noble universe"
apt-get update
apt-get install -y \
cpp-14 gcc-14 g++-14 g++-14-multilib libstdc++-14-dev lib32stdc++-14-dev
;;
clang++-3.9|clang-3.9)
apt-get update
apt-get install -y \
Expand Down Expand Up @@ -274,6 +290,18 @@ case $what in
apt-get install -y \
clang-16 clang-tidy-16
;;
clang++-17|clang-17)
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-17 main"
apt-get update
apt-get install -y \
clang-17 clang-tidy-17
;;
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
2 changes: 1 addition & 1 deletion .github/docker/ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source=https://github.com/biojppm/c4core
LABEL org.opencontainers.image.description="C++ build testing: gcc9-gcc12, clang9-clang16, arm-eabi-none, swig, emscripten"
LABEL org.opencontainers.image.licenses=MIT
LABEL maintainer=dev@jpmag.me
LABEL version=1.0
LABEL version=1.2
SHELL ["/bin/bash", "-c"]

RUN apt-get update \
Expand Down
27 changes: 27 additions & 0 deletions .github/docker/ubuntu22.04/c4core-install
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ case $what in
$script gcc-11
$script gcc-12
$script gcc-13
$script gcc-14
;;
clang-all)
$script clang-17
$script clang-16
$script clang-15
$script clang-14
Expand Down Expand Up @@ -127,6 +129,19 @@ case $what in
apt-get install -y \
cpp-13 gcc-13 g++-13 g++-13-multilib libstdc++-13-dev lib32stdc++-13-dev
;;
g++-14|gcc-14)
apt-get update
apt-get install -y \
wget \
software-properties-common
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6AF7F09730B3F0A4
apt-add-repository --yes --no-update "deb http://dk.archive.ubuntu.com/ubuntu/ noble main"
apt-add-repository --yes --no-update "deb http://dk.archive.ubuntu.com/ubuntu/ noble universe"
apt-get update
apt-get install -y \
cpp-14 gcc-14 g++-14 g++-14-multilib libstdc++-14-dev lib32stdc++-14-dev
;;
#clang++-3.9|clang-3.9)
# apt-get update
# apt-get install -y \
Expand Down Expand Up @@ -234,6 +249,18 @@ case $what in
apt-get install -y \
clang-16 clang-tidy-16
;;
clang++-17|clang-17)
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-17 main"
apt-get update
apt-get install -y \
clang-17 clang-tidy-17
;;
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
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- {std: 17, cxx: vs2022, bt: Release, os: windows-2022, bitlinks: static64 static32}
- {std: 20, cxx: vs2022, bt: Release, os: windows-2022, bitlinks: static64 static32}
#
- {std: 17, cxx: xcode, xcver: 13, bt: Release, os: macos-11, bitlinks: static64}
- {std: 17, cxx: xcode, xcver: 15, bt: Release, os: macos-13, bitlinks: static64}
env: {BM: ON, 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:
# use fetch-depth to ensure all tags are fetched
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ jobs:
matrix:
include:
#- {std: 11, cxx: em++, emver: 2.0.34, bt: Debug , os: ubuntu-latest, bitlinks: static32}
- {std: 11, cxx: em++, emver: 2.0.34, bt: Release, os: ubuntu-latest, bitlinks: static32}
#- {std: 11, cxx: em++, emver: 2.0.34, bt: Release, os: ubuntu-latest, bitlinks: static32}
#- {std: 20, cxx: em++, emver: 2.0.34, bt: Debug , os: ubuntu-latest, bitlinks: static32}
- {std: 20, cxx: em++, emver: 2.0.34, bt: Release, os: ubuntu-latest, bitlinks: static32}
#- {std: 11, cxx: em++, emver: 3.0.0 , bt: Debug , os: ubuntu-latest, bitlinks: static32}
- {std: 11, cxx: em++, emver: 3.0.0 , bt: Release, os: ubuntu-latest, bitlinks: static32}
#- {std: 20, cxx: em++, emver: 3.0.0 , bt: Debug , os: ubuntu-latest, bitlinks: static32}
- {std: 20, cxx: em++, emver: 3.0.0 , bt: Release, os: ubuntu-latest, bitlinks: static32}
#- {std: 20, cxx: em++, emver: 2.0.34, bt: Release, os: ubuntu-latest, bitlinks: static32}
#- {std: 11, cxx: em++, emver: 3.1.61 , bt: Debug , os: ubuntu-latest, bitlinks: static32}
- {std: 11, cxx: em++, emver: 3.1.61 , bt: Release, os: ubuntu-latest, bitlinks: static32}
#- {std: 20, cxx: em++, emver: 3.1.61 , bt: Debug , os: ubuntu-latest, bitlinks: static32}
- {std: 20, cxx: em++, emver: 3.1.61 , bt: Release, os: ubuntu-latest, bitlinks: static32}
env:
STD: "${{matrix.std}}"
CXX_: "${{matrix.cxx}}"
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,22 +191,22 @@ jobs:
fail-fast: false
matrix:
include:
- {std: 11, cxx: g++-12, bt: asan, bitlinks: static64}
- {std: 14, cxx: g++-12, bt: asan, bitlinks: static64}
- {std: 17, cxx: g++-12, bt: asan, bitlinks: static64}
- {std: 20, cxx: g++-12, bt: asan, bitlinks: static64}
- {std: 11, cxx: g++-12, bt: lsan, bitlinks: static64}
- {std: 14, cxx: g++-12, bt: lsan, bitlinks: static64}
- {std: 17, cxx: g++-12, bt: lsan, bitlinks: static64}
- {std: 20, cxx: g++-12, bt: lsan, bitlinks: static64}
- {std: 11, cxx: g++-12, bt: tsan, bitlinks: static64}
- {std: 14, cxx: g++-12, bt: tsan, bitlinks: static64}
- {std: 17, cxx: g++-12, bt: tsan, bitlinks: static64}
- {std: 20, cxx: g++-12, bt: tsan, bitlinks: static64}
- {std: 11, cxx: g++-12, bt: ubsan, bitlinks: static64}
- {std: 14, cxx: g++-12, bt: ubsan, bitlinks: static64}
- {std: 17, cxx: g++-12, bt: ubsan, bitlinks: static64}
- {std: 20, cxx: g++-12, bt: ubsan, bitlinks: static64}
- {std: 11, cxx: g++-14, bt: asan, bitlinks: static64}
- {std: 14, cxx: g++-14, bt: asan, bitlinks: static64}
- {std: 17, cxx: g++-14, bt: asan, bitlinks: static64}
- {std: 20, cxx: g++-14, bt: asan, bitlinks: static64}
- {std: 11, cxx: g++-14, bt: lsan, bitlinks: static64}
- {std: 14, cxx: g++-14, bt: lsan, bitlinks: static64}
- {std: 17, cxx: g++-14, bt: lsan, bitlinks: static64}
- {std: 20, cxx: g++-14, bt: lsan, bitlinks: static64}
- {std: 11, cxx: g++-14, bt: tsan, bitlinks: static64}
- {std: 14, cxx: g++-14, bt: tsan, bitlinks: static64}
- {std: 17, cxx: g++-14, bt: tsan, bitlinks: static64}
- {std: 20, cxx: g++-14, bt: tsan, bitlinks: static64}
- {std: 11, cxx: g++-14, bt: ubsan, bitlinks: static64}
- {std: 14, cxx: g++-14, bt: ubsan, bitlinks: static64}
- {std: 17, cxx: g++-14, bt: ubsan, bitlinks: static64}
- {std: 20, cxx: g++-14, bt: ubsan, bitlinks: static64}
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@v3, with: {submodules: recursive}}
Expand Down
21 changes: 8 additions & 13 deletions .github/workflows/macosx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,15 @@ jobs:
fail-fast: false
matrix:
include:
- {std: 11, cxx: xcode, xcver: 13, bt: Debug , os: macos-11, bitlinks: shared64 static64}
- {std: 11, cxx: xcode, xcver: 13, bt: Release, os: macos-11, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 13, bt: Debug , os: macos-11, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 13, bt: Release, os: macos-11, bitlinks: shared64 static64}
- {std: 11, cxx: xcode, xcver: 15, bt: Debug , os: macos-13, bitlinks: shared64 static64}
- {std: 11, cxx: xcode, xcver: 15, bt: Release, os: macos-13, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 15, bt: Debug , os: macos-13, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 15, bt: Release, os: macos-13, bitlinks: shared64 static64}
#
- {std: 11, cxx: xcode, xcver: 12, bt: Debug , os: macos-11, bitlinks: shared64 static64}
- {std: 11, cxx: xcode, xcver: 12, bt: Release, os: macos-11, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 12, bt: Debug , os: macos-11, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 12, bt: Release, os: macos-11, bitlinks: shared64 static64}
#
- {std: 11, cxx: xcode, xcver: 11, bt: Debug , os: macos-11, bitlinks: shared64 static64}
- {std: 11, cxx: xcode, xcver: 11, bt: Release, os: macos-11, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 11, bt: Debug , os: macos-11, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 11, bt: Release, os: macos-11, bitlinks: shared64 static64}
- {std: 11, cxx: xcode, xcver: 14, bt: Debug , os: macos-13, bitlinks: shared64 static64}
- {std: 11, cxx: xcode, xcver: 14, bt: Release, os: macos-13, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 14, bt: Debug , os: macos-13, bitlinks: shared64 static64}
- {std: 17, cxx: xcode, xcver: 14, bt: Release, os: macos-13, bitlinks: shared64 static64}
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@v3, with: {submodules: recursive}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
# name of the artifact | suffix (gen) | suffix (package) | cpack gen | mime type | os | cxx
- {name: Ubuntu 20.04 deb , sfxg: unix64-shared-Release.deb, sfxp: ubuntu-20.04.deb , gen: DEB , mime: vnd.debian.binary-package, os: ubuntu-20.04 }
- {name: Windows VS2019 zip, sfxg: win64-shared-Release.zip , sfxp: windows-vs2019.zip , gen: ZIP , mime: zip , os: windows-2019, cxx: vs2019}
- {name: MacOSX sh , sfxg: apple64-shared-Release.sh, sfxp: macosx-xcode.sh , gen: STGZ , mime: x-sh , os: macos-11.0 , cxx: xcode }
- {name: MacOSX sh , sfxg: apple64-shared-Release.sh, sfxp: macosx-xcode.sh , gen: STGZ , mime: x-sh , os: macos-13 , cxx: xcode }
steps:
- {name: checkout, uses: actions/checkout@v3, with: {submodules: recursive}}
- name: Download vars.sh
Expand Down
Loading

0 comments on commit dde49da

Please sign in to comment.