[Test] Fix test action shell

rikyoz · Oct 28, 2023 · 1dc18d2 · 1dc18d2
1 parent 4bc88c4
commit 1dc18d2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/actions/test_action/action.yml b/.github/actions/test_action/action.yml
@@ -16,6 +16,10 @@ inputs:
   sevenzip_version:
     description: 'Version of 7-Zip to use for the tests'
     required: true
+  shell:
+    description: 'The shell to be used for executing the steps'
+    required: false
+    default: bash
 
 runs:
   using: "composite"
@@ -28,7 +32,7 @@ runs:
         echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
     - name: Configure CMake
-      shell: bash
+      shell: ${{ inputs.shell }}
       run: >
         cmake -B ${{ steps.strings.outputs.build-output-dir }}
         -DCMAKE_CXX_COMPILER=${{ inputs.cpp_compiler }}
@@ -41,12 +45,12 @@ runs:
         -S ${{ github.workspace }}
 
     - name: Build bit7z
-      shell: bash
+      shell: ${{ inputs.shell }}
       # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
       run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ inputs.build_type }} --parallel
 
     - name: Test bit7z
-      shell: bash
+      shell: ${{ inputs.shell }}
       working-directory: ${{ steps.strings.outputs.build-output-dir }}
       # Disabling alloc_dealloc_mismatch for address sanitizer until https://github.com/llvm/llvm-project/issues/52771 is fixed
       env:

diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
@@ -33,5 +33,6 @@ jobs:
         cpp_compiler: cl
         build_type: ${{ matrix.build_type }}
         sevenzip_version: ${{ matrix.bit7z_7zip_version }}
+        shell: pwsh
         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 }}