From d134a82b58a63980180137db9d14b799fa486225 Mon Sep 17 00:00:00 2001 From: Ryan Burn Date: Mon, 23 Dec 2019 16:28:27 -0800 Subject: [PATCH 1/5] Add CI test for gcc48. --- .circleci/config.yml | 14 ++++++++++++++ ci/Dockerfile | 1 + ci/install_gcc48.sh | 6 ++++++ 3 files changed, 21 insertions(+) create mode 100755 ci/install_gcc48.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 0891134a47..c9a081d37c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,20 @@ jobs: path: /build/Testing/Temporary/LastTest.log destination: Test.log + gcc_48_test: + resource_class: xlarge + docker: + - image: ubuntu:18.04 + steps: + - checkout + - run: ./ci/setup_ci_environment.sh + - run: ./ci/setup_cmake.sh + - run: ./ci/install_gcc48.sh + - run: CXX=/usr/bin/g++-4.8 ./ci/do_ci.sh cmake.test + - store_artifacts: + path: /build/Testing/Temporary/LastTest.log + destination: Test.log + bazel_test: resource_class: xlarge docker: diff --git a/ci/Dockerfile b/ci/Dockerfile index 5aacc49366..d52d38e7b3 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -8,4 +8,5 @@ ADD install_bazelisk.sh /setup-ci RUN /setup-ci/setup_ci_environment.sh \ && /setup-ci/setup_cmake.sh \ + && /setup-ci/install_gcc48.sh \ && /setup-ci/install_bazelisk.sh diff --git a/ci/install_gcc48.sh b/ci/install_gcc48.sh new file mode 100755 index 0000000000..a9cf380b29 --- /dev/null +++ b/ci/install_gcc48.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -e +apt-get update +apt-get install --no-install-recommends --no-install-suggests -y \ + g++-4.8 From a8e7d5b374ba2c0c915ca6f1945355d1fc643cde Mon Sep 17 00:00:00 2001 From: Ryan Burn Date: Mon, 23 Dec 2019 16:29:06 -0800 Subject: [PATCH 2/5] Add gcc_48_test to circleci --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c9a081d37c..aa589a414e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,4 +44,5 @@ workflows: build_and_test: jobs: - cmake_test + - gcc_48_test - bazel_test From 5b3380d6a5a208fec36f25ebce89d2e7769a6132 Mon Sep 17 00:00:00 2001 From: Ryan Burn Date: Mon, 23 Dec 2019 16:35:02 -0800 Subject: [PATCH 3/5] Use bazel to test old compiler. --- .circleci/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa589a414e..750a19a5a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,10 +23,7 @@ jobs: - run: ./ci/setup_ci_environment.sh - run: ./ci/setup_cmake.sh - run: ./ci/install_gcc48.sh - - run: CXX=/usr/bin/g++-4.8 ./ci/do_ci.sh cmake.test - - store_artifacts: - path: /build/Testing/Temporary/LastTest.log - destination: Test.log + - run: CXX=/usr/bin/g++-4.8 ./ci/do_ci.sh bazel.test bazel_test: resource_class: xlarge From 21c52eb4d7e0c6a7df0ac5bdb5377ceb24ad994f Mon Sep 17 00:00:00 2001 From: Ryan Burn Date: Mon, 23 Dec 2019 16:38:03 -0800 Subject: [PATCH 4/5] Fix gcc-48 CI. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 750a19a5a3..543c5b4bca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: steps: - checkout - run: ./ci/setup_ci_environment.sh - - run: ./ci/setup_cmake.sh + - run: ./ci/install_bazelisk.sh - run: ./ci/install_gcc48.sh - run: CXX=/usr/bin/g++-4.8 ./ci/do_ci.sh bazel.test From f1991999bc4130e9b2804ca974add47d51ae61cc Mon Sep 17 00:00:00 2001 From: Ryan Burn Date: Mon, 23 Dec 2019 16:40:14 -0800 Subject: [PATCH 5/5] Use CC instead of CXX --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 543c5b4bca..35d2918a88 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ jobs: - run: ./ci/setup_ci_environment.sh - run: ./ci/install_bazelisk.sh - run: ./ci/install_gcc48.sh - - run: CXX=/usr/bin/g++-4.8 ./ci/do_ci.sh bazel.test + - run: CC=/usr/bin/g++-4.8 ./ci/do_ci.sh bazel.test bazel_test: resource_class: xlarge