diff --git a/utils/tests/gitlab-ci-clang.yml b/utils/tests/gitlab-ci-clang.yml index 0137f54fe..2db8ddef8 100644 --- a/utils/tests/gitlab-ci-clang.yml +++ b/utils/tests/gitlab-ci-clang.yml @@ -30,7 +30,6 @@ COMPILER: clang++-$CLANG LIBGSL: libgls23 - .weekly-build-clang-ubuntu22.04: image: ubuntu:22.04 extends: .base-build @@ -53,7 +52,6 @@ COMPILER: clang++-$CLANG LIBGSL: libgls27 - # CLANG 6 weekly-build-clang-6-debug: extends: .weekly-build-clang-ubuntu18.04 @@ -112,19 +110,19 @@ weekly-build-clang-11-optimized: MODE: optimized # CLANG 14 -weekly-build-clang-11-debug: +weekly-build-clang-14-debug: extends: .weekly-build-clang-ubuntu22.04 variables: CLANG: 14 MODE: debug -weekly-build-clang-11-default: +weekly-build-clang-14-default: extends: .weekly-build-clang-ubuntu22.04 variables: CLANG: 14 MODE: default -weekly-build-clang-11-optimized: +weekly-build-clang-14-optimized: extends: .weekly-build-clang-ubuntu22.04 variables: CLANG: 14 diff --git a/utils/tests/gitlab-ci-doc.yml b/utils/tests/gitlab-ci-doc.yml index e3ed9623a..f8e07d741 100644 --- a/utils/tests/gitlab-ci-doc.yml +++ b/utils/tests/gitlab-ci-doc.yml @@ -31,7 +31,7 @@ doxygen: - ./ns3 build assemble-introspected-command-line # - mkdir -p public/doxygen # The following four lines were needed when ns-3 had warnings, and -# it was necessary to have a filter to check only the files tocuhed by a MR. +# it was necessary to have a filter to check only the files touched by a MR. # - git remote add ns-3-origin https://gitlab.com/nsnam/ns-3-dev.git || true # - git fetch ns-3-origin # - export CHANGED_FILES=$(git diff --name-only ns-3-origin/master --diff-filter=d | tr '\n' ' ' | sed 's/ $//g;s/ /\\\|/g') @@ -54,7 +54,7 @@ doxygen: key: "ccache-$CI_JOB_NAME" paths: - $CCACHE_BASEDIR_VALUE/ - when: 'always' + when: "always" variables: CCACHE_BASEDIR_VALUE: ns-3-ccache-storage COMPILER: g++ diff --git a/utils/tests/gitlab-ci-test.yml b/utils/tests/gitlab-ci-test.yml index e9764d2f5..d989b0f6a 100644 --- a/utils/tests/gitlab-ci-test.yml +++ b/utils/tests/gitlab-ci-test.yml @@ -29,7 +29,7 @@ key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" paths: - $CCACHE_BASEDIR_VALUE/ - when: 'always' + when: "always" variables: COMPILER: g++ CCACHE_BASEDIR_VALUE: ns-3-ccache-storage diff --git a/utils/tests/gitlab-ci.yml b/utils/tests/gitlab-ci.yml index 131b2519d..83920249a 100644 --- a/utils/tests/gitlab-ci.yml +++ b/utils/tests/gitlab-ci.yml @@ -8,7 +8,6 @@ # As per Gitlab documentation, extends supports multi-level inheritance, # however it is not recommended to use more than three levels. - # Any scheduled pipeline should define a variable, named "RELEASE", that # indicates what this script is run for. Allowed values, for the moment, # are "daily" and "weekly" to denote a daily (or weekly) job. @@ -18,14 +17,12 @@ # documentation jobs each time that a commit is done. We use a different # configuration, still in definition. It will be in the documentation. - stages: - coding-style - build - test - documentation - ###################### BUILD STAGE ############################################# # Defines the steps to run the tests @@ -54,7 +51,7 @@ stages: key: "ccache-$CI_JOB_NAME" paths: - $CCACHE_BASEDIR_VALUE/ - when: 'always' + when: "always" timeout: 12h variables: CCACHE_BASEDIR_VALUE: ns-3-ccache-storage @@ -71,10 +68,9 @@ stages: before_script: - pacman-key --init - pacman -Syu --noconfirm - base-devel cmake ninja ccache + base-devel gcc clang cmake ninja ccache python boost gsl gtk3 - clang per-commit-clang-debug: extends: .base-per-commit-compile