Update test workflows

Author: rikyoz

.github/workflows/test_macos.yml

@@ -28,7 +28,7 @@ jobs:
       matrix:
         os: [macos-14, macos-15, macos-26]
         c_compiler: [gcc-12, gcc-13, gcc-14, gcc-15, clang]
-        bit7z_7zip_version: [23.01, 24.09]
+        bit7z_7zip_version: [23.01, 26.00]
         bit7z_auto_format: [OFF, ON]
         bit7z_detect_from_extension: [OFF, ON]
         bit7z_regex_matching: [OFF, ON]

.github/workflows/test_ubuntu24.yml

@@ -33,8 +33,7 @@ jobs:
         bit7z_detect_from_extension: [OFF, ON]
         bit7z_regex_matching: [OFF, ON]
         bit7z_link_libcpp: [OFF, ON]
-        bit7z_7zip_version: [16.02, 23.01, 24.09]
-        bit7z_build_for_p7zip: [OFF, ON]
+        bit7z_7zip_version: [23.01, 24.09, 26.00]
         include:
           - c_compiler: gcc-13
             cpp_compiler: g++-13
@@ -57,25 +56,11 @@ jobs:
             bit7z_link_libcpp: ON
           - c_compiler: clang-18 # re-enable once improved string conversions in bit7z
             bit7z_link_libcpp: ON
-          - arch: arm64
-            bit7z_7zip_version: 16.02
-          - c_compiler: gcc-13
-            bit7z_7zip_version: 16.02
-          - c_compiler: clang-16
-            bit7z_7zip_version: 16.02
-          - c_compiler: clang-17
-            bit7z_7zip_version: 16.02
-          - bit7z_7zip_version: 16.02
-            bit7z_build_for_p7zip: OFF
-          - bit7z_7zip_version: 24.09
-            bit7z_build_for_p7zip: ON
-          - bit7z_7zip_version: 23.01
-            bit7z_build_for_p7zip: ON
           - bit7z_auto_format: OFF
             bit7z_detect_from_extension: ON
 
     name: |
-      Ubuntu (${{ matrix.arch }}), ${{ matrix.c_compiler }}, 7-Zip ${{ matrix.bit7z_7zip_version }}${{ (matrix.bit7z_auto_format == 'ON') && ', AUTO_FORMAT' || '' }}${{ (matrix.bit7z_detect_from_extension == 'ON') && ', DETECT_FROM_EXT' || '' }}${{ (matrix.bit7z_regex_matching == 'ON') && ', REGEX_MATCHING' || '' }}${{ (matrix.bit7z_link_libcpp == 'ON') && ', LINK_LIBCPP' || '' }}${{ (matrix.bit7z_build_for_p7zip == 'ON') && ', BUILD_FOR_P7ZIP' || '' }}
+      Ubuntu (${{ matrix.arch }}), ${{ matrix.c_compiler }}, 7-Zip ${{ matrix.bit7z_7zip_version }}${{ (matrix.bit7z_auto_format == 'ON') && ', AUTO_FORMAT' || '' }}${{ (matrix.bit7z_detect_from_extension == 'ON') && ', DETECT_FROM_EXT' || '' }}${{ (matrix.bit7z_regex_matching == 'ON') && ', REGEX_MATCHING' || '' }}${{ (matrix.bit7z_link_libcpp == 'ON') && ', LINK_LIBCPP' || '' }}
 
     steps:
     - uses: actions/checkout@v4
@@ -95,29 +80,6 @@ jobs:
       if: ${{ matrix.bit7z_link_libcpp == 'ON' && contains(matrix.c_compiler, 'clang-18') }}
       run: sudo apt-get install libc++-18-dev libc++abi-18-dev -y
 
-    - name: Cache p7zip's 7z.so
-      uses: actions/cache@v4
-      id: cache-p7zip-so
-      if: ${{ matrix.bit7z_build_for_p7zip == 'ON' }}
-      with:
-        path: ${{ github.workspace }}/build/p7zip/bin/7z.so
-        key: ${{ runner.os }}-p7zip-x64-7z.so
-
-    - name: Fix missing p7zip shared library
-      shell: bash
-      if: ${{ steps.cache-p7zip-so.outputs.cache-hit != 'true' && matrix.bit7z_build_for_p7zip == 'ON' }}
-      run: |
-        git clone --depth 1 https://github.com/rikyoz/p7zip ${{ github.workspace }}/build/p7zip
-        curl https://gist.githubusercontent.com/rikyoz/472257e7883054fdfcf7a7fac5715372/raw/11057145a6082615f4452f7f50da6e7b3d557f82/p7zip_gcc10.patch | git -C ${{ github.workspace }}/build/p7zip apply -v --no-index
-        make -C ${{ github.workspace }}/build/p7zip 7z
-        
-    - name: Install p7zip's 7z.so
-      shell: bash
-      if: ${{ matrix.bit7z_build_for_p7zip == 'ON' }}
-      run: |
-        sudo mkdir -p /usr/lib/p7zip
-        sudo cp ${{ github.workspace }}/build/p7zip/bin/7z.so /usr/lib/p7zip/7z.so
-
     - name: Building and testing bit7z
       uses: ./.github/actions/ci_action
       with:
@@ -126,4 +88,4 @@ jobs:
         cpp_compiler: ${{ matrix.cpp_compiler }}
         sevenzip_version: ${{ matrix.bit7z_7zip_version }}
         build_flags: |-
-            -DBIT7Z_TESTS_USE_SYSTEM_7ZIP=${{ matrix.bit7z_build_for_p7zip }} -DBIT7Z_BUILD_FOR_P7ZIP=${{ matrix.bit7z_build_for_p7zip }} -DBIT7Z_AUTO_FORMAT=${{ matrix.bit7z_auto_format }} -DBIT7Z_DETECT_FROM_EXTENSION=${{ matrix.bit7z_detect_from_extension }} -DBIT7Z_REGEX_MATCHING=${{ matrix.bit7z_regex_matching }} -DBIT7Z_LINK_LIBCPP=${{ matrix.bit7z_link_libcpp }}
+            -DBIT7Z_TESTS_USE_SYSTEM_7ZIP=OFF -DBIT7Z_BUILD_FOR_P7ZIP=OFF -DBIT7Z_AUTO_FORMAT=${{ matrix.bit7z_auto_format }} -DBIT7Z_DETECT_FROM_EXTENSION=${{ matrix.bit7z_detect_from_extension }} -DBIT7Z_REGEX_MATCHING=${{ matrix.bit7z_regex_matching }} -DBIT7Z_LINK_LIBCPP=${{ matrix.bit7z_link_libcpp }}

.github/workflows/test_windows25.yml

@@ -33,7 +33,7 @@ jobs:
         bit7z_auto_prefix_long_paths: [OFF, ON]
         bit7z_use_system_codepage: [OFF, ON]
         bit7z_path_sanitization: [OFF, ON]
-        bit7z_7zip_version: [23.01, 24.09]
+        bit7z_7zip_version: [24.09, 26.00]
         exclude:
           - bit7z_auto_format: OFF
             bit7z_detect_from_extension: ON