From 3dffc17baafe6ce512ee3cc0452effb1ffad2e20 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 16 Feb 2025 17:04:33 -0800 Subject: [PATCH] actions: update Ubuntu 20.04 -> 22.04 We need -Wno-reserved-identifiers because on Linux, some of the macros in /usr/include/pthread.h use variables which begin with two underscores. --- .github/workflows/compile.yml | 5 +++-- .github/workflows/coverity-scan.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 940f2868..4ea1a4b9 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -22,6 +22,7 @@ env: # Variables for specific projects / platforms / compilers. CFLAGS_CLANG_PROJECT: -Wno-implicit-fallthrough -Wno-thread-safety-analysis -Wno-extra-semi-stmt + -Wno-reserved-identifier CFLAGS_GCC_PROJECT: CFLAGS_OSX: -Wno-poison-system-directories -I/usr/local/opt/openssl@1.1/include @@ -31,7 +32,7 @@ env: jobs: Ubuntu: name: Ubuntu - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Update apt-get run: sudo apt-get update @@ -41,7 +42,7 @@ jobs: uses: actions/checkout@v4 - name: Compile with clang env: - CC: clang-10 + CC: clang-13 CFLAGS: ${{ env.CFLAGS_ALL }} ${{ env.CFLAGS_CLANG_LIBCPERCIVA }} ${{ env.CFLAGS_CLANG_PROJECT }} diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 8369fcc6..dd2f3739 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -10,7 +10,7 @@ on: # requires us to fake a TRAVIS_BRANCH environment variable. jobs: coverity-scan: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v4