From 8c132e7d1520ee50e848e889405d7d8bd53076f7 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Fri, 21 Mar 2025 20:36:37 +0100 Subject: [PATCH 1/2] ci: only build on PRs --- .github/workflows/bazel-ci.yml | 2 +- .github/workflows/cmake-ci.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/linting.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bazel-ci.yml b/.github/workflows/bazel-ci.yml index 5b35a606..d805e497 100644 --- a/.github/workflows/bazel-ci.yml +++ b/.github/workflows/bazel-ci.yml @@ -1,5 +1,5 @@ name: Bazel CI -on: [push, pull_request] +on: [pull_request] jobs: build: diff --git a/.github/workflows/cmake-ci.yml b/.github/workflows/cmake-ci.yml index 14bc583c..17b85f4a 100644 --- a/.github/workflows/cmake-ci.yml +++ b/.github/workflows/cmake-ci.yml @@ -1,5 +1,5 @@ name: CMake CI -on: [push, pull_request] +on: [pull_request] jobs: build: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 7aaeaa02..05185304 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,5 +1,5 @@ name: Coverage -on: [push, pull_request] +on: [pull_request] jobs: build: diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index b21143e3..8a4dfe51 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -1,5 +1,5 @@ name: Linting -on: [push, pull_request] +on: [pull_request] jobs: iwyu: From 690ed6cebce2584bf2e645e55465fe82347d5844 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Fri, 21 Mar 2025 20:53:09 +0100 Subject: [PATCH 2/2] ci: modernize actions --- .github/workflows/cmake-ci.yml | 2 +- .github/workflows/coverage.yml | 6 +++--- .github/workflows/doxygen.yml | 6 +++--- .github/workflows/linting.yml | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cmake-ci.yml b/.github/workflows/cmake-ci.yml index 17b85f4a..d8976fd5 100644 --- a/.github/workflows/cmake-ci.yml +++ b/.github/workflows/cmake-ci.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, ubuntu-20.04, windows-2019] + os: [macos-13, ubuntu-22.04, windows-2019] dependencies: [submodule, vcpkg] steps: - name: Checkout source diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 05185304..b273c509 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: build: name: Code Coverage - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout source uses: actions/checkout@v4 @@ -54,7 +54,7 @@ jobs: run: lcov --capture --directory "${{ github.workspace }}/_build" --output-file coverage.info --no-external --directory "${{ github.workspace }}" --exclude '*/tests/*' - name: Coveralls - uses: coverallsapp/github-action@master + uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: coverage.info + files: coverage.info diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml index 966b6664..95c78715 100644 --- a/.github/workflows/doxygen.yml +++ b/.github/workflows/doxygen.yml @@ -6,8 +6,8 @@ on: jobs: build: - name: Code Coverage - runs-on: ubuntu-20.04 + name: Documentation + runs-on: ubuntu-24.04 steps: - name: Checkout source uses: actions/checkout@v4 @@ -23,7 +23,7 @@ jobs: working-directory: "${{ github.workspace }}/doc" - name: Deploy documentation - uses: peaceiris/actions-gh-pages@v3 + uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} force_orphan: true diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 8a4dfe51..ce88357f 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -11,7 +11,7 @@ jobs: - name: Install dependencies run: | apt-get update - apt-get install -y --no-install-recommends ca-certificates clang-14 cmake git iwyu libbenchmark-dev libcurl4-openssl-dev ninja-build zlib1g-dev + apt-get install -y --no-install-recommends ca-certificates clang-19 cmake git iwyu libbenchmark-dev libcurl4-openssl-dev ninja-build zlib1g-dev - name: Checkout source uses: actions/checkout@v4 @@ -19,7 +19,7 @@ jobs: submodules: true - name: "CMake Configure" - run: cmake -GNinja -DRUN_IWYU=ON -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -S ${GITHUB_WORKSPACE} -B ${GITHUB_WORKSPACE}/_build + run: cmake -GNinja -DRUN_IWYU=ON -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -S ${GITHUB_WORKSPACE} -B ${GITHUB_WORKSPACE}/_build - name: Build run: cmake --build ${GITHUB_WORKSPACE}/_build 2>&1 | tee ${GITHUB_WORKSPACE}/output.txt @@ -35,13 +35,13 @@ jobs: format: name: Clang Format - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout source uses: actions/checkout@v4 # clang-format comes pre-installed - # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md + # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md - name: Run clang-format run: find . -type f \( -name '*.c' -o -name '*.cc' -o -name '*.cpp' -o -name '*.cxx' -o -name '*.o' -o -name '*.h' -o -name '*.hpp' -o -name '*.hxx' \) -exec clang-format-15 -style=file -i {} \;