Merge remote-tracking branch 'refs/remotes/origin/dev'

dirkwhoffmann · Aug 22, 2024 · d0e6bf0 · d0e6bf0
2 parents 7cab741 + d6590f2
commit d0e6bf0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/cmake-mingw.yml b/.github/workflows/cmake-mingw.yml
@@ -1,4 +1,4 @@
-name: CMake-MinGW
+name: CMake with MinGW
 
 on:
   push:
@@ -40,12 +40,19 @@ jobs:
           mingw-w64-${{matrix.env}}-cmake
           mingw-w64-${{matrix.env}}-ninja
 
+    - name: Set reusable strings
+      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+        
     - name: Build
       working-directory: ./Emulator
       run: |
         cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
         cmake --build build --config ${{env.BUILD_TYPE}}
       
     - name: Test
-      working-directory: ${{github.workspace}}/build
+      working-directory: ${{ steps.strings.outputs.build-output-dir }}
       run: ctest --verbose -C ${{env.BUILD_TYPE}}
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -24,7 +24,7 @@ jobs:
       # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
       matrix:
         os: [ubuntu-latest, windows-latest]
-        build_type: [Release]
+        build_type: [Release, Debug]
         c_compiler: [gcc, clang, cl]
         include:
           - os: windows-latest