GHA: Fix Windows build (fix Appveyor removal)
This commit is contained in:
7
.github/workflows/windows.yml
vendored
7
.github/workflows/windows.yml
vendored
@@ -95,6 +95,7 @@ jobs:
|
||||
- name: Install MSYS2 packages
|
||||
shell: cmd
|
||||
run: |
|
||||
C:\msys64\usr\bin\pacman.exe --noconfirm -Sy
|
||||
C:\msys64\usr\bin\pacman.exe --noconfirm -S zstd autoconf automake flex bison perl perl-JSON texinfo
|
||||
|
||||
- name: Build
|
||||
@@ -111,9 +112,9 @@ jobs:
|
||||
echo Compiler: ${{ matrix.compiler }}
|
||||
if "${{ matrix.compiler }}"=="clang-cl" (
|
||||
clang-cl --version
|
||||
nmake /f NTMakefile CC=clang-cl APPVEYOR=1 MAKEINFO=makeinfo NO_INSTALLERS=1 INCLUDE_openssl_crypto="%INCLUDE_openssl_crypto%" LIB_openssl_crypto="%LIB_openssl_crypto%" CFLAGS="-msse2"
|
||||
nmake /f NTMakefile CC=clang-cl GHA=1 NO_INSTALLERS=1 INCLUDE_openssl_crypto="%INCLUDE_openssl_crypto%" LIB_openssl_crypto="%LIB_openssl_crypto%" CFLAGS="-msse2"
|
||||
) else (
|
||||
nmake /f NTMakefile APPVEYOR=1 MAKEINFO=makeinfo NO_INSTALLERS=1 INCLUDE_openssl_crypto="%INCLUDE_openssl_crypto%" LIB_openssl_crypto="%LIB_openssl_crypto%"
|
||||
nmake /f NTMakefile GHA=1 NO_INSTALLERS=1 INCLUDE_openssl_crypto="%INCLUDE_openssl_crypto%" LIB_openssl_crypto="%LIB_openssl_crypto%"
|
||||
)
|
||||
|
||||
- name: Test
|
||||
@@ -121,7 +122,7 @@ jobs:
|
||||
run: |
|
||||
set "PATH=%PATH%;C:\msys64\usr\bin"
|
||||
set "PATH=%PATH%;C:\Program Files\OpenSSL\bin"
|
||||
nmake /f NTMakefile APPVEYOR=1 MAKEINFO=makeinfo NO_INSTALLERS=1 test
|
||||
nmake /f NTMakefile GHA=1 NO_INSTALLERS=1 test
|
||||
|
||||
- name: Upload Artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
|
||||
Reference in New Issue
Block a user