Fix glob for properly matching files, adjust warning message

croemheld · Feb 14, 2024 · 37d43af · 37d43af
1 parent f7b661c
commit 37d43af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -13,28 +13,31 @@ jobs:
       changed-files: ${{ steps.changed-files.outputs.count }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Check git version
+        run: |
+          git diff --name-status $(git merge-base origin/main origin/6-feature-icarus-add-gcovr-for-code-coverage-workflow)..origin/6-feature-icarus-add-gcovr-for-code-coverage-workflow
       - name: Check the changed files
         id: changed-files
         uses: croemheld/git-diff-action@v1
         with:
           base: origin/main
-          comp: ${{ github.ref_name }}
-          glob: '+(cmake|docker)/*'
+          comp: origin/${{ github.ref_name }}
+          glob: '**/{cmake,docker}/**'
           type: 'M'
   docker-icarus:
     runs-on: ubuntu-latest
     needs: docker-change
-    if: ${{ needs.docker-change.outputs.changed-files }}
+    if: ${{ needs.docker-change.outputs.changed-files != 0 }}
     strategy:
       fail-fast: false
       matrix:
         version: [ "5.0", "6.0", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17" ]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:

diff --git a/tests/samples/CMakeLists.txt b/tests/samples/CMakeLists.txt
@@ -2,8 +2,7 @@ set(VENV_PATH ${CMAKE_SOURCE_DIR}/venv/bin)
 find_program(WLLVM wllvm PATHS ${VENV_PATH})
 
 if (NOT WLLVM)
-    message(WARNING "The wllvm binary could not be found, the bitcode files will not be generated. This might lead
-                    to failing unit tests that depend on these bitcode files.")
+    message(WARNING "The wllvm binary could not be found, the bitcode files will not be generated. This might lead to failing unit tests that depend on these bitcode files.")
 else()
     set(CMAKE_C_COMPILER wllvm)
     set(CMAKE_CXX_COMPILER wllvm++)