From 56463a297fb5b6c6a4cf40f61c388933020051ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 16 Jul 2024 09:09:29 +0200 Subject: [PATCH] Update CI --- .gitlab-ci.yml | 18 ------------------ CI/Windows.bat | 2 +- CI/gitlab-ci/ci-master.yml | 1 - CI/gitlab-ci/linux-iwyu-job.yml | 1 - CI/gitlab-ci/linux-template-build-job.yml | 1 - CI/gitlab-ci/linux-template-test-job.yml | 1 - CI/gitlab-ci/linux.yml | 1 - release.howto | 1 + 8 files changed, 2 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c9702ee..8e0914f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,6 @@ cppcheck: image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch timeout: 3h artifacts: paths: @@ -47,7 +46,6 @@ build-debug-gcc-cpp11-qt6.1.2: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "gcc" LANGUAGE: "cpp11" @@ -71,7 +69,6 @@ test-debug-gcc-cpp11-qt6.1.2: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch - MultiThreads variables: COMPILER: "gcc" @@ -103,7 +100,6 @@ build-release-gcc-cpp11-qt6.1.2: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "gcc" LANGUAGE: "cpp11" @@ -127,7 +123,6 @@ test-release-gcc-cpp11-qt6.1.2: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch - MultiThreads variables: COMPILER: "gcc" @@ -159,7 +154,6 @@ build-debug-clang-cpp11-qt6.1.2: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "clang" LANGUAGE: "cpp11" @@ -183,7 +177,6 @@ test-debug-clang-cpp11-qt6.1.2: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch - MultiThreads variables: COMPILER: "clang" @@ -215,7 +208,6 @@ build-release-clang-cpp11-qt6.1.2: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "clang" LANGUAGE: "cpp11" @@ -239,7 +231,6 @@ test-release-clang-cpp11-qt6.1.2: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch - MultiThreads variables: COMPILER: "clang" @@ -272,7 +263,6 @@ build-debug-gcc-cpp14-qt5.15.1: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "gcc" LANGUAGE: "cpp14" @@ -296,7 +286,6 @@ test-debug-gcc-cpp14-qt5.15.1: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch - MultiThreads variables: COMPILER: "gcc" @@ -328,7 +317,6 @@ build-release-gcc-cpp14-qt5.15.1: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "gcc" LANGUAGE: "cpp14" @@ -352,7 +340,6 @@ test-release-gcc-cpp14-qt5.15.1: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch - MultiThreads variables: COMPILER: "gcc" @@ -384,7 +371,6 @@ build-debug-clang-cpp14-qt5.15.1: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "clang" LANGUAGE: "cpp14" @@ -408,7 +394,6 @@ test-debug-clang-cpp14-qt5.15.1: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch - MultiThreads variables: COMPILER: "clang" @@ -440,7 +425,6 @@ build-release-clang-cpp14-qt5.15.1: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "clang" LANGUAGE: "cpp14" @@ -464,7 +448,6 @@ test-release-clang-cpp14-qt5.15.1: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch - MultiThreads variables: COMPILER: "clang" @@ -732,7 +715,6 @@ Sources: script: "CI/ci-source.sh" tags: - Linux - - stretch dependencies: [] artifacts: paths: diff --git a/CI/Windows.bat b/CI/Windows.bat index 62105f46..29490893 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -176,7 +176,7 @@ del *.exe IF %errorlevel% NEQ 0 exit /b %errorlevel% -move OpenMesh-*.exe "OpenMesh-10.0-Git-Master-%BUILD_PLATFORM%-%STRING_ARCH%%STRING_DLL%%STRING_APPS%.exe" +move OpenMesh-*.exe "OpenMesh-11.0-Git-Master-%BUILD_PLATFORM%-%STRING_ARCH%%STRING_DLL%%STRING_APPS%.exe" diff --git a/CI/gitlab-ci/ci-master.yml b/CI/gitlab-ci/ci-master.yml index 4784a695..dce32119 100644 --- a/CI/gitlab-ci/ci-master.yml +++ b/CI/gitlab-ci/ci-master.yml @@ -29,7 +29,6 @@ Sources: script: "CI/ci-source.sh" tags: - Linux - - stretch dependencies: [] artifacts: paths: diff --git a/CI/gitlab-ci/linux-iwyu-job.yml b/CI/gitlab-ci/linux-iwyu-job.yml index af88f26c..6b12bd8b 100644 --- a/CI/gitlab-ci/linux-iwyu-job.yml +++ b/CI/gitlab-ci/linux-iwyu-job.yml @@ -10,7 +10,6 @@ iwyu-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "{{COMPILER}}" LANGUAGE: "{{LANGUAGE}}" diff --git a/CI/gitlab-ci/linux-template-build-job.yml b/CI/gitlab-ci/linux-template-build-job.yml index 16785396..055db36d 100644 --- a/CI/gitlab-ci/linux-template-build-job.yml +++ b/CI/gitlab-ci/linux-template-build-job.yml @@ -11,7 +11,6 @@ build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch variables: COMPILER: "{{COMPILER}}" LANGUAGE: "{{LANGUAGE}}" diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index a31754c2..575f6581 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -10,7 +10,6 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch - MultiThreads variables: COMPILER: "{{COMPILER}}" diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml index 3e04242f..fbebaf20 100644 --- a/CI/gitlab-ci/linux.yml +++ b/CI/gitlab-ci/linux.yml @@ -8,7 +8,6 @@ cppcheck: image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - - stretch timeout: 3h artifacts: paths: diff --git a/release.howto b/release.howto index 9ad456c4..dd9ecff4 100644 --- a/release.howto +++ b/release.howto @@ -6,6 +6,7 @@ src/OpenMesh/Core/System/config.h README CMakeLists.txt ( version setting in project call) + CI/Windows.bat 3. Tag the current version in the git 4. Create HTML-Documentation in OpenMesh/Documentation (!) 5. Create tar-ball and zip-archive ( -> Done by CI)