Restore debug and release jobs in Windows 2025 workflow

rikyoz · Jan 5, 2025 · 7ae58c9 · 7ae58c9
1 parent 5089c17
commit 7ae58c9
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/.github/workflows/test_windows25.yml b/.github/workflows/test_windows25.yml
@@ -26,6 +26,7 @@ jobs:
       fail-fast: false
 
       matrix:
+        build_type: [Debug, Release]
         bit7z_auto_format: [OFF, ON]
         bit7z_regex_matching: [OFF, ON]
         bit7z_use_native_string: [OFF, ON]
@@ -35,29 +36,17 @@ jobs:
         bit7z_7zip_version: [23.01, 24.09]
 
     name: |
-      Windows, 7-Zip ${{ matrix.bit7z_7zip_version }}${{ (matrix.bit7z_auto_format == 'ON') && ', AUTO_FORMAT' || '' }}${{ (matrix.bit7z_regex_matching == 'ON') && ', REGEX_MATCHING' || '' }}${{ matrix.bit7z_use_native_string == 'ON' && ', USE_NATIVE_STRING' || '' }}${{ matrix.bit7z_auto_prefix_long_paths == 'ON' && ', AUTO_PREFIX_LONG_PATHS' || '' }}${{ matrix.bit7z_use_system_codepage == 'ON' && ', USE_SYSTEM_CODEPAGE' || '' }}${{ matrix.bit7z_path_sanitization == 'ON' && ', PATH_SANITIZATION' || '' }}
+      Windows, ${{ matrix.build_type }}, 7-Zip ${{ matrix.bit7z_7zip_version }}${{ (matrix.bit7z_auto_format == 'ON') && ', AUTO_FORMAT' || '' }}${{ (matrix.bit7z_regex_matching == 'ON') && ', REGEX_MATCHING' || '' }}${{ matrix.bit7z_use_native_string == 'ON' && ', USE_NATIVE_STRING' || '' }}${{ matrix.bit7z_auto_prefix_long_paths == 'ON' && ', AUTO_PREFIX_LONG_PATHS' || '' }}${{ matrix.bit7z_use_system_codepage == 'ON' && ', USE_SYSTEM_CODEPAGE' || '' }}${{ matrix.bit7z_path_sanitization == 'ON' && ', PATH_SANITIZATION' || '' }}
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Building and testing bit7z (Debug)
+    - name: Building and testing bit7z
       uses: ./.github/actions/test_action
       with:
         c_compiler: gcc
         cpp_compiler: g++
-        build_type: Debug
-        sevenzip_version: ${{ matrix.bit7z_7zip_version }}
-        shell: bash
-        path: C:\msys64\usr\bin
-        build_flags: |-
-            -DBIT7Z_TESTS_USE_SYSTEM_7ZIP=ON -DBIT7Z_AUTO_FORMAT=${{ matrix.bit7z_auto_format }} -DBIT7Z_REGEX_MATCHING=${{ matrix.bit7z_regex_matching }} -DBIT7Z_USE_NATIVE_STRING=${{ matrix.bit7z_use_native_string }} -DBIT7Z_AUTO_PREFIX_LONG_PATHS=${{ matrix.bit7z_auto_prefix_long_paths }} -DBIT7Z_USE_SYSTEM_CODEPAGE=${{ matrix.bit7z_use_system_codepage }} -DBIT7Z_PATH_SANITIZATION=${{ matrix.bit7z_path_sanitization }} -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON -G "MinGW Makefiles"
-
-    - name: Building and testing bit7z (Release)
-      uses: ./.github/actions/test_action
-      with:
-        c_compiler: gcc
-        cpp_compiler: g++
-        build_type: Release
+        build_type: ${{ matrix.build_type }}
         sevenzip_version: ${{ matrix.bit7z_7zip_version }}
         shell: bash
         path: C:\msys64\usr\bin