Commit c2ef0ce6 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Use gcc 8 (instead of gcc 7) and drop gcc 6.2 in CI jobs

parent 75c420e0
......@@ -8,7 +8,7 @@ image: gitlab-registry.cern.ch/lhcb-core/lbdocker/centos7-build
variables:
NO_LBLOGIN: "1"
TARGET_BRANCH: master
BINARY_TAG: x86_64-centos7-gcc7-opt
BINARY_TAG: x86_64-centos7-gcc8-opt
BUILDDIR: build-opt
TESTS_REPORT: "test_report"
LCG_hostos: "x86_64-centos7"
......@@ -16,12 +16,12 @@ variables:
LCG_contrib: "/cvmfs/sft.cern.ch/lcg/contrib"
CCACHE_VERSION: "3.3.4-e92e5"
build:gcc7:opt:
build:gcc8:opt:
stage: build
tags:
- cvmfs
variables:
BINARY_TAG: x86_64-centos7-gcc7-opt
BINARY_TAG: x86_64-centos7-gcc8-opt
BUILDDIR: build-opt
script:
- ci-utils/build
......@@ -31,12 +31,12 @@ build:gcc7:opt:
- .ccache
expire_in: 1 week
build:gcc7:dbg:
build:gcc8:dbg:
stage: build
tags:
- cvmfs
variables:
BINARY_TAG: x86_64-centos7-gcc7-dbg
BINARY_TAG: x86_64-centos7-gcc8-dbg
BUILDDIR: build-dbg
script:
- ci-utils/build
......@@ -46,21 +46,6 @@ build:gcc7:dbg:
- .ccache
expire_in: 1 week
build:gcc62:opt:
stage: build
tags:
- cvmfs
variables:
BINARY_TAG: x86_64-centos7-gcc62-opt
BUILDDIR: build-gcc62
script:
- ci-utils/build
artifacts:
paths:
- ${BUILDDIR}
- .ccache
expire_in: 1 week
check-formatting:
stage: build
dependencies: []
......@@ -78,14 +63,14 @@ check-formatting:
doxygen:
stage: test
dependencies:
- build:gcc7:opt
- build:gcc8:opt
tags:
- cvmfs
only:
- master
- tags
variables:
BINARY_TAG: x86_64-centos7-gcc7-opt
BINARY_TAG: x86_64-centos7-gcc8-opt
BUILDDIR: build-opt
script:
- . ci-utils/env_setup.sh
......@@ -100,14 +85,14 @@ doxygen:
- public
expire_in: 1 day
test:gcc7:opt:
test:gcc8:opt:
stage: test
dependencies:
- build:gcc7:opt
- build:gcc8:opt
tags:
- cvmfs
variables:
BINARY_TAG: x86_64-centos7-gcc7-opt
BINARY_TAG: x86_64-centos7-gcc8-opt
BUILDDIR: build-opt
script:
- ci-utils/test
......@@ -117,14 +102,14 @@ test:gcc7:opt:
when: always
expire_in: 1 week
test:gcc7:dbg:
test:gcc8:dbg:
stage: test
dependencies:
- build:gcc7:dbg
- build:gcc8:dbg
tags:
- cvmfs
variables:
BINARY_TAG: x86_64-centos7-gcc7-dbg
BINARY_TAG: x86_64-centos7-gcc8-dbg
BUILDDIR: build-dbg
script:
- ci-utils/test
......@@ -134,32 +119,14 @@ test:gcc7:dbg:
when: always
expire_in: 1 week
test:gcc62:opt:
stage: test
dependencies:
- build:gcc62:opt
tags:
- cvmfs
variables:
BINARY_TAG: x86_64-centos7-gcc62-opt
BUILDDIR: build-gcc62
TESTS_REPORT: test_report-gcc62
script:
- ci-utils/test
artifacts:
paths:
- ${TESTS_REPORT}
when: always
expire_in: 1 week
test_public_headers_build:
stage: test
dependencies:
- build:gcc7:opt
- build:gcc8:opt
tags:
- cvmfs
variables:
BINARY_TAG: x86_64-centos7-gcc7-opt
BINARY_TAG: x86_64-centos7-gcc8-opt
BUILDDIR: build-opt
script:
- ci-utils/test_public_headers_build
......
# default values for some variables defined in .gitlab-ci.yml
: ${TARGET_BRANCH:=master}
: ${BINARY_TAG:=x86_64-centos7-gcc7-opt}
: ${BINARY_TAG:=x86_64-centos7-gcc8-opt}
: ${BUILDDIR:=build.${BINARY_TAG}}
: ${TESTS_REPORT:=test_report}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment