added qt6 ci jobs

2021-05-03 14:30:08 +02:00
parent 0dbf83eef7
commit c8c5f6fb35
3 changed files with 232 additions and 0 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,231 @@ cppcheck:
    paths:
      - cppcheck.log

+#-----------  Job Informations:
+# Type:       Build: debug
+# OS:         Linux
+# Compiler:   gcc
+# Language:   cpp11
+# QT Version: qt6.0.0
+
+build-debug-gcc-cpp11-qt6.0.0:
+  stage: build
+  script: "CI/ci-linux-build.sh"
+  #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
+  tags:
+    - Linux
+    - stretch
+  variables:
+    COMPILER: "gcc"
+    LANGUAGE: "cpp11"
+    BUILD_TYPE: "debug"
+    QTVERSION: "qt6.0.0"
+    IWYU: "no"
+    VECTORCHECKS: "yes"
+  artifacts:
+    paths:
+    - build-gcc-cpp11-qt6.0.0-debug-vectorchecks/
+
+#-----------  Job Informations:
+# Type:       Test: debug
+# OS:         Linux
+# Compiler:   gcc
+# Language:   cpp11
+
+test-debug-gcc-cpp11-qt6.0.0:
+  stage: test
+  script: "CI/ci-linux-test.sh"
+  #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
+  tags:
+    - Linux
+    - stretch
+    - MultiThreads
+  variables:
+    COMPILER: "gcc"
+    LANGUAGE: "cpp11"
+    BUILD_TYPE: "debug"
+    QTVERSION: "qt6.0.0"
+    IWYU: "no"
+    VECTORCHECKS: "yes"
+  dependencies: [build-debug-gcc-cpp11-qt6.0.0]
+  needs: [build-debug-gcc-cpp11-qt6.0.0]
+  artifacts:
+    reports:
+      junit:
+        - build-gcc-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report.xml
+        - build-gcc-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report-customvec.xml
+        - build-gcc-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report-doublevec.xml
+
+
+#-----------  Job Informations:
+# Type:       Build: release
+# OS:         Linux
+# Compiler:   gcc
+# Language:   cpp11
+# QT Version: qt6.0.0
+
+build-release-gcc-cpp11-qt6.0.0:
+  stage: build
+  script: "CI/ci-linux-build.sh"
+  #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
+  tags:
+    - Linux
+    - stretch
+  variables:
+    COMPILER: "gcc"
+    LANGUAGE: "cpp11"
+    BUILD_TYPE: "release"
+    QTVERSION: "qt6.0.0"
+    IWYU: "no"
+    VECTORCHECKS: "yes"
+  artifacts:
+    paths:
+    - build-gcc-cpp11-qt6.0.0-release-vectorchecks/
+
+#-----------  Job Informations:
+# Type:       Test: release
+# OS:         Linux
+# Compiler:   gcc
+# Language:   cpp11
+
+test-release-gcc-cpp11-qt6.0.0:
+  stage: test
+  script: "CI/ci-linux-test.sh"
+  #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
+  tags:
+    - Linux
+    - stretch
+    - MultiThreads
+  variables:
+    COMPILER: "gcc"
+    LANGUAGE: "cpp11"
+    BUILD_TYPE: "release"
+    QTVERSION: "qt6.0.0"
+    IWYU: "no"
+    VECTORCHECKS: "yes"
+  dependencies: [build-release-gcc-cpp11-qt6.0.0]
+  needs: [build-release-gcc-cpp11-qt6.0.0]
+  artifacts:
+    reports:
+      junit:
+        - build-gcc-cpp11-qt6.0.0-release-vectorchecks/Unittests/report.xml
+        - build-gcc-cpp11-qt6.0.0-release-vectorchecks/Unittests/report-customvec.xml
+        - build-gcc-cpp11-qt6.0.0-release-vectorchecks/Unittests/report-doublevec.xml
+
+
+#-----------  Job Informations:
+# Type:       Build: debug
+# OS:         Linux
+# Compiler:   clang
+# Language:   cpp11
+# QT Version: qt6.0.0
+
+build-debug-clang-cpp11-qt6.0.0:
+  stage: build
+  script: "CI/ci-linux-build.sh"
+  #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
+  tags:
+    - Linux
+    - stretch
+  variables:
+    COMPILER: "clang"
+    LANGUAGE: "cpp11"
+    BUILD_TYPE: "debug"
+    QTVERSION: "qt6.0.0"
+    IWYU: "no"
+    VECTORCHECKS: "yes"
+  artifacts:
+    paths:
+    - build-clang-cpp11-qt6.0.0-debug-vectorchecks/
+
+#-----------  Job Informations:
+# Type:       Test: debug
+# OS:         Linux
+# Compiler:   clang
+# Language:   cpp11
+
+test-debug-clang-cpp11-qt6.0.0:
+  stage: test
+  script: "CI/ci-linux-test.sh"
+  #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
+  tags:
+    - Linux
+    - stretch
+    - MultiThreads
+  variables:
+    COMPILER: "clang"
+    LANGUAGE: "cpp11"
+    BUILD_TYPE: "debug"
+    QTVERSION: "qt6.0.0"
+    IWYU: "no"
+    VECTORCHECKS: "yes"
+  dependencies: [build-debug-clang-cpp11-qt6.0.0]
+  needs: [build-debug-clang-cpp11-qt6.0.0]
+  artifacts:
+    reports:
+      junit:
+        - build-clang-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report.xml
+        - build-clang-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report-customvec.xml
+        - build-clang-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report-doublevec.xml
+
+
+#-----------  Job Informations:
+# Type:       Build: release
+# OS:         Linux
+# Compiler:   clang
+# Language:   cpp11
+# QT Version: qt6.0.0
+
+build-release-clang-cpp11-qt6.0.0:
+  stage: build
+  script: "CI/ci-linux-build.sh"
+  #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
+  tags:
+    - Linux
+    - stretch
+  variables:
+    COMPILER: "clang"
+    LANGUAGE: "cpp11"
+    BUILD_TYPE: "release"
+    QTVERSION: "qt6.0.0"
+    IWYU: "no"
+    VECTORCHECKS: "yes"
+  artifacts:
+    paths:
+    - build-clang-cpp11-qt6.0.0-release-vectorchecks/
+
+#-----------  Job Informations:
+# Type:       Test: release
+# OS:         Linux
+# Compiler:   clang
+# Language:   cpp11
+
+test-release-clang-cpp11-qt6.0.0:
+  stage: test
+  script: "CI/ci-linux-test.sh"
+  #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
+  tags:
+    - Linux
+    - stretch
+    - MultiThreads
+  variables:
+    COMPILER: "clang"
+    LANGUAGE: "cpp11"
+    BUILD_TYPE: "release"
+    QTVERSION: "qt6.0.0"
+    IWYU: "no"
+    VECTORCHECKS: "yes"
+  dependencies: [build-release-clang-cpp11-qt6.0.0]
+  needs: [build-release-clang-cpp11-qt6.0.0]
+  artifacts:
+    reports:
+      junit:
+        - build-clang-cpp11-qt6.0.0-release-vectorchecks/Unittests/report.xml
+        - build-clang-cpp11-qt6.0.0-release-vectorchecks/Unittests/report-customvec.xml
+        - build-clang-cpp11-qt6.0.0-release-vectorchecks/Unittests/report-doublevec.xml
+
+
+
 #-----------  Job Informations:
 # Type:       Build: debug
 # OS:         Linux
--- a/CI/ci-linux-prepare.sh
+++ b/CI/ci-linux-prepare.sh
@@ -63,6 +63,10 @@ elif [ "$QTVERSION" == "qt5.15.1" ]; then
  echo "Using QT5.15.1";
  BUILDPATH="$BUILDPATH-qt5.15.1"
  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64 -DQT_VERSION=5"
+elif [ "$QTVERSION" == "qt5.15.1" ]; then
+  echo "Using QT6.0.0";
+  BUILDPATH="$BUILDPATH-qt6.0.0"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.0/6.0.0/gcc_64 -DQT_VERSION=6"
 fi

 #=====================================
--- a/CI/gitlab-ci/linux.yml
+++ b/CI/gitlab-ci/linux.yml
@@ -12,6 +12,9 @@ cppcheck:
    paths:
      - cppcheck.log

+{linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp11, QT_VERSION=qt6.0.0}
+{linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp11, QT_VERSION=qt6.0.0}
+
 {linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp11, QT_VERSION=qt5.15.1}
 {linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp11, QT_VERSION=qt5.15.1}
 {linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp14, QT_VERSION=qt5.15.1}