Skip to content

Commit

Permalink
Fix and improve Windows 2025 workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
rikyoz committed Jan 4, 2025
1 parent 2360f1d commit 5146564
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
11 changes: 10 additions & 1 deletion .github/actions/test_action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ inputs:
description: 'The shell to be used for executing the steps'
required: false
default: bash
path:
description: 'The paths to append to the PATH environment variable'
required: false
enable_sanitizers:
description: 'Enable sanitizer for testing bit7z'
required: false
Expand All @@ -37,6 +40,12 @@ runs:
shell: bash
run: |
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
- name: Add paths to PATH
shell: bash
if: inputs.shell != ''
run: |
echo "${{ inputs.path }}" >> "$GITHUB_PATH"
- name: Fix kernel mmap rnd bits
shell: bash
Expand Down Expand Up @@ -101,7 +110,7 @@ runs:
- name: Build bit7z
shell: ${{ inputs.shell }}
run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ inputs.build_type }} --parallel
run: cmake --build '${{ steps.strings.outputs.build-output-dir }}'--config ${{ inputs.build_type }} --parallel

- name: Test bit7z (Ubuntu and macOS)
if: runner.os != 'Windows'
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/test_windows25.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Add msys64 path to PATH
shell: bash
run: |
echo "C:\msys64\usr\bin" >> "$GITHUB_PATH"

- name: Building and testing bit7z
uses: ./.github/actions/test_action
Expand All @@ -53,6 +48,7 @@ jobs:
cpp_compiler: g++
build_type: ${{ matrix.build_type }}
sevenzip_version: ${{ matrix.bit7z_7zip_version }}
shell: bash
shell: pwsh
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 }}

0 comments on commit 5146564

Please sign in to comment.