@@ -14,50 +14,50 @@ jobs:
1414 permissions :
1515 contents : write # to fetch code and upload artifacts
1616 # For msys2, see https://ariya.io/2020/07/on-github-actions-with-msys2
17- runs-on : ${{ matrix.build_type == 'cmake' && 'windows-11-arm' || 'windows-latest' }}
17+ runs-on : ${{ matrix.shell == 'cmake' && 'windows-11-arm' || 'windows-latest' }}
1818 strategy :
1919 # For msys2, see https://github.com/msys2/setup-msys2
2020 matrix :
2121 include :
22- - { msystem: mingw64, env: x86_64, ziparch: win64, build_type : msys2 }
23- - { msystem: mingw32, env: i686, ziparch: win32, build_type : msys2 }
24- - { msystem: null, env: arm64, ziparch: win-arm64, build_type : cmake }
22+ - { msystem: mingw64, env: x86_64, ziparch: win64, shell : msys2 }
23+ - { msystem: mingw32, env: i686, ziparch: win32, shell : msys2 }
24+ - { msystem: null, env: arm64, ziparch: win-arm64, shell : cmake }
2525
2626 defaults :
2727 run :
28- shell : ${{ matrix.build_type == 'cmake' && 'pwsh' || 'msys2 {0}' }}
28+ shell : ${{ matrix.shell == 'cmake' && 'pwsh' || 'msys2 {0}' }}
2929
3030 steps :
3131 - uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
3232
3333 # MSYS2 setup
3434 - uses : msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # tag=v2.28.0
35- if : matrix.build_type == 'msys2'
35+ if : matrix.shell == 'msys2'
3636 with :
3737 msystem : ${{ matrix.msystem }}
3838 install : make p7zip git mingw-w64-${{matrix.env}}-gcc
3939 update : true
4040
4141 - name : display versions (MSYS2)
42- if : matrix.build_type == 'msys2'
42+ if : matrix.shell == 'msys2'
4343 run : |
4444 make -v
4545 cc -v
4646
4747 - name : display versions (CMake)
48- if : matrix.build_type == 'cmake'
48+ if : matrix.shell == 'cmake'
4949 run : |
5050 cmake --version
5151
5252 # Build dependencies (MSYS2 only)
5353 - name : Building zlib to static link
54- if : matrix.build_type == 'msys2'
54+ if : matrix.shell == 'msys2'
5555 run : |
5656 git clone --depth 1 --branch v1.3.1 https://github.com/madler/zlib
5757 make -C zlib -f win32/Makefile.gcc libz.a
5858
5959 - name : Building lz4 to static link
60- if : matrix.build_type == 'msys2'
60+ if : matrix.shell == 'msys2'
6161 run : |
6262 git clone --depth 1 --branch v1.10.0 https://github.com/lz4/lz4
6363 # ensure both libraries use the same version of libxxhash
@@ -66,12 +66,12 @@ jobs:
6666
6767 # Build zstd
6868 - name : Building zstd programs
69- if : matrix.build_type == 'msys2'
69+ if : matrix.shell == 'msys2'
7070 run : |
7171 CPPFLAGS="-I../zlib -I../lz4/lib" LDFLAGS=-static make -j allzstd V=1 HAVE_ZLIB=1 HAVE_LZ4=1 HAVE_LZMA=0 LDLIBS="../zlib/libz.a ../lz4/lib/liblz4.a"
7272
7373 - name : Build zstd (CMake ARM64)
74- if : matrix.build_type == 'cmake'
74+ if : matrix.shell == 'cmake'
7575 run : |
7676 cd build\cmake
7777 mkdir build
@@ -80,13 +80,13 @@ jobs:
8080 cmake.exe --build . --config Release --parallel
8181
8282 - name : Create artifacts (MSYS2)
83- if : matrix.build_type == 'msys2'
83+ if : matrix.shell == 'msys2'
8484 run : |
8585 ./lib/dll/example/build_package.bat || exit 1
8686 mv bin/ zstd-${{ github.ref_name }}-${{matrix.ziparch}}/
8787
8888 - name : Create artifacts (CMake)
89- if : matrix.build_type == 'cmake'
89+ if : matrix.shell == 'cmake'
9090 run : |
9191 .\lib\dll\example\build_package.bat
9292 if ($LASTEXITCODE -ne 0) { exit 1 }
@@ -101,12 +101,12 @@ jobs:
101101 name : zstd-${{ github.ref_name }}-${{matrix.ziparch}}
102102
103103 - name : Package artifact for upload (MSYS2)
104- if : matrix.build_type == 'msys2'
104+ if : matrix.shell == 'msys2'
105105 run : |
106106 7z a -tzip -mx9 "$(cygpath -u '${{ github.workspace }}/zstd-${{ github.ref_name }}-${{ matrix.ziparch }}.zip')" "$(cygpath -u '${{ github.workspace }}/zstd-${{ github.ref_name }}-${{ matrix.ziparch }}')"
107107
108108 - name : Package artifact for upload (CMake)
109- if : matrix.build_type == 'cmake'
109+ if : matrix.shell == 'cmake'
110110 run : |
111111 Compress-Archive -Path "zstd-${{ github.ref_name }}-${{ matrix.ziparch }}" -DestinationPath "zstd-${{ github.ref_name }}-${{ matrix.ziparch }}.zip" -CompressionLevel Optimal
112112
0 commit comments