Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #462

Merged
merged 2 commits into from
Aug 13, 2024
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
2 changes: 2 additions & 0 deletions .github/reqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
169 changes: 91 additions & 78 deletions .github/workflows/clang.yml

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions .github/workflows/clang_tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
Loading
Loading