diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-23 17:22:11 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-23 17:56:53 +0200 |
| commit | 1b301fc7e525d51ff0f9de8e09aee313623b2ee9 (patch) | |
| tree | 18af9b9c6b9d2688cfda1cafd4a1393b9c802032 | |
| parent | f9e52f720deba675d27b57dede09c3df89358f9a (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-clang_tidy_modernize.tar.gz | |
[build] Deprecated GCC 4.9 and set the minimum to GCC 5upstream/tmpsantos-clang_tidy_modernize
| -rw-r--r-- | circle.yml | 4 | ||||
| -rw-r--r-- | scripts/ci/Dockerfile | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/circle.yml b/circle.yml index 0ce326d64d..bf86a9807b 100644 --- a/circle.yml +++ b/circle.yml @@ -78,12 +78,12 @@ workflows: metrics: true style_tests: true - build-template: - name: linux-gcc4.9-release + name: linux-gcc5-release executor_name: ubuntu-disco target_is_linux: true requires: - linux-gcc8-release - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9' + config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5' build_params: '--target mbgl-glfw' test_params: '-N -Q' - build-template: diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile index e82c9703ef..8234e80c64 100644 --- a/scripts/ci/Dockerfile +++ b/scripts/ci/Dockerfile @@ -72,9 +72,7 @@ RUN set -eu \ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F \ && add-apt-repository "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" \ && add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe" \ - && apt-get install -y \ - g++-4.9 \ - g++-5 + && apt-get install -y g++-5 # Install Android NDK RUN set -eu \ |