Add Qt 6.2, 6.4, 6.5 to AppVeyor build matrix.

coin3d · Nov 19, 2023 · 5d0a0c8 · 5d0a0c8
1 parent 6358edd
commit 5d0a0c8
Showing 1 changed file with 68 additions and 8 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -20,20 +20,22 @@ environment:
   GH_AUTH_TOKEN:
     secure: 850frgRGZcc4Cljd2P7Ej68no4/kkl4EMB+DjnX725wcKBRJuFk/kGRdJGyKXd2u
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
-      CMAKE_GENERATOR: 'Unix Makefiles'
-      CMAKE_PLATFORM: x64
-      COMPILER_ID: clang
+#    - APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
+#      CMAKE_GENERATOR: 'Unix Makefiles'
+#      CMAKE_PLATFORM: x64
+#      COMPILER_ID: clang
 
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-bigsur
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       COMPILER_ID: clang
+      QT_ID: Qt5.15
 
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       COMPILER_ID: clang
+      QT_ID: Qt5.15
 #
 #    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
 #      CMAKE_GENERATOR: 'Unix Makefiles'
@@ -47,13 +49,15 @@ environment:
       CMAKE_PLATFORM: x64
       CMAKE_ARCH_FLAGS: -m64
       COMPILER_ID: gcc
+      QT_ID: Qt5
       # QT_DIR: C:\Qt\5.10.1\msvc2015
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       CMAKE_ARCH_FLAGS: -m64
       COMPILER_ID: gcc
+      QT_ID: Qt5
       # QT_DIR: C:\Qt\5.10.1\msvc2015
 
 #    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
@@ -75,57 +79,113 @@ environment:
       CMAKE_ARCHITECTURE: Win32
       CMAKE_PLATFORM: x86
       COMPILER_ID: msvc14
+      QT_ID: Qt5.10
       QT_DIR: C:\Qt\5.10\msvc2015
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       CMAKE_GENERATOR: 'Visual Studio 14 2015'
       CMAKE_ARCHITECTURE: x64
       CMAKE_PLATFORM: x64
       COMPILER_ID: msvc14
+      QT_ID: Qt5.10
       QT_DIR: C:\Qt\5.10\msvc2015_64
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       CMAKE_GENERATOR: 'Visual Studio 15 2017'
       CMAKE_ARCHITECTURE: Win32
       CMAKE_PLATFORM: x86
       COMPILER_ID: msvc15
+      QT_ID: Qt5.12
       QT_DIR: C:\Qt\5.12\msvc2017
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       CMAKE_GENERATOR: 'Visual Studio 15 2017'
       CMAKE_ARCHITECTURE: x64
       CMAKE_PLATFORM: x64
       COMPILER_ID: msvc15
+      QT_ID: Qt5.12
       QT_DIR: C:\Qt\5.12\msvc2017_64
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       CMAKE_GENERATOR: 'Visual Studio 16 2019'
       CMAKE_ARCHITECTURE: Win32
       CMAKE_PLATFORM: x86
       COMPILER_ID: msvc16
+      QT_ID: Qt5.15
       QT_DIR: C:\Qt\5.15\msvc2019
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       CMAKE_GENERATOR: 'Visual Studio 16 2019'
       CMAKE_ARCHITECTURE: x64
       CMAKE_PLATFORM: x64
       COMPILER_ID: msvc16
+      QT_ID: Qt5.15
       QT_DIR: C:\Qt\5.15\msvc2019_64
 
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      CMAKE_GENERATOR: 'Visual Studio 16 2019'
+      CMAKE_ARCHITECTURE: x64
+      CMAKE_PLATFORM: x64
+      COMPILER_ID: msvc16
+      QT_ID: Qt6.2
+      QT_DIR: C:\Qt\6.2\msvc2019_64
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      CMAKE_GENERATOR: 'Visual Studio 16 2019'
+      CMAKE_ARCHITECTURE: x64
+      CMAKE_PLATFORM: x64
+      COMPILER_ID: msvc16
+      QT_ID: Qt6.4
+      QT_DIR: C:\Qt\6.4\msvc2019_64
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      CMAKE_GENERATOR: 'Visual Studio 16 2019'
+      CMAKE_ARCHITECTURE: x64
+      CMAKE_PLATFORM: x64
+      COMPILER_ID: msvc16
+      QT_ID: Qt6.5
+      QT_DIR: C:\Qt\6.5\msvc2019_64
+
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
       CMAKE_GENERATOR: 'Visual Studio 17 2022'
       CMAKE_ARCHITECTURE: Win32
       CMAKE_PLATFORM: x86
       COMPILER_ID: msvc17
