Merge pull request #71 from sjinks/update-workflows

ci: update workflows
sjinks · Dec 30, 2024 · da13956 · da13956
2 parents 9806f1a + 5d8a41a
commit da13956
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -22,7 +22,7 @@ jobs:
       pull-requests: read
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory
-      PHP_VERSION: 8.1
+      PHP_VERSION: "8.3"
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -36,7 +36,7 @@ jobs:
           coverage: none
 
       - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@816b1822d71776ee0d32bc012e95024ec52ac1fc # v3
+        uses: SonarSource/sonarcloud-github-c-cpp@816b1822d71776ee0d32bc012e95024ec52ac1fc # v3.1.0
 
       - name: Run build-wrapper
         run: |
@@ -54,5 +54,5 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
           sonar-scanner \
-            -Dsonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \
+            -Dsonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json" \
             -Dsonar.cfamily.gcov.reportsPath=$(pwd)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,15 +6,15 @@ on:
   workflow_dispatch:
 
 env:
-  CFLAGS: "-O2 -g3 -Wall -Werror"
+  CFLAGS: "-O2 -g3 -Wall -Werror -Wno-typedef-redefinition"
 
 jobs:
   ci:
     permissions:
       contents: read
     if: ${{ !contains(github.event.head_commit.message, '[ci skip]') || github.event_name == 'workflow_dispatch' }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         compiler:
           - CC: clang
@@ -25,6 +25,8 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
+          - '8.5'
     name: "Build and Test (PHP ${{ matrix.php }}, CC: ${{ matrix.compiler.CC }})"
     runs-on: ubuntu-latest
     steps: