From 59e03c1b5c24a9bb007d402adc82d4fa4c6a4128 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Wed, 12 Mar 2025 19:00:36 +0100 Subject: [PATCH 1/7] ci: update build.yml to clang 20 - only available for linux atm --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d831efc..9a50ac8e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,21 +145,21 @@ jobs: run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 19 - sudo apt-get install libc++-19* libc++abi*19* -y --no-install-recommends - echo "CC=clang-19" >> "$GITHUB_ENV" - echo "CXX=clang++-19" >> "$GITHUB_ENV" - echo "OBJC=clang-19" >> "$GITHUB_ENV" + sudo ./llvm.sh 20 + sudo apt-get install libc++-20* libc++abi*20* -y --no-install-recommends + echo "CC=clang-20" >> "$GITHUB_ENV" + echo "CXX=clang++-20" >> "$GITHUB_ENV" + echo "OBJC=clang-20" >> "$GITHUB_ENV" - name: Setup Clang (Linux) (libstdc++) if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && (! matrix.config.use-clang_stdlib) run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 19 - echo "CC=clang-19" >> "$GITHUB_ENV" - echo "CXX=clang++-19" >> "$GITHUB_ENV" - echo "OBJC=clang-19" >> "$GITHUB_ENV" + sudo ./llvm.sh 20 + echo "CC=clang-20" >> "$GITHUB_ENV" + echo "CXX=clang++-20" >> "$GITHUB_ENV" + echo "OBJC=clang-20" >> "$GITHUB_ENV" - name: Setup GCC (Linux) if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == false From 2088cc2ae6a469d103f0d80bc45daee723e26469 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Wed, 12 Mar 2025 19:00:45 +0100 Subject: [PATCH 2/7] ci: update test.yml to clang 20 --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9894eb1b..e7a378a8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,10 +19,10 @@ jobs: run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 19 - sudo apt-get install libc++-19* libc++abi*19* llvm-19 -y --no-install-recommends - echo "CC=clang-19" >> "$GITHUB_ENV" - echo "CXX=clang++-19" >> "$GITHUB_ENV" + sudo ./llvm.sh 20 + sudo apt-get install libc++-20* libc++abi*20* llvm-20 -y --no-install-recommends + echo "CC=clang-20" >> "$GITHUB_ENV" + echo "CXX=clang++-20" >> "$GITHUB_ENV" # NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything! - name: Setup meson From 3c8786ae20f8dc94eea2a0b8ce4fecfe32cde8e3 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Wed, 12 Mar 2025 19:00:59 +0100 Subject: [PATCH 3/7] ci: update lint.yml to clang 20 --- .github/workflows/lint.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 448d3dcc..d59cfc5f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,10 +24,10 @@ jobs: run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 19 - echo "CC=clang-19" >> "$GITHUB_ENV" - echo "CXX=clang++-19" >> "$GITHUB_ENV" - echo "OBJC=clang-19" >> "$GITHUB_ENV" + sudo ./llvm.sh 20 + echo "CC=clang-20" >> "$GITHUB_ENV" + echo "CXX=clang++-20" >> "$GITHUB_ENV" + echo "OBJC=clang-20" >> "$GITHUB_ENV" - name: Prepare compile_commands.json run: | @@ -44,7 +44,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: style: file - version: 19 + version: 20 database: build files-changed-only: ${{ github.event_name != 'workflow_dispatch' }} lines-changed-only: ${{ github.event_name != 'workflow_dispatch' }} From af45bc84a7f82b3989b337d22f47ba3b8b7113a0 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Mon, 31 Mar 2025 17:04:35 +0200 Subject: [PATCH 4/7] ci: update build workflow to use llvm 20 on macos --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a50ac8e..68e0e674 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -182,10 +182,10 @@ jobs: if: matrix.config.os == 'macos' run: | brew update - brew install llvm@19 lld@19 - echo "$(brew --prefix)/opt/llvm@19/bin:$(brew --prefix)/opt/lld@19/bin" >> $GITHUB_PATH - echo "LDFLAGS=-L$(brew --prefix)/opt/llvm@19/lib -L$(brew --prefix)/opt/llvm@19/lib/c++ -Wl,-rpath,$(brew --prefix)/opt/llvm@19/lib/c++ -L$(brew --prefix)/opt/lld@19/lib" >> "$GITHUB_ENV" - echo "CPPFLAGS=-I$(brew --prefix)/opt/llvm@19/include -I$(brew --prefix)/opt/lld@19/include" >> "$GITHUB_ENV" + brew install llvm@20 lld@20 + echo "$(brew --prefix)/opt/llvm@20/bin:$(brew --prefix)/opt/lld@20/bin" >> $GITHUB_PATH + echo "LDFLAGS=-L$(brew --prefix)/opt/llvm@20/lib -L$(brew --prefix)/opt/llvm@20/lib/c++ -Wl,-rpath,$(brew --prefix)/opt/llvm@20/lib/c++ -L$(brew --prefix)/opt/lld@20/lib" >> "$GITHUB_ENV" + echo "CPPFLAGS=-I$(brew --prefix)/opt/llvm@20/include -I$(brew --prefix)/opt/lld@20/include" >> "$GITHUB_ENV" echo "CC=clang" >> "$GITHUB_ENV" echo "CXX=clang++" >> "$GITHUB_ENV" echo "OBJC=clang" >> "$GITHUB_ENV" From 9b1387c1975c4d57791ce0cc703a873ac6e48d41 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Fri, 25 Apr 2025 19:50:02 +0200 Subject: [PATCH 5/7] build: update alpine clang vesion to 20 --- .github/workflows/musl.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml index bf35bd61..7e7dd2a9 100644 --- a/.github/workflows/musl.yml +++ b/.github/workflows/musl.yml @@ -32,9 +32,9 @@ jobs: - name: Install dependencies run: | apk update - apk add wget meson ca-certificates samurai git openssl-dev openssl pkgconf sdl2 sdl2-dev sdl2_mixer-dev sdl2_ttf-dev sdl2_mixer-dev sdl2_image-dev dbus-dev ${{ ( matrix.config.use-clang == true ) && 'clang19' || 'gcc g++' }} ${{ ( matrix.config.use-clang == true && matrix.config.use-clang_stdlib == true ) && 'libc++ libc++-dev llvm-libunwind llvm-libunwind-dev ' || '' }} - echo "CC=${{ matrix.config.use-clang == true && 'clang-19' || 'gcc' }}" >> "$GITHUB_ENV" - echo "CXX=${{ matrix.config.use-clang == true && 'clang++-19' || 'g++' }}" >> "$GITHUB_ENV" + apk add wget meson ca-certificates samurai git openssl-dev openssl pkgconf sdl2 sdl2-dev sdl2_mixer-dev sdl2_ttf-dev sdl2_mixer-dev sdl2_image-dev dbus-dev ${{ ( matrix.config.use-clang == true ) && 'clang20' || 'gcc g++' }} ${{ ( matrix.config.use-clang == true && matrix.config.use-clang_stdlib == true ) && 'libc++ libc++-dev llvm-libunwind llvm-libunwind-dev ' || '' }} + echo "CC=${{ matrix.config.use-clang == true && 'clang-20' || 'gcc' }}" >> "$GITHUB_ENV" + echo "CXX=${{ matrix.config.use-clang == true && 'clang++-20' || 'g++' }}" >> "$GITHUB_ENV" - uses: actions/checkout@v4 with: From abd14a635ebe1510afaf938d918baf1de136a17b Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sat, 31 May 2025 15:54:14 +0200 Subject: [PATCH 6/7] ci: use alpine 3.22 --- .github/workflows/musl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml index 7e7dd2a9..f7263523 100644 --- a/.github/workflows/musl.yml +++ b/.github/workflows/musl.yml @@ -10,7 +10,7 @@ jobs: build: name: ${{ matrix.config.name }} runs-on: ubuntu-24.04 - container: alpine:3.21 + container: alpine:3.22 strategy: fail-fast: false From cda5582726d3438cde10793953aac90226202549 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sat, 31 May 2025 16:03:20 +0200 Subject: [PATCH 7/7] ci: constrain clang in ci to version 20 --- tools/options/meson.build | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/options/meson.build b/tools/options/meson.build index c3fbb5f0..b8a580aa 100644 --- a/tools/options/meson.build +++ b/tools/options/meson.build @@ -41,10 +41,6 @@ if get_option('run_in_ci') system_name = 'msys2' endif - clang_19_compiler = { - 'id': 'clang', - 'checks': ['>=19', '<20'], - } clang_20_compiler = { 'id': 'clang', 'checks': ['>=20', '<21'], @@ -85,10 +81,10 @@ if get_option('run_in_ci') 'compilers': [gcc_14_compiler], }, 'linux': { - 'compilers': [clang_19_compiler, gcc_14_compiler], + 'compilers': [clang_20_compiler, gcc_14_compiler], }, 'darwin': { - 'compilers': [clang_19_compiler], + 'compilers': [clang_20_compiler], }, }