From bfb0abe4d99c83c44d4aeb16d819d6c4f17f8cae Mon Sep 17 00:00:00 2001
From: Cosmin Truta <ctruta@gmail.com>
Date: Sun, 4 Sep 2022 20:21:30 +0300
Subject: [PATCH] Update the configuration for Travis CI and AppVeyor CI

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.
---
 .appveyor.yml |  6 +++---
 .travis.yml   | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 932a2801c..88dc11ef3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,7 +5,7 @@ branches:
     - /libpng[0-1][0-7]/
 
 image:
-  - Visual Studio 2019
+  - Visual Studio 2022
 
 shallow_clone: true
 
@@ -46,9 +46,9 @@ install:
 
 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_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%"=="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%"=="msys2" if "%AUTOMATION%"=="cmake" set CI_CMAKE_GENERATOR=Unix Makefiles'
   - 'if "%TOOLCHAIN%"=="msys2" if "%ARCH%"=="i686" set PATH=C:\msys64\mingw32\bin;%PATH%'
diff --git a/.travis.yml b/.travis.yml
index 3c1eb0ccf..70457cd39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ branches:
 language: c
 
 os:
+  - freebsd
   - linux
   - osx
 
@@ -16,7 +17,6 @@ env:
   - 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=OFF" CI_SANITIZERS="address,undefined"
-  - AUTOMATION=cmake CI_CMAKE_GENERATOR=Xcode
   - AUTOMATION=autotools CI_NO_TEST=1
   - AUTOMATION=autotools CI_CONFIGURE_FLAGS="--enable-hardware-optimizations"
   - AUTOMATION=autotools CI_CONFIGURE_FLAGS="--disable-hardware-optimizations"
@@ -24,11 +24,15 @@ env:
   - AUTOMATION=legacy CI_SANITIZERS="address,undefined"
 
 matrix:
+  include:
+    - os: osx
+      compiler: cc
+      env: AUTOMATION=cmake CI_CMAKE_GENERATOR=Xcode
   exclude:
+    - os: freebsd
+      compiler: gcc
     - os: osx
       compiler: gcc
-    - os: linux
-      env: AUTOMATION=cmake CI_CMAKE_GENERATOR=Xcode
 
 before_script:
   - 'export CI_CMAKE_BUILD_FLAGS="--parallel 2"'