wip

biojppm · Feb 6, 2025 · b18e253 · b18e253
1 parent a692c01
commit b18e253
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 257 deletions.
diff --git a/.github/workflows-in/arch.ys b/.github/workflows-in/arch.ys
@@ -17,7 +17,7 @@ jobs:
           - {arch: armv6      , tc: arm-linux-gnueabi, flags: -march=armv6+fp}
           - {arch: armv5      , tc: arm-linux-gnueabi, flags: -march=armv5te+fp}
           - {arch: armv4      , tc: arm-linux-gnueabi, flags: -march=armv4}
-          - {arch: loongarch64, tc: 14-loongarch64-linux-gnu}
+          - {arch: loongarch64, tc: loongarch64-linux-gnu, version: 14-}
           - {arch: mips       , tc: mips-linux-gnu}
           - {arch: mipsel     , tc: mipsel-linux-gnu}
           - {arch: mips64     , tc: mips64-linux-gnuabi64}
@@ -35,14 +35,14 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y \
-            gcc-${{matrix.tc}} \
-            g++-${{matrix.tc}} \
+            gcc-${{matrix.version}}${{matrix.tc}} \
+            g++-${{matrix.version}}${{matrix.tc}} \
             qemu-user-static
     - name: info
       run: |
-        ${{matrix.tc}}-g++ --version
-        ${{matrix.tc}}-g++ -dM -E - </dev/null | sort
-        ${{matrix.tc}}-g++ ${{matrix.flags}} -dM -E - </dev/null | sort
+        ${{matrix.tc}}-${{matrix.version}}g++ --version
+        ${{matrix.tc}}-${{matrix.version}}g++ -dM -E - </dev/null | sort
+        ${{matrix.tc}}-${{matrix.version}}g++ ${{matrix.flags}} -dM -E - </dev/null | sort
     - :: xcompile-steps("${{matrix.arch}}" "Debug"   "11" "${{matrix.flags}}")
     - :: xcompile-steps("${{matrix.arch}}" "Release" "11" "${{matrix.flags}}")
     - :: xcompile-steps("${{matrix.arch}}" "Debug"   "20" "${{matrix.flags}}")

diff --git a/.github/workflows-in/clang.ys b/.github/workflows-in/clang.ys
@@ -107,24 +107,24 @@ jobs:
   clangsan:
     :: setup-job('clang' 'clangsan')
     name: ${{matrix.bt}}/c++${{matrix.std}}
-    :: runs-on-docker-c4core('${{matrix.img}}')
+    :: runs-on-docker-c4core('22.04')
     strategy:
       fail-fast: false
       matrix:
         include:
-          - {std: 11, cxx: clang++-18, bt: asan , bitlinks: static64}
-          - {std: 20, cxx: clang++-18, bt: asan , bitlinks: static64}
-          - {std: 11, cxx: clang++-18, bt: lsan , bitlinks: static64}
-          - {std: 20, cxx: clang++-18, bt: lsan , bitlinks: static64}
-          - {std: 11, cxx: clang++-18, bt: tsan , bitlinks: static64}
-          - {std: 20, cxx: clang++-18, bt: tsan , bitlinks: static64}
-          - {std: 11, cxx: clang++-18, bt: ubsan, bitlinks: static64}
-          - {std: 20, cxx: clang++-18, bt: ubsan, bitlinks: static64}
+          - {std: 11, cxx: 18, bt: asan }
+          - {std: 20, cxx: 18, bt: asan }
+          - {std: 11, cxx: 18, bt: lsan }
+          - {std: 20, cxx: 18, bt: lsan }
+          - {std: 11, cxx: 18, bt: tsan }
+          - {std: 20, cxx: 18, bt: tsan }
+          - {std: 11, cxx: 18, bt: ubsan}
+          - {std: 20, cxx: 18, bt: ubsan}
     env:: load('share/env.yaml')
     steps:
       - :: checkout-action-docker
