From f890111314276d18a07dcc459c35259da374a9f6 Mon Sep 17 00:00:00 2001 From: Joao Paulo Magalhaes Date: Sun, 30 Jun 2024 18:23:26 +0100 Subject: [PATCH 1/5] bm plot: bokeh 3 should use fixed numpy --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 675073e..08b1e26 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 675073e8739fc2a59c886188818923baa003c974 +Subproject commit 08b1e26dbe7346ce3c7aeafe350d0962ae86a278 From 8c8e5c212f3344fca052cc53ea3c98391bf526a2 Mon Sep 17 00:00:00 2001 From: Joao Paulo Magalhaes Date: Sun, 30 Jun 2024 18:50:49 +0100 Subject: [PATCH 2/5] docker: update images --- .github/docker/build_and_push.sh | 8 +++++-- .github/docker/ubuntu18.04/Dockerfile | 2 +- .github/docker/ubuntu18.04/c4core-install | 28 +++++++++++++++++++++++ .github/docker/ubuntu22.04/Dockerfile | 2 +- .github/docker/ubuntu22.04/c4core-install | 27 ++++++++++++++++++++++ 5 files changed, 63 insertions(+), 4 deletions(-) diff --git a/.github/docker/build_and_push.sh b/.github/docker/build_and_push.sh index 343dfd8..2842bf0 100755 --- a/.github/docker/build_and_push.sh +++ b/.github/docker/build_and_push.sh @@ -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, # @@ -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." diff --git a/.github/docker/ubuntu18.04/Dockerfile b/.github/docker/ubuntu18.04/Dockerfile index 161df1c..3a56fe4 100644 --- a/.github/docker/ubuntu18.04/Dockerfile +++ b/.github/docker/ubuntu18.04/Dockerfile @@ -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 \ diff --git a/.github/docker/ubuntu18.04/c4core-install b/.github/docker/ubuntu18.04/c4core-install index d4221a4..67ff18a 100755 --- a/.github/docker/ubuntu18.04/c4core-install +++ b/.github/docker/ubuntu18.04/c4core-install @@ -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 @@ -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 \ @@ -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 diff --git a/.github/docker/ubuntu22.04/Dockerfile b/.github/docker/ubuntu22.04/Dockerfile index 32db494..ce35d07 100644 --- a/.github/docker/ubuntu22.04/Dockerfile +++ b/.github/docker/ubuntu22.04/Dockerfile @@ -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 \ diff --git a/.github/docker/ubuntu22.04/c4core-install b/.github/docker/ubuntu22.04/c4core-install index 9de0f48..c6c276a 100755 --- a/.github/docker/ubuntu22.04/c4core-install +++ b/.github/docker/ubuntu22.04/c4core-install @@ -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 @@ -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 \ @@ -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 From 3b204c904ee0e33a0b8394d1a9f76895df29eb4b Mon Sep 17 00:00:00 2001 From: Joao Paulo Magalhaes Date: Sun, 30 Jun 2024 19:01:42 +0100 Subject: [PATCH 3/5] ci: macos-11 image was deprecated --- .github/workflows/benchmarks.yml | 2 +- .github/workflows/macosx.yml | 21 ++++++++------------- .github/workflows/release.yml | 2 +- .github/workflows/test_install.yml | 24 ++++++++++++------------ src/c4/error.cpp | 1 + 5 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index acc7dd6..da97252 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -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 diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index daefdbe..67dd702 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -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}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f5a138..909bf83 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml index 8b00044..ea112cc 100644 --- a/.github/workflows/test_install.yml +++ b/.github/workflows/test_install.yml @@ -44,10 +44,10 @@ jobs: - {name: find_package/linux/libcxx/Debug , sdir: test/test_install , os: ubuntu-20.04, cxx: clang++-9, gen: "-DCMAKE_CXX_COMPILER=clang++-9" , tgt: all , bt: Debug , vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: "-DC4CORE_USE_LIBCXX=ON"} - {name: find_package/linux/libcxx/RelNoExc,sdir: test/test_install , os: ubuntu-20.04, cxx: clang++-9, gen: "-DCMAKE_CXX_COMPILER=clang++-9 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: all , bt: Release, vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: "-DC4CORE_USE_LIBCXX=ON"} - {name: find_package/linux/libcxx/DbgNoExc,sdir: test/test_install , os: ubuntu-20.04, cxx: clang++-9, gen: "-DCMAKE_CXX_COMPILER=clang++-9 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: all , bt: Debug , vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: "-DC4CORE_USE_LIBCXX=ON"} - - {name: find_package/macos/Release , sdir: test/test_install , os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Release, vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } - - {name: find_package/macos/Debug , sdir: test/test_install , os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Debug , vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } - - {name: find_package/macos/RelNoExc , sdir: test/test_install , os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Release, vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } - - {name: find_package/macos/DbgNoExc , sdir: test/test_install , os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Debug , vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } + - {name: find_package/macos/Release , sdir: test/test_install , os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Release, vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } + - {name: find_package/macos/Debug , sdir: test/test_install , os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Debug , vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } + - {name: find_package/macos/RelNoExc , sdir: test/test_install , os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Release, vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } + - {name: find_package/macos/DbgNoExc , sdir: test/test_install , os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Debug , vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/c4core -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } - {name: find_package/win/Release , sdir: test/test_install , os: windows-2019, cxx: vs2019 , gen: "-G 'Visual Studio 16 2019' -A x64" , tgt: ALL_BUILD, bt: Release, vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } - {name: find_package/win/Debug , sdir: test/test_install , os: windows-2019, cxx: vs2019 , gen: "-G 'Visual Studio 16 2019' -A x64" , tgt: ALL_BUILD, bt: Debug , vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } - {name: find_package/win/RelNoExc , sdir: test/test_install , os: windows-2019, cxx: vs2019 , gen: "-G 'Visual Studio 16 2019' -A x64 -DCMAKE_CXX_FLAGS=' /EHa- /EHs- /EHc /EHr- /GR- /wd4530'", tgt: ALL_BUILD, bt: Release, vars: "-Dc4core_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DC4CORE_TEST_INSTALL_PACKAGE_MODE=ON", commonvars: } @@ -61,10 +61,10 @@ jobs: - {name: find_library/linux/libcxx/Debug , sdir: test/test_install , os: ubuntu-20.04, cxx: clang++-9, gen: "-DCMAKE_CXX_COMPILER=clang++-9" , tgt: all , bt: Debug , vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: "-DC4CORE_USE_LIBCXX=ON"} - {name: find_library/linux/libcxx/RelNoExc,sdir: test/test_install , os: ubuntu-20.04, cxx: clang++-9, gen: "-DCMAKE_CXX_COMPILER=clang++-9 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: all , bt: Release, vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: "-DC4CORE_USE_LIBCXX=ON"} - {name: find_library/linux/libcxx/DbgNoExc,sdir: test/test_install , os: ubuntu-20.04, cxx: clang++-9, gen: "-DCMAKE_CXX_COMPILER=clang++-9 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: all , bt: Debug , vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: "-DC4CORE_USE_LIBCXX=ON"} - - {name: find_library/macos/Release , sdir: test/test_install , os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Release, vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } - - {name: find_library/macos/Debug , sdir: test/test_install , os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Debug , vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } - - {name: find_library/macos/RelNoExc , sdir: test/test_install , os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Release, vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } - - {name: find_library/macos/DbgNoExc , sdir: test/test_install , os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Debug , vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } + - {name: find_library/macos/Release , sdir: test/test_install , os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Release, vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } + - {name: find_library/macos/Debug , sdir: test/test_install , os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Debug , vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } + - {name: find_library/macos/RelNoExc , sdir: test/test_install , os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Release, vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } + - {name: find_library/macos/DbgNoExc , sdir: test/test_install , os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Debug , vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } - {name: find_library/win/Release , sdir: test/test_install , os: windows-2019, cxx: vs2019 , gen: "-G 'Visual Studio 16 2019' -A x64" , tgt: ALL_BUILD, bt: Release, vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } - {name: find_library/win/Debug , sdir: test/test_install , os: windows-2019, cxx: vs2019 , gen: "-G 'Visual Studio 16 2019' -A x64" , tgt: ALL_BUILD, bt: Debug , vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } - {name: find_library/win/RelNoExc , sdir: test/test_install , os: windows-2019, cxx: vs2019 , gen: "-G 'Visual Studio 16 2019' -A x64 -DCMAKE_CXX_FLAGS=' /EHa- /EHs- /EHc /EHr- /GR- /wd4530'", tgt: ALL_BUILD, bt: Release, vars: "-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DC4CORE_TEST_INSTALL_PACKAGE_MODE=OFF", commonvars: } @@ -78,10 +78,10 @@ jobs: - {name: singleheader/linux/libcxx/Debug , sdir: test/test_singleheader, os: ubuntu-20.04, cxx: clang++-9, gen: "-DCMAKE_CXX_COMPILER=clang++-9" , tgt: all , bt: Debug , vars: , commonvars: "-DC4CORE_USE_LIBCXX=ON"} - {name: singleheader/linux/libcxx/RelNoExc,sdir: test/test_singleheader, os: ubuntu-20.04, cxx: clang++-9, gen: "-DCMAKE_CXX_COMPILER=clang++-9 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: all , bt: Release, vars: , commonvars: "-DC4CORE_USE_LIBCXX=ON"} - {name: singleheader/linux/libcxx/DbgNoExc,sdir: test/test_singleheader, os: ubuntu-20.04, cxx: clang++-9, gen: "-DCMAKE_CXX_COMPILER=clang++-9 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: all , bt: Debug , vars: , commonvars: "-DC4CORE_USE_LIBCXX=ON"} - - {name: singleheader/macos/Release , sdir: test/test_singleheader, os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Release, vars: , commonvars: } - - {name: singleheader/macos/Debug , sdir: test/test_singleheader, os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Debug , vars: , commonvars: } - - {name: singleheader/macos/RelNoExc , sdir: test/test_singleheader, os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Release, vars: , commonvars: } - - {name: singleheader/macos/DbgNoExc , sdir: test/test_singleheader, os: macos-11.0 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Debug , vars: , commonvars: } + - {name: singleheader/macos/Release , sdir: test/test_singleheader, os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Release, vars: , commonvars: } + - {name: singleheader/macos/Debug , sdir: test/test_singleheader, os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64" , tgt: ALL_BUILD, bt: Debug , vars: , commonvars: } + - {name: singleheader/macos/RelNoExc , sdir: test/test_singleheader, os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Release, vars: , commonvars: } + - {name: singleheader/macos/DbgNoExc , sdir: test/test_singleheader, os: macos-13 , cxx: xcode , gen: "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_CXX_FLAGS='-fno-exceptions -fno-rtti'" , tgt: ALL_BUILD, bt: Debug , vars: , commonvars: } - {name: singleheader/win/Release , sdir: test/test_singleheader, os: windows-2019, cxx: vs2019 , gen: "-G 'Visual Studio 16 2019' -A x64" , tgt: ALL_BUILD, bt: Release, vars: , commonvars: } - {name: singleheader/win/Debug , sdir: test/test_singleheader, os: windows-2019, cxx: vs2019 , gen: "-G 'Visual Studio 16 2019' -A x64" , tgt: ALL_BUILD, bt: Debug , vars: , commonvars: } - {name: singleheader/win/RelNoExc , sdir: test/test_singleheader, os: windows-2019, cxx: vs2019 , gen: "-G 'Visual Studio 16 2019' -A x64 -DCMAKE_CXX_FLAGS=' /EHa- /EHs- /EHc /EHr- /GR- /wd4530'", tgt: ALL_BUILD, bt: Release, vars: , commonvars: } diff --git a/src/c4/error.cpp b/src/c4/error.cpp index c8e3b7a..de28fd8 100644 --- a/src/c4/error.cpp +++ b/src/c4/error.cpp @@ -216,6 +216,7 @@ bool is_debugger_attached() size = sizeof(info); junk = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0); assert(junk == 0); + (void)junk; // We're being debugged if the P_TRACED flag is set. return ((info.kp_proc.p_flag & P_TRACED) != 0); From eb6e52d2372267184665767e29397ef7c9c56af5 Mon Sep 17 00:00:00 2001 From: Joao Paulo Magalhaes Date: Sun, 30 Jun 2024 19:26:51 +0100 Subject: [PATCH 4/5] ci: update emscripten version --- .github/workflows/emscripten.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 965db22..a92382f 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -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}}" From 97f0434cbc864ab957e1e017c5d84cec41f447d0 Mon Sep 17 00:00:00 2001 From: Joao Paulo Magalhaes Date: Sun, 30 Jun 2024 22:32:29 +0100 Subject: [PATCH 5/5] use gcc 14 for sanitizers --- .github/workflows/gcc.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 90b3fec..b4d17ec 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -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}}