Upgrade to clang and llvm 18 in GitHub Actions.

petur · Nov 26, 2024 · caacc3f · caacc3f
1 parent 794016e
commit caacc3f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml
@@ -11,25 +11,21 @@ jobs:
           shell: 'bash'
           suffix: -linux-gcc-nehalem
           cxx: g++
-          llvm_profdata: ''
           arch: nehalem
         - runner: ubuntu-latest
           shell: 'bash'
           suffix: -linux-gcc
           cxx: g++
-          llvm_profdata: ''
           arch: haswell
-        - runner: ubuntu-22.04
+        - runner: ubuntu-latest
           shell: 'bash'
           suffix: -linux-clang
-          cxx: clang++-14
-          llvm_profdata: llvm-profdata-14
+          cxx: clang++
           arch: haswell
         - runner: windows-latest
           shell: 'msys2 {0}'
           suffix: -windows-clang
           cxx: clang++
-          llvm_profdata: llvm-profdata
           arch: haswell
     defaults:
       run:
@@ -46,11 +42,15 @@ jobs:
           mingw-w64-clang-x86_64-compiler-rt
           mingw-w64-clang-x86_64-lld
       if: ${{ matrix.platform.runner == 'windows-latest' }}
+    - uses: KyleMayes/install-llvm-action@e0a8dc9cb8a22e8a7696e8a91a4e9581bec13181
+      with:
+        version: 18
+      if: ${{ matrix.platform.runner == 'ubuntu-latest' && matrix.platform.cxx == 'clang++' }}
     - uses: actions/checkout@v3
     - id: make
       run: |
-        make CXX=${{ matrix.platform.cxx }} LLVM_PROFDATA=${{ matrix.platform.llvm_profdata }} \
-          ARCH=${{ matrix.platform.arch }} LDFLAGS='-static -s' SUFFIX=${{ matrix.platform.suffix }}
+        make CXX=${{ matrix.platform.cxx }} ARCH=${{ matrix.platform.arch }} \
+            LDFLAGS='-static -s' SUFFIX=${{ matrix.platform.suffix }}
         echo "artifact=$(basename -s .exe out/seawall-*)" >> $GITHUB_OUTPUT
     - uses: actions/upload-artifact@v3
       with:

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ ifeq ($(ARCH),)
 ARCH := native
 endif
 RTTIFLAGS = -fno-rtti -fno-exceptions
-CXXFLAGS += -Wall -Wextra -Werror -std=c++17 -Ofast -march=$(ARCH) -mtune=$(ARCH) -flto $(RTTIFLAGS) $(PGOFLAGS)
+CXXFLAGS += -Wall -Wextra -Werror -std=c++17 -O3 -ffast-math -march=$(ARCH) -mtune=$(ARCH) -flto $(RTTIFLAGS) $(PGOFLAGS)
 
 version := 20240926
 ifeq ($(version),)