mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

Update the configuration for Travis CI and AppVeyor CI

Browse Source 
Apply the following changes:
 * Add FreeBSD (besides Linux and Mac) to the Travis CI testing.
 * Use cc instead of clang for Xcode in the Travis CI testing.
 * Upgrade the Windows test image from Visual Studio 2019 to
   Visual Studio 2022 for AppVeyor CI.
This commit is contained in:
Cosmin Truta 2022-09-04 20:21:30 +03:00
parent 081e6751ab
commit bfb0abe4d9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.appveyor.yml
View File

@ -5,7 +5,7 @@ branches:
- /libpng[0-1][0-7]/ - /libpng[0-1][0-7]/
image: image:
- Visual Studio 2019 - Visual Studio 2022
shallow_clone: true shallow_clone: true
@ -46,9 +46,9 @@ install:
before_build: before_build:
- 'if "%TOOLCHAIN%"=="vstudio" set CI_CMAKE_VARS=-DCMAKE_TOOLCHAIN_FILE=C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake' - 'if "%TOOLCHAIN%"=="vstudio" set CI_CMAKE_VARS=-DCMAKE_TOOLCHAIN_FILE=C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake'
- 'if "%TOOLCHAIN%"=="vstudio" set CI_CMAKE_GENERATOR=Visual Studio 16 2019' - 'if "%TOOLCHAIN%"=="vstudio" set CI_CMAKE_GENERATOR=Visual Studio 17 2022'
- 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="x86" set CI_CMAKE_GENERATOR_PLATFORM=Win32' - 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="x86" set CI_CMAKE_GENERATOR_PLATFORM=Win32'
- 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="x64" set CI_CMAKE_GENERATOR_PLATFORM=X64' - 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="x64" set CI_CMAKE_GENERATOR_PLATFORM=x64'
- 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="arm64" set CI_CMAKE_GENERATOR_PLATFORM=ARM64' - 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="arm64" set CI_CMAKE_GENERATOR_PLATFORM=ARM64'
- 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="cmake" set CI_CMAKE_GENERATOR=Unix Makefiles' - 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="cmake" set CI_CMAKE_GENERATOR=Unix Makefiles'
- 'if "%TOOLCHAIN%"=="msys2" if "%ARCH%"=="i686" set PATH=C:\msys64\mingw32\bin;%PATH%' - 'if "%TOOLCHAIN%"=="msys2" if "%ARCH%"=="i686" set PATH=C:\msys64\mingw32\bin;%PATH%'

10
.travis.yml
View File

@ -5,6 +5,7 @@ branches:
language: c language: c
os: os:
- freebsd
- linux - linux
- osx - osx
@ -16,7 +17,6 @@ env:
- AUTOMATION=cmake CI_NO_TEST=1 - AUTOMATION=cmake CI_NO_TEST=1
- AUTOMATION=cmake CI_CMAKE_VARS="-DPNG_HARDWARE_OPTIMIZATIONS=ON" CI_SANITIZERS="address,undefined" - AUTOMATION=cmake CI_CMAKE_VARS="-DPNG_HARDWARE_OPTIMIZATIONS=ON" CI_SANITIZERS="address,undefined"
- AUTOMATION=cmake CI_CMAKE_VARS="-DPNG_HARDWARE_OPTIMIZATIONS=OFF" CI_SANITIZERS="address,undefined" - AUTOMATION=cmake CI_CMAKE_VARS="-DPNG_HARDWARE_OPTIMIZATIONS=OFF" CI_SANITIZERS="address,undefined"
- AUTOMATION=cmake CI_CMAKE_GENERATOR=Xcode
- AUTOMATION=autotools CI_NO_TEST=1 - AUTOMATION=autotools CI_NO_TEST=1
- AUTOMATION=autotools CI_CONFIGURE_FLAGS="--enable-hardware-optimizations" - AUTOMATION=autotools CI_CONFIGURE_FLAGS="--enable-hardware-optimizations"
- AUTOMATION=autotools CI_CONFIGURE_FLAGS="--disable-hardware-optimizations" - AUTOMATION=autotools CI_CONFIGURE_FLAGS="--disable-hardware-optimizations"
@ -24,11 +24,15 @@ env:
- AUTOMATION=legacy CI_SANITIZERS="address,undefined" - AUTOMATION=legacy CI_SANITIZERS="address,undefined"
matrix: matrix:
include:
- os: osx
compiler: cc
env: AUTOMATION=cmake CI_CMAKE_GENERATOR=Xcode
exclude: exclude:
- os: freebsd
compiler: gcc
- os: osx - os: osx
compiler: gcc compiler: gcc
- os: linux
env: AUTOMATION=cmake CI_CMAKE_GENERATOR=Xcode
before_script: before_script:
- 'export CI_CMAKE_BUILD_FLAGS="--parallel 2"' - 'export CI_CMAKE_BUILD_FLAGS="--parallel 2"'