diff options
| author | Alexander Batischev <eual.jp@gmail.com> | 2024-04-20 21:12:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-20 21:12:54 +0300 |
| commit | 73d2ac286fa1907a5490f2e5b5cfba7ff758ab4e (patch) | |
| tree | 9aa93d1c6c89dd8586092542522b309ab8048d4e | |
| parent | 871339040e644d5b2f5eed351ce28d97f89e083f (diff) | |
| parent | 5807d872a368195385f878e7c64a25a8b6a38fb1 (diff) | |
Merge pull request #2731 from dennisschagt/update-testcoverage-build-dependencies
Update testcoverage build dependencies
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/coveralls.yaml | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 16896cb0..06298a27 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,7 +3,7 @@ freebsd_resource_settings: &freebsd_resource_settings memory: 8GB task: - skip: "changesIncludeOnly('contrib/*', 'contrib/**/*', 'doc/*', 'doc/**/*', 'docker/*', 'docker/**/*', 'po/*', 'po/**/*', 'snap/*', 'snap/**/*')" + skip: "changesIncludeOnly('contrib/*', 'contrib/**/*', 'doc/*', 'doc/**/*', 'docker/*', 'docker/**/*', '.github/**/*', 'po/*', 'po/**/*', 'snap/*', 'snap/**/*')" matrix: - name: FreeBSD 13.3 freebsd_instance: diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index be90a77f..770d6334 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -5,13 +5,13 @@ on: [push, pull_request] jobs: gen_coverage: name: Calculate test coverage - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: - # We use Rust Nightly, which builds upon LLVM 12. To ensure best + # We use Rust Nightly, which builds upon LLVM 18. To ensure best # compatibility, we use a matching C++ compiler. - CC: clang-12 - CXX: clang++-12 + CC: clang-18 + CXX: clang++-18 # Enable test coverage. PROFILE: 1 # These flags are necessary for grcov to correctly calculate coverage. @@ -28,14 +28,14 @@ jobs: RUST_TEST_THREADS: 2 steps: - - name: Add Clang 12 repo + - name: Add Clang 18 repo run: | - echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main" | sudo tee -a /etc/apt/sources.list.d/llvm-toolchain-focal-12.list + echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" | sudo tee -a /etc/apt/sources.list.d/llvm-toolchain-jammy-18.list curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo apt-get update - name: Install dependencies - run: sudo apt-get install --assume-yes --no-install-suggests clang-12 libsqlite3-dev libcurl4-openssl-dev libxml2-dev libstfl-dev libjson-c-dev libncursesw5-dev + run: sudo apt-get install --assume-yes --no-install-suggests clang-18 libsqlite3-dev libcurl4-openssl-dev libxml2-dev libstfl-dev libjson-c-dev libncursesw5-dev - name: Generate locales run: | @@ -71,8 +71,8 @@ jobs: # produces, so we trick grcov into using llvm-cov instead. We can't # simply point grcov at llvm-cov, because the latter only behaves like # gcc's gcov when invoked by that name. - - name: Prepare to use llvm-cov-12 as gcov - run: ln -s $(which llvm-cov-12) gcov + - name: Prepare to use llvm-cov-18 as gcov + run: ln -s $(which llvm-cov-18) gcov - name: Calculate test coverage # Note that we override the path to gcov tool. |