diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml index 736bafb3..afa88013 100644 --- a/.github/workflows/ctest.yml +++ b/.github/workflows/ctest.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-13] build_type: [Debug, Release] c_compiler: [gcc, clang, cl] bit7z_auto_format: [OFF, ON] @@ -39,7 +39,7 @@ jobs: c_compiler: clang cpp_compiler: clang++ use_system_7zip: OFF - - os: macos-latest + - os: macos-13 c_compiler: clang cpp_compiler: clang++ use_system_7zip: OFF @@ -63,17 +63,17 @@ jobs: bit7z_use_system_codepage: ON - os: ubuntu-latest bit7z_path_sanitization: ON - - os: macos-latest + - os: macos-13 c_compiler: cl - - os: macos-latest + - os: macos-13 c_compiler: gcc - - os: macos-latest + - os: macos-13 bit7z_use_native_string: ON - - os: macos-latest + - os: macos-13 bit7z_auto_prefix_long_paths: ON - - os: macos-latest + - os: macos-13 bit7z_use_system_codepage: ON - - os: macos-latest + - os: macos-13 bit7z_path_sanitization: ON steps: @@ -129,9 +129,10 @@ jobs: - name: Build 7z.so for tests (macOS) shell: bash - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-13' run: | git clone --depth 1 https://github.com/rikyoz/7-Zip ${{ github.workspace }}/../7-zip + sed -i '' 's/-Wno-poison-system-directories/-Wno-poison-system-directories -Wno-declaration-after-statement\r/' ${{ github.workspace }}/../7-zip/CPP/7zip/warn_clang_mac.mak cd ${{ github.workspace }}/../7-zip/CPP/7zip/Bundles/Format7zF/ make -j -f ../../cmpl_mac_x64.mak cp b/m_x64/7z.so ${{ github.workspace }}/bin/x64/7z.so