Skip to content

Commit 0f07f70

Browse files
committed
ci: Update the install section for AppVeyor CI
Install autoconf, automake and libtool for msys2 configure builds. Install zlib explicitly rather than relying on AppVeyor's defaults. And, finally, reorder the vcpkg commands: integrate before install.
1 parent bb64115 commit 0f07f70

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.appveyor.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ environment:
4444
ARCH: x86_64
4545

4646
install:
47-
- 'if "%TOOLCHAIN%"=="vstudio" C:\tools\vcpkg\vcpkg.exe install zlib:%ARCH%-windows'
4847
- 'if "%TOOLCHAIN%"=="vstudio" C:\tools\vcpkg\vcpkg.exe integrate install'
49-
- 'if "%TOOLCHAIN%"=="llvm" C:\tools\vcpkg\vcpkg.exe install zlib:%ARCH%-windows'
48+
- 'if "%TOOLCHAIN%"=="vstudio" C:\tools\vcpkg\vcpkg.exe install zlib:%ARCH%-windows'
5049
- 'if "%TOOLCHAIN%"=="llvm" C:\tools\vcpkg\vcpkg.exe integrate install'
50+
- 'if "%TOOLCHAIN%"=="llvm" C:\tools\vcpkg\vcpkg.exe install zlib:%ARCH%-windows'
51+
- 'if "%TOOLCHAIN%"=="msys2" C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-%ARCH%-zlib'
5152
- 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="cmake" C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-%ARCH%-cmake mingw-w64-%ARCH%-ninja'
53+
- 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="configure" C:\msys64\usr\bin\pacman.exe -S --noconfirm autoconf automake libtool'
5254

5355
before_build:
5456
- 'if "%TOOLCHAIN%"=="vstudio" set CI_CMAKE_GENERATOR=Visual Studio 17 2022'

0 commit comments

Comments
 (0)