-      - run: c4core-install ${{matrix.cxx}}
-      - :: run-steps
+      - run: c4core-install clang++-${{matrix.cxx}}
+      - :: run-clang-manual-with-flags('${{matrix.bt}}' '-m64')
 
   #----------------------------------------------------------------------------
 #  # https://blog.kitware.com/static-checks-with-cmake-cdash-iwyu-clang-tidy-lwyu-cpplint-and-cppcheck/

diff --git a/.github/workflows-in/release.ys b/.github/workflows-in/release.ys
@@ -55,12 +55,12 @@ jobs:
   cpp:
     name: cpp/${{matrix.config.os}}/${{matrix.config.gen}}
     needs: gettag
-    runs-on: ${{matrix.config.os}}
-    env: {DEV: OFF, BT: Release, OS: "${{matrix.config.os}}", CXX_: "${{matrix.config.cxx}}", GEN: "${{matrix.config.gen}}"}
+    runs-on: ${{matrix.os}}
+    env: {DEV: OFF, BT: Release, OS: "${{matrix.os}}", CXX_: "${{matrix.cxx}}", GEN: "${{matrix.gen}}"}
     strategy:
       fail-fast: false
       matrix:
-        config:
+        include:
           #  name of the artifact    | suffix (gen)                   | suffix (package)         | cpack gen | mime type                      | os              | cxx
           - {name: Ubuntu 24.04 deb  , sfxg: unix64-shared-Release.deb, sfxp: ubuntu-24.04.deb   , gen: DEB  , mime: vnd.debian.binary-package, os: ubuntu-24.04             }
           - {name: Ubuntu 22.04 deb  , sfxg: unix64-shared-Release.deb, sfxp: ubuntu-22.04.deb   , gen: DEB  , mime: vnd.debian.binary-package, os: ubuntu-22.04             }
@@ -83,8 +83,8 @@ jobs:
           set -x
           source vars.sh
           mkdir -p assets
-          asset_src=`ls -1 ./build/shared64/${PROJ_PFX_TARGET}*-${{matrix.config.sfxg}}`
-          asset_dst=./assets/${PROJ_PKG_NAME}${SRC_VERSION}-${{matrix.config.sfxp}}
+          asset_src=`ls -1 ./build/shared64/${PROJ_PFX_TARGET}*-${{matrix.sfxg}}`
+          asset_dst=./assets/${PROJ_PKG_NAME}${SRC_VERSION}-${{matrix.sfxp}}
           [ ! -f $asset_src ] && exit 1
           cp -fav $asset_src $asset_dst
       - name: Save artifacts

diff --git a/.github/workflows-in/windows.ys b/.github/workflows-in/windows.ys
@@ -58,7 +58,7 @@ jobs:
           - {std: 20, cxx: vs2022, bt: Release, os: windows-2022, bitlinks: shared64 static32}
     # https://learn.microsoft.com/en-us/cpp/build/reference/eh-exception-handling-model?view=msvc-170
     # https://learn.microsoft.com/en-us/cpp/build/reference/gr-enable-run-time-type-information?view=msvc-170