+      QT_ID: Qt5.15
       QT_DIR: C:\Qt\5.15\msvc2019
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
       CMAKE_GENERATOR: 'Visual Studio 17 2022'
       CMAKE_ARCHITECTURE: x64
       CMAKE_PLATFORM: x64
       COMPILER_ID: msvc17
+      QT_ID: Qt5.15
       QT_DIR: C:\Qt\5.15\msvc2019_64
 
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+      CMAKE_GENERATOR: 'Visual Studio 17 2022'
+      CMAKE_ARCHITECTURE: x64
+      CMAKE_PLATFORM: x64
+      COMPILER_ID: msvc17
+      QT_ID: Qt6.2
+      QT_DIR: C:\Qt\6.2\msvc2019_64
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+      CMAKE_GENERATOR: 'Visual Studio 17 2022'
+      CMAKE_ARCHITECTURE: x64
+      CMAKE_PLATFORM: x64
+      COMPILER_ID: msvc17
+      QT_ID: Qt6.4
+      QT_DIR: C:\Qt\6.4\msvc2019_64
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+      CMAKE_GENERATOR: 'Visual Studio 17 2022'
+      CMAKE_ARCHITECTURE: x64
+      CMAKE_PLATFORM: x64
+      COMPILER_ID: msvc17
+      QT_ID: Qt6.5
+      QT_DIR: C:\Qt\6.5\msvc2019_64
+
 install:
   - sh: |
       if [ "$COMPILER_ID" = "clang" ]
@@ -241,19 +301,19 @@ after_build:
   - cmd: |
       cd %APPVEYOR_BUILD_FOLDER%
       if defined APPVEYOR_REPO_TAG_NAME (set CI_REPO_VERSION=%APPVEYOR_REPO_TAG_NAME:~1%) else (set CI_REPO_VERSION=latest)
-      set BUILD_ARCHIVE=%APPVEYOR_PROJECT_NAME%-%CI_REPO_VERSION%-%COMPILER_ID%-%CMAKE_PLATFORM%.zip
+      set BUILD_ARCHIVE=%APPVEYOR_PROJECT_NAME%-%CI_REPO_VERSION%-%QT_ID%-%COMPILER_ID%-%CMAKE_PLATFORM%.zip
       7z a -tzip %BUILD_ARCHIVE% Coin3D
       C:\msys64\usr\bin\md5sum.exe -b %BUILD_ARCHIVE% > %BUILD_ARCHIVE%.md5
       C:\msys64\usr\bin\sha256sum.exe -b %BUILD_ARCHIVE% > %BUILD_ARCHIVE%.sha256
-      appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/%APPVEYOR_JOB_ID%/log -FileName %APPVEYOR_PROJECT_NAME%-%CI_REPO_VERSION%-%COMPILER_ID%-%CMAKE_PLATFORM%.log
+      appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/%APPVEYOR_JOB_ID%/log -FileName %APPVEYOR_PROJECT_NAME%-%CI_REPO_VERSION%-%QT_ID%-%COMPILER_ID%-%CMAKE_PLATFORM%.log
   - sh: |
       cd $APPVEYOR_BUILD_FOLDER
       if [ -n "${APPVEYOR_REPO_TAG_NAME}" ]; then export CI_REPO_VERSION=${APPVEYOR_REPO_TAG_NAME:1}; else export CI_REPO_VERSION=latest; fi
-      BUILD_ARCHIVE=$APPVEYOR_PROJECT_NAME-$CI_REPO_VERSION-$COMPILER_ID-$CMAKE_PLATFORM.tar.gz
+      BUILD_ARCHIVE=$APPVEYOR_PROJECT_NAME-$CI_REPO_VERSION-$QT_ID-$COMPILER_ID-$CMAKE_PLATFORM.tar.gz
       tar czf $BUILD_ARCHIVE Coin3D/*
       md5sum -b $BUILD_ARCHIVE > $BUILD_ARCHIVE.md5
       sha256sum -b $BUILD_ARCHIVE > $BUILD_ARCHIVE.sha256
-      appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/$APPVEYOR_JOB_ID/log -FileName $APPVEYOR_PROJECT_NAME-$CI_REPO_VERSION-$COMPILER_ID-$CMAKE_PLATFORM.log
+      appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/$APPVEYOR_JOB_ID/log -FileName $APPVEYOR_PROJECT_NAME-$CI_REPO_VERSION-$QT_ID-$COMPILER_ID-$CMAKE_PLATFORM.log
 
 artifacts:
   - path: $(APPVEYOR_PROJECT_NAME)*.zip