From 7cc8cd0bf41c2442f5400c8487ff303537426bf4 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 9 Feb 2021 11:31:21 +0100 Subject: [PATCH] Linux ci jobs no use environment variables instead of positional parameters --- .gitlab-ci.yml | 136 +++++++++++++++++++--- CI/ci-linux-prepare.sh | 8 +- CI/gitlab-ci/linux-iwyu-job.yml | 8 +- CI/gitlab-ci/linux-template-build-job.yml | 8 +- CI/gitlab-ci/linux-template-test-job.yml | 8 +- 5 files changed, 141 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df7e4440..cd9d6cac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,11 +41,17 @@ cppcheck: build-debug-gcc-cpp11-qt5.15.1: stage: build - script: "CI/ci-linux-build.sh gcc cpp11 debug qt5.15.1" + 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: "qt5.15.1" + IWYU: "no" artifacts: paths: - build-gcc-cpp11-qt5.15.1-debug/ @@ -58,12 +64,18 @@ build-debug-gcc-cpp11-qt5.15.1: test-debug-gcc-cpp11-qt5.15.1: stage: test - script: "CI/ci-linux-test.sh gcc cpp11 debug qt5.15.1" + 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: "qt5.15.1" + IWYU: "no" dependencies: [build-debug-gcc-cpp11-qt5.15.1] needs: [build-debug-gcc-cpp11-qt5.15.1] artifacts: @@ -83,11 +95,17 @@ test-debug-gcc-cpp11-qt5.15.1: build-release-gcc-cpp11-qt5.15.1: stage: build - script: "CI/ci-linux-build.sh gcc cpp11 release qt5.15.1" + 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: "qt5.15.1" + IWYU: "no" artifacts: paths: - build-gcc-cpp11-qt5.15.1-release/ @@ -100,12 +118,18 @@ build-release-gcc-cpp11-qt5.15.1: test-release-gcc-cpp11-qt5.15.1: stage: test - script: "CI/ci-linux-test.sh gcc cpp11 release qt5.15.1" + 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: "qt5.15.1" + IWYU: "no" dependencies: [build-release-gcc-cpp11-qt5.15.1] needs: [build-release-gcc-cpp11-qt5.15.1] artifacts: @@ -125,11 +149,17 @@ test-release-gcc-cpp11-qt5.15.1: build-debug-clang-cpp11-qt5.15.1: stage: build - script: "CI/ci-linux-build.sh clang cpp11 debug qt5.15.1" + 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: "qt5.15.1" + IWYU: "no" artifacts: paths: - build-clang-cpp11-qt5.15.1-debug/ @@ -142,12 +172,18 @@ build-debug-clang-cpp11-qt5.15.1: test-debug-clang-cpp11-qt5.15.1: stage: test - script: "CI/ci-linux-test.sh clang cpp11 debug qt5.15.1" + 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: "qt5.15.1" + IWYU: "no" dependencies: [build-debug-clang-cpp11-qt5.15.1] needs: [build-debug-clang-cpp11-qt5.15.1] artifacts: @@ -167,11 +203,17 @@ test-debug-clang-cpp11-qt5.15.1: build-release-clang-cpp11-qt5.15.1: stage: build - script: "CI/ci-linux-build.sh clang cpp11 release qt5.15.1" + 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: "qt5.15.1" + IWYU: "no" artifacts: paths: - build-clang-cpp11-qt5.15.1-release/ @@ -184,12 +226,18 @@ build-release-clang-cpp11-qt5.15.1: test-release-clang-cpp11-qt5.15.1: stage: test - script: "CI/ci-linux-test.sh clang cpp11 release qt5.15.1" + 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: "qt5.15.1" + IWYU: "no" dependencies: [build-release-clang-cpp11-qt5.15.1] needs: [build-release-clang-cpp11-qt5.15.1] artifacts: @@ -209,11 +257,17 @@ test-release-clang-cpp11-qt5.15.1: build-debug-gcc-cpp14-qt5.15.1: stage: build - script: "CI/ci-linux-build.sh gcc cpp14 debug qt5.15.1" + script: "CI/ci-linux-build.sh" #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch + variables: + COMPILER: "gcc" + LANGUAGE: "cpp14" + BUILD_TYPE: "debug" + QTVERSION: "qt5.15.1" + IWYU: "no" artifacts: paths: - build-gcc-cpp14-qt5.15.1-debug/ @@ -226,12 +280,18 @@ build-debug-gcc-cpp14-qt5.15.1: test-debug-gcc-cpp14-qt5.15.1: stage: test - script: "CI/ci-linux-test.sh gcc cpp14 debug qt5.15.1" + 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: "cpp14" + BUILD_TYPE: "debug" + QTVERSION: "qt5.15.1" + IWYU: "no" dependencies: [build-debug-gcc-cpp14-qt5.15.1] needs: [build-debug-gcc-cpp14-qt5.15.1] artifacts: @@ -251,11 +311,17 @@ test-debug-gcc-cpp14-qt5.15.1: build-release-gcc-cpp14-qt5.15.1: stage: build - script: "CI/ci-linux-build.sh gcc cpp14 release qt5.15.1" + script: "CI/ci-linux-build.sh" #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch + variables: + COMPILER: "gcc" + LANGUAGE: "cpp14" + BUILD_TYPE: "release" + QTVERSION: "qt5.15.1" + IWYU: "no" artifacts: paths: - build-gcc-cpp14-qt5.15.1-release/ @@ -268,12 +334,18 @@ build-release-gcc-cpp14-qt5.15.1: test-release-gcc-cpp14-qt5.15.1: stage: test - script: "CI/ci-linux-test.sh gcc cpp14 release qt5.15.1" + 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: "cpp14" + BUILD_TYPE: "release" + QTVERSION: "qt5.15.1" + IWYU: "no" dependencies: [build-release-gcc-cpp14-qt5.15.1] needs: [build-release-gcc-cpp14-qt5.15.1] artifacts: @@ -293,11 +365,17 @@ test-release-gcc-cpp14-qt5.15.1: build-debug-clang-cpp14-qt5.15.1: stage: build - script: "CI/ci-linux-build.sh clang cpp14 debug qt5.15.1" + script: "CI/ci-linux-build.sh" #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch + variables: + COMPILER: "clang" + LANGUAGE: "cpp14" + BUILD_TYPE: "debug" + QTVERSION: "qt5.15.1" + IWYU: "no" artifacts: paths: - build-clang-cpp14-qt5.15.1-debug/ @@ -310,12 +388,18 @@ build-debug-clang-cpp14-qt5.15.1: test-debug-clang-cpp14-qt5.15.1: stage: test - script: "CI/ci-linux-test.sh clang cpp14 debug qt5.15.1" + 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: "cpp14" + BUILD_TYPE: "debug" + QTVERSION: "qt5.15.1" + IWYU: "no" dependencies: [build-debug-clang-cpp14-qt5.15.1] needs: [build-debug-clang-cpp14-qt5.15.1] artifacts: @@ -335,11 +419,17 @@ test-debug-clang-cpp14-qt5.15.1: build-release-clang-cpp14-qt5.15.1: stage: build - script: "CI/ci-linux-build.sh clang cpp14 release qt5.15.1" + script: "CI/ci-linux-build.sh" #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch + variables: + COMPILER: "clang" + LANGUAGE: "cpp14" + BUILD_TYPE: "release" + QTVERSION: "qt5.15.1" + IWYU: "no" artifacts: paths: - build-clang-cpp14-qt5.15.1-release/ @@ -352,12 +442,18 @@ build-release-clang-cpp14-qt5.15.1: test-release-clang-cpp14-qt5.15.1: stage: test - script: "CI/ci-linux-test.sh clang cpp14 release qt5.15.1" + 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: "cpp14" + BUILD_TYPE: "release" + QTVERSION: "qt5.15.1" + IWYU: "no" dependencies: [build-release-clang-cpp14-qt5.15.1] needs: [build-release-clang-cpp14-qt5.15.1] artifacts: @@ -377,11 +473,17 @@ test-release-clang-cpp14-qt5.15.1: iwyu-release-clang-cpp14-qt5.15.1: stage: build - script: "CI/ci-linux-build.sh clang cpp14 release qt5.15.1 IWYU" + script: "CI/ci-linux-build.sh" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch + variables: + COMPILER: "clang" + LANGUAGE: "cpp14" + BUILD_TYPE: "release" + QTVERSION: "qt5.15.1" + IWYU: "yes" artifacts: paths: - build-clang-cpp14-release-qt5.15.1-iwyu-Vector-Checks/compile_commands.json diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 161c1c47..2cad2ff7 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -1,11 +1,5 @@ #!/bin/bash -COMPILER=$1 -LANGUAGE=$2 -BUILD_TYPE=$3 -QTVERSION=$4 -IWYU=$5 - # Exit script on any error set -e @@ -86,7 +80,7 @@ else BUILDPATH="$BUILDPATH-debug" fi -if [ "$IWYU" == "IWYU" ]; then +if [ "$IWYU" == "yes" ]; then echo "Include what you use enabled."; BUILDPATH="$BUILDPATH-iwyu" OPTIONS="$OPTIONS -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" diff --git a/CI/gitlab-ci/linux-iwyu-job.yml b/CI/gitlab-ci/linux-iwyu-job.yml index c2c88ddc..5f27eff7 100644 --- a/CI/gitlab-ci/linux-iwyu-job.yml +++ b/CI/gitlab-ci/linux-iwyu-job.yml @@ -6,11 +6,17 @@ iwyu-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: build - script: "CI/ci-linux-build.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}} {{QT_VERSION}} IWYU" + script: "CI/ci-linux-build.sh" image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch + variables: + COMPILER: "{{COMPILER}}" + LANGUAGE: "{{LANGUAGE}}" + BUILD_TYPE: "{{BUILDTYPE}}" + QTVERSION: "{{QT_VERSION}}" + IWYU: "yes" artifacts: paths: - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-iwyu-Vector-Checks/compile_commands.json diff --git a/CI/gitlab-ci/linux-template-build-job.yml b/CI/gitlab-ci/linux-template-build-job.yml index 9cae8caa..4462ac0e 100644 --- a/CI/gitlab-ci/linux-template-build-job.yml +++ b/CI/gitlab-ci/linux-template-build-job.yml @@ -7,11 +7,17 @@ build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: build - script: "CI/ci-linux-build.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}} {{QT_VERSION}}" + script: "CI/ci-linux-build.sh" #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch + variables: + COMPILER: "{{COMPILER}}" + LANGUAGE: "{{LANGUAGE}}" + BUILD_TYPE: "{{BUILDTYPE}}" + QTVERSION: "{{QT_VERSION}}" + IWYU: "no" artifacts: paths: - build-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}-{{BUILDTYPE}}/ diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index 7dc7fe8d..92f80d30 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -6,12 +6,18 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: test - script: "CI/ci-linux-test.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}} {{QT_VERSION}}" + script: "CI/ci-linux-test.sh" #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch - MultiThreads + variables: + COMPILER: "{{COMPILER}}" + LANGUAGE: "{{LANGUAGE}}" + BUILD_TYPE: "{{BUILDTYPE}}" + QTVERSION: "{{QT_VERSION}}" + IWYU: "no" dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}] needs: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}] artifacts: