aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2020-11-14 20:36:44 -0500
committerJames McCoy <jamessan@jamessan.com>2020-11-14 21:28:59 -0500
commit392ec5a43f85c9442097e1804f6c30d47ad0f07e (patch)
treede5e163a35d6052f00b784f59bcccee5b03867c3
parent5271f1e2c9d6df15244cb4f7d8b63d88abc6717b (diff)
downloadrneovim-392ec5a43f85c9442097e1804f6c30d47ad0f07e.tar.gz
rneovim-392ec5a43f85c9442097e1804f6c30d47ad0f07e.tar.bz2
rneovim-392ec5a43f85c9442097e1804f6c30d47ad0f07e.zip
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.
-rwxr-xr-x.github/workflows/env.sh1
-rw-r--r--.travis.yml2
2 files changed, 0 insertions, 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