Merge pull request #462 from biojppm/fix/ci

Fix CI
biojppm · Aug 13, 2024 · 35fd478 · 35fd478
2 parents 38f616b + 36527c5
commit 35fd478
Show file tree

Hide file tree

Showing 13 changed files with 259 additions and 205 deletions.
diff --git a/.github/reqs.sh b/.github/reqs.sh
@@ -163,6 +163,8 @@ function c4_install_test_requirements_ubuntu_impl()
     fi
 
     if [ "$PIP_PKG" != "" ]; then
+        sudo pip3 install --force-reinstall importlib_metadata
+        sudo pip3 install --force-reinstall setuptools
         sudo pip3 install setuptools-rust
         sudo pip3 install --upgrade pip
         sudo pip3 install $PIP_PKG

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -85,7 +85,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/clang.yml b/.github/workflows/clang.yml
diff --git a/.github/workflows/clang_tidy.yml b/.github/workflows/clang_tidy.yml
@@ -31,23 +31,23 @@ jobs:
     continue-on-error: true
     if: always()  # https://stackoverflow.com/questions/62045967/github-actions-is-there-a-way-to-continue-on-error-while-still-getting-correct
     runs-on: ubuntu-latest
-    container: ghcr.io/biojppm/c4core/ubuntu18.04:latest  # use the docker image
+    container: ghcr.io/biojppm/c4core/ubuntu22.04:latest  # use the docker image
     strategy:
       fail-fast: false
       matrix:
         include:
           # clang tidy takes a long time, so don't do multiple bits/linktypes
-          - {std: 11, cxx: clang++-16, bt: Debug             , lint: clang-tidy, bitlinks: shared64}
-          - {std: 11, cxx: clang++-16, bt: Debug             , lint: clang-tidy, bitlinks: shared32}
-          - {std: 11, cxx: clang++-16, bt: Debug             , lint: clang-tidy, bitlinks: static64}
-          - {std: 11, cxx: clang++-16, bt: Debug             , lint: clang-tidy, bitlinks: static32}
-          - {std: 11, cxx: clang++-16, bt: ReleaseWithDebInfo, lint: clang-tidy, bitlinks: shared64}
-          - {std: 11, cxx: clang++-16, bt: ReleaseWithDebInfo, lint: clang-tidy, bitlinks: shared32}
-          - {std: 11, cxx: clang++-16, bt: ReleaseWithDebInfo, lint: clang-tidy, bitlinks: static64}
-          - {std: 11, cxx: clang++-16, bt: ReleaseWithDebInfo, lint: clang-tidy, bitlinks: static32}
+          - {std: 11, cxx: clang++-17, bt: Debug             , lint: clang-tidy, bitlinks: shared64}
+          - {std: 11, cxx: clang++-17, bt: Debug             , lint: clang-tidy, bitlinks: shared32}
+          - {std: 11, cxx: clang++-17, bt: Debug             , lint: clang-tidy, bitlinks: static64}
+          - {std: 11, cxx: clang++-17, bt: Debug             , lint: clang-tidy, bitlinks: static32}
+          - {std: 11, cxx: clang++-17, bt: ReleaseWithDebInfo, lint: clang-tidy, bitlinks: shared64}
+          - {std: 11, cxx: clang++-17, bt: ReleaseWithDebInfo, lint: clang-tidy, bitlinks: shared32}
+          - {std: 11, cxx: clang++-17, bt: ReleaseWithDebInfo, lint: clang-tidy, bitlinks: static64}
+          - {std: 11, cxx: clang++-17, bt: ReleaseWithDebInfo, lint: clang-tidy, bitlinks: static32}
     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}}
+      - {name: checkout, uses: actions/checkout@v4, with: {submodules: recursive}}
       - run: git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
       - run: c4core-install ${{matrix.cxx}}
       - {name: show info, run: source .github/setenv.sh && c4_show_info}

diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
@@ -27,10 +27,14 @@ jobs:
 
   #----------------------------------------------------------------------------
   emscripten:
-    if: |
-      (!contains(github.event.head_commit.message, 'skip all')) ||
-      (!contains(github.event.head_commit.message, 'skip emscripten')) ||
-      contains(github.event.head_commit.message, 'only emscripten')
+    # this job is always causing trouble, with failures showing unreadable code dumps
+    # eg https://github.com/biojppm/rapidyaml/actions/runs/10368522906
+    # Disabling until we can find a proper way to investigate these failures:
+    if: ${{ false }}
+    #if: |
+    #  (!contains(github.event.head_commit.message, 'skip all')) ||
+    #  (!contains(github.event.head_commit.message, 'skip emscripten')) ||
+    #  contains(github.event.head_commit.message, 'only emscripten')
     name: emscripten/${{matrix.emver}}/c++${{matrix.std}}/${{matrix.bt}}
     continue-on-error: true
     runs-on: ${{matrix.os}}