From 5da7649992a7a788c76a33ac583c238ed984ef42 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Mon, 16 Dec 2024 18:00:27 +0100 Subject: [PATCH 1/3] Fix CI on ubuntu-latest --- .github/workflows/ci.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2cb354d5db..7f1effe7da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,15 +49,15 @@ jobs: submodules: 'recursive' - name: setup env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 run: | sudo -E ./ci/setup_googletest.sh sudo -E ./ci/setup_ci_environment.sh - name: run cmake tests (without otlp-exporter) env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 run: | ./ci/do_ci.sh cmake.test @@ -263,15 +263,15 @@ jobs: submodules: 'recursive' - name: setup env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 run: | sudo -E ./ci/setup_googletest.sh sudo -E ./ci/setup_ci_environment.sh - name: run cmake tests (without otlp-exporter) env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 run: | ./ci/do_ci.sh cmake.with_async_export.test @@ -538,15 +538,15 @@ jobs: submodules: 'recursive' - name: setup env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 run: | sudo -E ./ci/setup_googletest.sh sudo -E ./ci/setup_ci_environment.sh - name: run tests env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 run: ./ci/do_ci.sh cmake.test_example_plugin bazel_test: @@ -865,15 +865,15 @@ jobs: submodules: 'recursive' - name: setup env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 run: | sudo -E ./ci/setup_googletest.sh sudo -E ./ci/setup_ci_environment.sh - name: run tests and generate report env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 run: ./ci/do_ci.sh code.coverage - name: upload report uses: codecov/codecov-action@v5 @@ -936,8 +936,8 @@ jobs: submodules: 'recursive' - name: setup env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 run: | sudo -E ./ci/setup_googletest.sh sudo -E ./ci/setup_ci_environment.sh From 47ed55f4e246bef5862ef4f33268e1976a69727e Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Mon, 16 Dec 2024 18:21:54 +0100 Subject: [PATCH 2/3] cleanup --- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f1effe7da..0fc590c738 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -359,7 +359,7 @@ jobs: cmake_test_cxx20_clang: name: CMake C++20 test(Clang with libc++) - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: @@ -409,7 +409,7 @@ jobs: cmake_test_cxx23_clang: name: CMake C++23 test(Clang with libc++) - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 05acb56180..ebf367e4aa 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -20,8 +20,8 @@ jobs: rm -rf third_party - name: Setup env: - CC: /usr/bin/gcc-10 - CXX: /usr/bin/g++-10 + CC: /usr/bin/gcc-12 + CXX: /usr/bin/g++-12 GOOGLETEST_VERSION: 1.12.1 run: | sudo -E ./ci/setup_googletest.sh From 60c79e2781ac6894cfeba8a997e843a0243c95b1 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Mon, 16 Dec 2024 18:43:52 +0100 Subject: [PATCH 3/3] build cleanup --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/iwyu.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fc590c738..efc01e2a00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -858,22 +858,22 @@ jobs: code_coverage: name: Code coverage - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: submodules: 'recursive' - name: setup env: - CC: /usr/bin/gcc-12 - CXX: /usr/bin/g++-12 + CC: /usr/bin/gcc-10 + CXX: /usr/bin/g++-10 run: | sudo -E ./ci/setup_googletest.sh sudo -E ./ci/setup_ci_environment.sh - name: run tests and generate report env: - CC: /usr/bin/gcc-12 - CXX: /usr/bin/g++-12 + CC: /usr/bin/gcc-10 + CXX: /usr/bin/g++-10 run: ./ci/do_ci.sh code.coverage - name: upload report uses: codecov/codecov-action@v5 diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 573af3a803..ae4c5fb96b 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -67,7 +67,7 @@ jobs: readonly WARNING_COUNT=`grep -c "include-what-you-use reported diagnostics:" iwyu.log` echo "include-what-you-use reported ${WARNING_COUNT} warning(s)" # Acceptable limit, to decrease over time down to 0 - readonly WARNING_LIMIT=10 + readonly WARNING_LIMIT=180 # FAIL the build if WARNING_COUNT > WARNING_LIMIT if [ $WARNING_COUNT -gt $WARNING_LIMIT ] ; then exit 1