From 392ec5a43f85c9442097e1804f6c30d47ad0f07e Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 14 Nov 2020 20:36:44 -0500 Subject: ci: Remove $CCACHE_CPP2 The env var is being set to the default value, as of ccache 3.3, which is available in Zesty and newer. All of our CI is using Bionic, so this is already available. --- .github/workflows/env.sh | 1 - .travis.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/.github/workflows/env.sh b/.github/workflows/env.sh index 8e005c7266..84f26f949e 100755 --- a/.github/workflows/env.sh +++ b/.github/workflows/env.sh @@ -24,7 +24,6 @@ DEPS_CMAKE_FLAGS=-DUSE_BUNDLED_GPERF=OFF FUNCTIONALTEST=functionaltest CCACHE_COMPRESS=1 CCACHE_SLOPPINESS=time_macros,file_macro -CCACHE_CPP2=1 EOF BUILD_FLAGS="CMAKE_FLAGS=-DCI_BUILD=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=$HOME/nvim-install -DBUSTED_OUTPUT_TYPE=nvim -DDEPS_PREFIX=$HOME/nvim-deps/usr -DMIN_LOG_LEVEL=3" diff --git a/.travis.yml b/.travis.yml index aad9b38934..2f4603fa5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,8 +54,6 @@ env: - CCACHE_COMPRESS=1 - CCACHE_SLOPPINESS=time_macros,file_macro - CCACHE_BASEDIR="$TRAVIS_BUILD_DIR" - # Default since 3.3, but Travis (Xenial) has 3.2.4; required with newer gcc/clang. - - CCACHE_CPP2=1 anchors: envs: &common-job-env -- cgit