-    env: {CXXFLAGS: "/EHa- /EHs- /EHc /EHr- /GR- /wd4530 /wd9002 /wd9025", STD: "${{matrix.std}}", CXX_: "${{matrix.cxx}}", BT: "${{matrix.bt}}", BITLINKS: "${{matrix.bitlinks}}", VG: "${{matrix.vg}}", SAN: "${{matrix.san}}", LINT: "${{matrix.lint}}", OS: "${{matrix.os}}"}
+    env: {CXXFLAGS: "/EHa- /EHs- /EHc /EHr- /GR- /wd4530", 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:
       - :: checkout-action
       - {name: install requirements, run: source .github/reqs.sh && c4_install_test_requirements $OS}

diff --git a/.github/workflows-in/ys/common.ys b/.github/workflows-in/ys/common.ys
@@ -265,15 +265,15 @@ run-steps-arm =::
 #----------------------------------------------------------
 
 
-defn run-gcc-manual-with-flags(buildtype flags=""):
-  run-manual-with-flags('g++' 'gcc' buildtype flags)
+defn run-gcc-manual-with-flags(buildtype flags="" cmkflags=""):
+  run-manual-with-flags('g++' 'gcc' buildtype flags cmkflags)
 
 
-defn run-clang-manual-with-flags(buildtype flags=""):
-  run-manual-with-flags('clang++' 'clang' buildtype flags)
+defn run-clang-manual-with-flags(buildtype flags="" cmkflags=""):
+  run-manual-with-flags('clang++' 'clang' buildtype flags cmkflags)
 
 
-defn run-manual-with-flags(cxx cc buildtype flags="")::
+defn run-manual-with-flags(cxx cc buildtype flags="" cmkflags="")::
 # $(buildtype:uc)
 # also in that case you could $uc(buildtype)
 # $(<expr>) is the more general syntax for any expr
@@ -298,7 +298,8 @@ defn run-manual-with-flags(cxx cc buildtype flags="")::
       -DC4CORE_VALGRIND=${{matrix.vg}} \
       -DC4CORE_DEV=ON \
       -DC4CORE_BUILD_BENCHMARKS=OFF \
-      -DC4CORE_DBG=OFF
+      -DC4CORE_DBG=OFF \
+      $cmkflags
 - name:: "build $buildtype ::: $flags"
   run:: |
     cmake --build build/$buildtype --target c4core-test-build --parallel --verbose
@@ -307,7 +308,7 @@ defn run-manual-with-flags(cxx cc buildtype flags="")::
     cmake --build build/$buildtype --target c4core-test-run
 
 
-defn run-vs-manual-with-flags(gen arch buildtype shared flags="")::
+defn run-vs-manual-with-flags(gen arch buildtype shared flags="" cmkflags="")::
 - name:: "---------------------------------------------------------"
   run:: |
     echo "$buildtype ::: $flags shared=$shared"
@@ -329,7 +330,8 @@ defn run-vs-manual-with-flags(gen arch buildtype shared flags="")::
       -DC4CORE_BUILD_TESTS=ON \
       -DC4CORE_DEV=ON \
       -DC4CORE_BUILD_BENCHMARKS=OFF \
-      -DC4CORE_DBG=OFF
+      -DC4CORE_DBG=OFF \
+      $cmkflags
 - name:: "build $buildtype ::: $flags shared=$shared"
   run:: |
     cmake --build build/$buildtype --target c4core-test-build --parallel --verbose

diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml
@@ -43,7 +43,8 @@ jobs:
           tc: arm-linux-gnueabi
           flags: -march=armv4
         - arch: loongarch64
-          tc: 14-loongarch64-linux-gnu
+          tc: loongarch64-linux-gnu
+          version: 14-
         - arch: mips
           tc: mips-linux-gnu
         - arch: mipsel
@@ -74,14 +75,14 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y \
-            gcc-${{matrix.tc}} \
-            g++-${{matrix.tc}} \
+            gcc-${{matrix.version}}${{matrix.tc}} \
+            g++-${{matrix.version}}${{matrix.tc}} \
             qemu-user-static
     - name: info
       run: |
-        ${{matrix.tc}}-g++ --version
-        ${{matrix.tc}}-g++ -dM -E - </dev/null | sort
-        ${{matrix.tc}}-g++ ${{matrix.flags}} -dM -E - </dev/null | sort
+        ${{matrix.tc}}-${{matrix.version}}g++ --version
+        ${{matrix.tc}}-${{matrix.version}}g++ -dM -E - </dev/null | sort
+        ${{matrix.tc}}-${{matrix.version}}g++ ${{matrix.flags}} -dM -E - </dev/null | sort
     - name: '-------------------------------------------------'
       run: echo ${{matrix.arch}}/c++11/Debug
     - name: configure ${{matrix.arch}}/c++11/Debug