Fix Windows CI yaml schema

eliaskosunen · Jan 13, 2024 · 389c747 · 389c747
1 parent ac2c71e
commit 389c747
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/.github/workflows/fuzz-batch.yml b/.github/workflows/fuzz-batch.yml
@@ -3,16 +3,6 @@ name: ClusterFuzzLite batch fuzzing
 on:
   schedule:
     - cron: '0 0/6 * * *' # Every 6th hour
-  push:
-    paths:
-      - '.github/**'
-      - 'benchmark/**'
-      - 'cmake/**'
-      - 'examples/**'
-      - 'include/**'
-      - 'src/**'
-      - 'tests/**'
-      - '**/CMakeLists.txt'
   workflow_dispatch:
 
 concurrency:

diff --git a/.github/workflows/lite.yml b/.github/workflows/lite.yml
@@ -153,7 +153,7 @@ jobs:
         type: [ Debug ]
 
     env:
-      CCACHE_DIR: ${{ runner.workspace }}/ccache
+      CCACHE_DIR: D:/ccache
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 12, 11 ]
-        cxx: [ clang++, g++-13, g++-12, g++-11, g++-10 ]
+        cxx: [ brew-clang++, clang++, g++-13, g++-12, g++-11, g++-10 ]
         std: [ 17, 20 ]
         exclude:
           - os: 11
@@ -73,6 +73,16 @@ jobs:
           mkdir ${{ runner.workspace }}/build
           brew install --overwrite ccache
 
+      - name: Setup Homebrew clang
+        if: ${{ matrix.cxx == 'brew-clang++' }}
+        run: |
+          llvm_root="$(brew --prefix llvm)"
+          echo "${llvm_root}/bin" >> $GITHUB_PATH
+          echo "CXX=clang++" >> $GITHUB_ENV
+          echo "LDFLAGS=-Wl,-rpath,${llvm_root}" >> $GITHUB_ENV
+          echo "CPPFLAGS=-isystem ${llvm_root}/include" >> $GITHUB_ENV
+          echo "CXXFLAGS=-isystem ${llvm_root}/include/c++/v1" >> $GITHUB_ENV
+
       - name: Load ccache
         uses: actions/cache@v3
         with:
@@ -92,8 +102,6 @@ jobs:
 
       - name: Run CMake
         working-directory: ${{ runner.workspace }}/build
-        env:
-          CXX: ${{ matrix.cxx }}
         run: |
           cmake -DSCN_CI=ON -DCMAKE_CXX_STANDARD=${{ matrix.std }} $GITHUB_WORKSPACE
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -36,6 +36,7 @@ env:
   CCACHE_ABSSTDERR: true
   CCACHE_COMPRESS: true
   CCACHE_COMPRESSLEVEL: 6
+  CCACHE_DIR: D:/ccache
   CCACHE_MAXSIZE: 100M
   CCACHE_NOHASHDIR: true
   CCACHE_SLOPPINESS: "pch_defines,time_macros"
@@ -54,9 +55,6 @@ jobs:
         type: [ Debug, Release ]
         std: [ 17, 20 ]
 
-    env:
-      CCACHE_DIR: ${{ runner.workspace }}/ccache
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -181,9 +179,6 @@ jobs:
           - sys: clang32
           - sys: clang64
 
-    env:
-      CCACHE_DIR: ${{ runner.workspace }}/ccache
-
     steps:
       - uses: msys2/setup-msys2@v2
         with: