diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-19 04:42:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-19 05:20:26 +0300 |
| commit | 645a813a037a784bde6a8e75e9a9494c91293b4e (patch) | |
| tree | 10eaad56e5600a3f9f4cf2a6393f5cdafce21763 | |
| parent | ba4b586441b9a2ef996020bb0f2ddd2e8f09badf (diff) | |
| download | serverdata-645a813a037a784bde6a8e75e9a9494c91293b4e.tar.gz serverdata-645a813a037a784bde6a8e75e9a9494c91293b4e.tar.bz2 serverdata-645a813a037a784bde6a8e75e9a9494c91293b4e.tar.xz serverdata-645a813a037a784bde6a8e75e9a9494c91293b4e.zip | |
Use gcc 4.9 in asan builds in .gitlab-ci.yml
| -rw-r--r-- | .gitlab-ci.yml | 13 | ||||
| -rwxr-xr-x | .tools/jobs/build.sh | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89795b55..a4f5f6ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ variables: build_test: stage: build script: + - export CC=gcc-6 - ./.tools/jobs/install.sh "mysql-client gcc-6 git-core @@ -90,8 +91,9 @@ mariadb_init_5.5: mysql_run_latest: stage: test script: + - export CC=gcc-4.9 - ./.tools/jobs/install.sh "mysql-client - gcc-6 + gcc-4.9 git-core make autoconf automake autopoint libtool libmysqlclient-dev libz-dev libpcre3-dev" @@ -99,15 +101,16 @@ mysql_run_latest: - ./.tools/jobs/initdb.sh mysql - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize" - ./.tools/jobs/runserver.sh mysql - image: debian:unstable + image: debian:jessie services: - mysql:latest mariadb_run_latest: stage: test script: + - export CC=gcc-4.9 - ./.tools/jobs/install.sh "mysql-client - gcc-6 + gcc-4.9 git-core make autoconf automake autopoint libtool libmysqlclient-dev libz-dev libpcre3-dev" @@ -115,13 +118,14 @@ mariadb_run_latest: - ./.tools/jobs/initdb.sh mariadb - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize" - ./.tools/jobs/runserver.sh mariadb - image: debian:unstable + image: debian:jessie services: - mariadb:latest mysql_run_valgrind_latest: stage: valgrind script: + - export CC=gcc-6 - ./.tools/jobs/install.sh "mysql-client gcc-6 git-core @@ -139,6 +143,7 @@ mysql_run_valgrind_latest: mariadb_run_valgrind_latest: stage: valgrind script: + - export CC=gcc-6 - ./.tools/jobs/install.sh "mysql-client gcc-6 git-core diff --git a/.tools/jobs/build.sh b/.tools/jobs/build.sh index 45848754..8b57f711 100755 --- a/.tools/jobs/build.sh +++ b/.tools/jobs/build.sh @@ -1,6 +1,5 @@ #!/bin/bash -export CC=gcc-6 export LOGFILE=gcc6.log source ./.tools/scripts/init.sh |