From 67dae4c8d1993d79a03d64e6e6a0d85379d010da Mon Sep 17 00:00:00 2001
From: Elias Kosunen <elias.kosunen@gmail.com>
Date: Wed, 18 Sep 2024 09:19:59 -0600
Subject: [PATCH] CI updates

---
 .github/workflows/arch.yml            |  4 ++--
 .github/workflows/coverage.yml        |  4 ++--
 .github/workflows/docs.yml            |  4 ++--
 .github/workflows/fuzz-batch.yml      |  4 ++--
 .github/workflows/fuzz-continuous.yml |  4 ++--
 .github/workflows/fuzz-cron.yml       | 10 +++++-----
 .github/workflows/fuzz-pr.yml         |  8 +++-----
 .github/workflows/linux.yml           | 21 +++++++++------------
 .github/workflows/lite.yml            |  5 +++--
 .github/workflows/macos.yml           |  6 +++---
 .github/workflows/windows.yml         |  4 ++--
 11 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml
index 21d93a13..4456dbd9 100644
--- a/.github/workflows/arch.yml
+++ b/.github/workflows/arch.yml
@@ -6,7 +6,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/arch.yml'
       - 'cmake/**'
       - 'include/**'
       - 'src/**'
@@ -17,7 +17,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/arch.yml'
       - 'cmake/**'
       - 'include/**'
       - 'src/**'
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 0ae0648e..d0b62c96 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -3,7 +3,7 @@ name: Coverage
 on:
   push:
     paths:
-      - '.github/**'
+      - '.github/workflows/coverage.yml'
       - 'cmake/**'
       - 'include/**'
       - 'scripts/**'
@@ -12,7 +12,7 @@ on:
       - '**/CMakeLists.txt'
   pull_request:
     paths:
-      - '.github/**'
+      - '.github/workflows/coverage.yml'
       - 'cmake/**'
       - 'include/**'
       - 'scripts/**'
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index efd3d828..f181eb75 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -11,7 +11,7 @@ on:
       - "**.md"
       - "docs/**"
       - "**/docs.yml"
-      - '.github/**'
+      - '.github/workflows/docs.yml'
   release:
     types: [published]
   workflow_dispatch:
@@ -51,7 +51,7 @@ jobs:
       - name: Prepare repository (on workflow_dispatch)
         if: ${{ github.event_name == 'workflow_dispatch' }}
         run: |
-          git fetch origin ${{ github.ref_name }}:refs/remotes/origin/${{ github.ref_name }} --tags --force
+          git fetch origin master:refs/remotes/origin/master --tags --force
           git remote set-head origin -a
           git checkout ${{ github.ref_name }}
           git pull --force
diff --git a/.github/workflows/fuzz-batch.yml b/.github/workflows/fuzz-batch.yml
index 02d5d557..1b814c2f 100644
--- a/.github/workflows/fuzz-batch.yml
+++ b/.github/workflows/fuzz-batch.yml
@@ -23,14 +23,14 @@ jobs:
     steps:
       - name: Build fuzzers
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: eliaskosunen/clusterfuzzlite/actions/build_fuzzers@main
         with:
           language: c++
           sanitizer: ${{ matrix.sanitizer }}
 
       - name: Run fuzzers
         id: run
-        uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+        uses: eliaskosunen/clusterfuzzlite/actions/run_fuzzers@main
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fuzz-seconds: 1800
diff --git a/.github/workflows/fuzz-continuous.yml b/.github/workflows/fuzz-continuous.yml
index 51259a7a..db1a1bba 100644
--- a/.github/workflows/fuzz-continuous.yml
+++ b/.github/workflows/fuzz-continuous.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
     paths:
-      - '.github/**'
+      - '.github/workflows/fuzz-continuous.yml'
       - 'benchmark/**'
       - 'cmake/**'
       - 'examples/**'
@@ -33,7 +33,7 @@ jobs:
     steps:
       - name: Build fuzzers
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: eliaskosunen/clusterfuzzlite/actions/build_fuzzers@main
         with:
           language: c++
           sanitizer: ${{ matrix.sanitizer }}
diff --git a/.github/workflows/fuzz-cron.yml b/.github/workflows/fuzz-cron.yml
index 70a1835c..0fba84de 100644
--- a/.github/workflows/fuzz-cron.yml
+++ b/.github/workflows/fuzz-cron.yml
@@ -16,16 +16,16 @@ jobs:
     steps:
       - name: Build fuzzers
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: eliaskosunen/clusterfuzzlite/actions/build_fuzzers@main
         with:
           language: c++
 
       - name: Run fuzzers
         id: run
-        uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+        uses: eliaskosunen/clusterfuzzlite/actions/run_fuzzers@main
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          fuzz-seconds: 1200
+          fuzz-seconds: 86400
           mode: 'prune'
           output-sarif: true
           storage-repo: https://${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/eliaskosunen/scnlib-fuzz-corpus.git
@@ -36,14 +36,14 @@ jobs:
     steps:
       - name: Build fuzzers
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: eliaskosunen/clusterfuzzlite/actions/build_fuzzers@main
         with:
           language: c++
           sanitizer: coverage
 
       - name: Run fuzzers
         id: run
-        uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+        uses: eliaskosunen/clusterfuzzlite/actions/run_fuzzers@main
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fuzz-seconds: 600
diff --git a/.github/workflows/fuzz-pr.yml b/.github/workflows/fuzz-pr.yml
index a8a94a32..14f68900 100644
--- a/.github/workflows/fuzz-pr.yml
+++ b/.github/workflows/fuzz-pr.yml
@@ -3,10 +3,8 @@ name: ClusterFuzzLite PR fuzzing
 on:
   pull_request:
     paths:
-      - '.github/**'
-      - 'benchmark/**'
+      - '.github/workflows/fuzz-pr.yml'
       - 'cmake/**'
-      - 'examples/**'
       - 'include/**'
       - 'src/**'
       - 'tests/**'
@@ -31,7 +29,7 @@ jobs:
     steps:
       - name: Build fuzzers
         id: build
-        uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+        uses: eliaskosunen/clusterfuzzlite/actions/build_fuzzers@main
         with:
           language: c++
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -40,7 +38,7 @@ jobs:
 
       - name: Run fuzzers
         id: run
-        uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+        uses: eliaskosunen/clusterfuzzlite/actions/run_fuzzers@main
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fuzz-seconds: 600
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 2f3f91b8..ff21d4a5 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -6,7 +6,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/linux.yml'
       - 'benchmark/**'
       - 'cmake/**'
       - 'examples/**'
@@ -19,7 +19,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/linux.yml'
       - 'benchmark/**'
       - 'cmake/**'
       - 'examples/**'
@@ -480,10 +480,10 @@ jobs:
           restore-keys: |
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}-${{ github.ref }}
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}-${{ github.base_ref }}
+            ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.sha }}
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.ref }}
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.base_ref }}
-            ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-install${{ matrix.external_deps }}
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}
 
       - name: Setup ccache
@@ -539,7 +539,7 @@ jobs:
           test "$output" -eq 42
 
   disabled-envs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -551,7 +551,7 @@ jobs:
           - "-DSCN_DISABLE_FROM_CHARS=ON -DSCN_DISABLE_STRTOD=ON"
 
     env:
-      CXX: g++-11
+      CXX: g++-14
       CMAKE_CXX_STANDARD: 17
       CMAKE_C_COMPILER_LAUNCHER: ccache
       CMAKE_CXX_COMPILER_LAUNCHER: ccache
@@ -573,14 +573,14 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.sha }}
+          key: ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashFiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.sha }}
           restore-keys: |
-            ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.ref }}
-            ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.base_ref }}
+            ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashFiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.ref }}
+            ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashFiles('$GITHUB_WORKSPACE/flags.txt') }}-${{ github.base_ref }}
+            ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashFiles('$GITHUB_WORKSPACE/flags.txt') }}
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.sha }}
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.ref }}
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-${{ github.base_ref }}
-            ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}-flags${{ hashfiles('$GITHUB_WORKSPACE/flags.txt') }}
             ccache-${{ github.workflow }}-ubuntu22.04-${{ env.CXX }}-std${{ env.CMAKE_CXX_STANDARD }}
 
       - name: Setup ccache
@@ -592,9 +592,6 @@ jobs:
 
       - name: Run CMake
         working-directory: ${{ runner.workspace }}/build
-        env:
-          CC: clang
-          CXX: clang++
         run: |
           cmake -G Ninja -DSCN_CI=ON ${{ matrix.flags }} \
                 $GITHUB_WORKSPACE
diff --git a/.github/workflows/lite.yml b/.github/workflows/lite.yml
index 85169430..7de0cfd6 100644
--- a/.github/workflows/lite.yml
+++ b/.github/workflows/lite.yml
@@ -6,7 +6,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/lite.yml'
       - 'benchmark/**'
       - 'cmake/**'
       - 'examples/**'
@@ -19,7 +19,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/lite.yml'
       - 'benchmark/**'
       - 'cmake/**'
       - 'examples/**'
@@ -160,6 +160,7 @@ jobs:
 
       - name: Create Build Environment
         run: |
+          $ErrorActionPreference = 'Stop'
           cmake -E make_directory ${{ runner.workspace }}/build
           choco install ccache
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a788a11c..d6530258 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -6,7 +6,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/macos.yml'
       - 'benchmark/**'
       - 'cmake/**'
       - 'examples/**'
@@ -19,7 +19,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/macos.yml'
       - 'benchmark/**'
       - 'cmake/**'
       - 'examples/**'
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 14, 12 ]
-        cxx: [ brew-clang++, clang++, g++-13, g++-12, g++-11 ]
+        cxx: [ brew-clang++, clang++, g++-14, g++-13, g++-12 ]
         std: [ 17 ]
 
         include:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 275533b6..401a004e 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -6,7 +6,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/windows.yml'
       - 'benchmark/**'
       - 'cmake/**'
       - 'examples/**'
@@ -19,7 +19,7 @@ on:
       - master
       - v*/dev
     paths:
-      - '.github/**'
+      - '.github/workflows/windows.yml'
       - 'benchmark/**'
       - 'cmake/**'
       - 'examples/**'