Branch is main not master, QT references in CI script removed

coin3d · Dec 23, 2023 · bfaf2e3 · bfaf2e3
1 parent dcc2a13
commit bfaf2e3
Showing 1 changed file with 7 additions and 28 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,8 +1,8 @@
-version: 1.6.1-{branch}-ci-{build}
+version: 1.0.1-{branch}-ci-{build}
 
 branches:
   only:
-  - master
+  - main
   - /v\d*\.\d*\.\d*/
 
 # do not build feature branches with open pull requests
@@ -31,13 +31,11 @@ environment:
 #      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'
@@ -50,91 +48,72 @@ environment:
 #      CMAKE_PLATFORM: x64
 #      CMAKE_ARCH_FLAGS: -m64
 #      COMPILER_ID: gcc
-#      QT_ID: Qt5
 #
 #    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
 #      CMAKE_GENERATOR: 'Unix Makefiles'
 #      CMAKE_PLATFORM: x64
 #      CMAKE_ARCH_FLAGS: -m64
 #      COMPILER_ID: gcc
-#      QT_ID: Qt5
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       CMAKE_ARCH_FLAGS: -m64
       COMPILER_ID: gcc
-      QT_ID: Qt5
 
 #    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 #      CMAKE_GENERATOR: 'Visual Studio 10 2010'
 #      CMAKE_ARCHITECTURE: Win32
 #      CMAKE_PLATFORM: x86
 #      COMPILER_ID: msvc10
-#      QT_DIR: C:\Qt\5.3\msvc2010
-#
+##
 #    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 #      CMAKE_GENERATOR: 'Visual Studio 10 2010'
 #      CMAKE_ARCHITECTURE: x64
 #      CMAKE_PLATFORM: x64
 #      COMPILER_ID: msvc10
-#      QT_DIR: C:\Qt\5.3\msvc2010_64
 
 #    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 #      CMAKE_GENERATOR: 'Visual Studio 14 2015'
 #      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 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: |
@@ -252,19 +231,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%-%QT_ID%-%COMPILER_ID%-%CMAKE_PLATFORM%.zip
+      set BUILD_ARCHIVE=%APPVEYOR_PROJECT_NAME%-%CI_REPO_VERSION%-%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%-%QT_ID%-%COMPILER_ID%-%CMAKE_PLATFORM%.log
+      appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/%APPVEYOR_JOB_ID%/log -FileName %APPVEYOR_PROJECT_NAME%-%CI_REPO_VERSION%-%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-$QT_ID-$COMPILER_ID-$CMAKE_PLATFORM.tar.gz
+      BUILD_ARCHIVE=$APPVEYOR_PROJECT_NAME-$CI_REPO_VERSION-$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-$QT_ID-$COMPILER_ID-$CMAKE_PLATFORM.log
+      appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/$APPVEYOR_JOB_ID/log -FileName $APPVEYOR_PROJECT_NAME-$CI_REPO_VERSION-$COMPILER_ID-$CMAKE_PLATFORM.log
 
 artifacts:
   - path: $(APPVEYOR_PROJECT_NAME)*.zip