mirror of
				https://github.com/neovim/neovim.git
				synced 2025-10-26 12:27:24 +00:00 
			
		
		
		
	Merge pull request #19713 from lewis6991/rmccache
ci(cache): remove ccache
This commit is contained in:
		
							
								
								
									
										7
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -42,7 +42,6 @@ jobs: | ||||
|             autoconf \ | ||||
|             automake \ | ||||
|             build-essential \ | ||||
|             ccache \ | ||||
|             cmake \ | ||||
|             flake8 \ | ||||
|             gettext \ | ||||
| @@ -97,7 +96,6 @@ jobs: | ||||
|         with: | ||||
|           path: | | ||||
|             ${{ env.CACHE_NVIM_DEPS_DIR }} | ||||
|             ~/.ccache | ||||
|           key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!cmake.deps/**CMakeLists.txt') }}-${{ github.base_ref }} | ||||
|  | ||||
|       - name: Build third-party deps | ||||
| @@ -190,7 +188,7 @@ jobs: | ||||
|         if: matrix.os == 'linux' | ||||
|         run: | | ||||
|           sudo apt-get update | ||||
|           sudo apt-get install -y autoconf automake build-essential ccache cmake cpanminus cscope gcc-multilib gdb gettext language-pack-tr libtool-bin locales ninja-build pkg-config python3 python3-pip python3-setuptools unzip valgrind xclip | ||||
|           sudo apt-get install -y autoconf automake build-essential cmake cpanminus cscope gcc-multilib gdb gettext language-pack-tr libtool-bin locales ninja-build pkg-config python3 python3-pip python3-setuptools unzip valgrind xclip | ||||
|  | ||||
|       - name: Install minimum required version of cmake | ||||
|         if: matrix.cmake == 'minimum_required' | ||||
| @@ -222,7 +220,7 @@ jobs: | ||||
|         if: matrix.os == 'osx' | ||||
|         run: | | ||||
|           brew update --quiet | ||||
|           brew install automake ccache cpanminus ninja | ||||
|           brew install automake cpanminus ninja | ||||
|  | ||||
|       - name: Setup interpreter packages | ||||
|         run: ./ci/install.sh | ||||
| @@ -232,7 +230,6 @@ jobs: | ||||
|         with: | ||||
|           path: | | ||||
|             ${{ env.CACHE_NVIM_DEPS_DIR }} | ||||
|             ~/.ccache | ||||
|           key: ${{ matrix.runner }}-${{ matrix.flavor }}-${{ matrix.cc }}-${{ hashFiles('cmake/*', 'cmake.deps/**', '**/CMakeLists.txt') }}-${{ github.base_ref }} | ||||
|  | ||||
|       - name: Build third-party deps | ||||
|   | ||||
							
								
								
									
										5
									
								
								.github/workflows/env.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/env.sh
									
									
									
									
										vendored
									
									
								
							| @@ -8,7 +8,6 @@ $HOME/.local/bin | ||||
| EOF | ||||
|  | ||||
| cat <<EOF >> "$GITHUB_ENV" | ||||
| CACHE_ENABLE=true | ||||
| CI_BUILD_DIR=$GITHUB_WORKSPACE | ||||
| BUILD_DIR=$GITHUB_WORKSPACE/build | ||||
| DEPS_BUILD_DIR=$HOME/nvim-deps | ||||
| @@ -20,10 +19,6 @@ CACHE_NVIM_DEPS_DIR=$HOME/.cache/nvim-deps | ||||
| CACHE_MARKER=$HOME/.cache/nvim-deps/.ci_cache_marker | ||||
| CACHE_UNCRUSTIFY=$HOME/.cache/uncrustify | ||||
| UNCRUSTIFY_VERSION=uncrustify-0.75.0 | ||||
| CCACHE_BASEDIR=$GITHUB_WORKSPACE | ||||
| CCACHE_COMPRESS=1 | ||||
| CCACHE_SLOPPINESS=time_macros,file_macro | ||||
| CCACHE_DIR=$HOME/.ccache | ||||
| EOF | ||||
|  | ||||
| DEPS_CMAKE_FLAGS= | ||||
|   | ||||
| @@ -12,11 +12,6 @@ mkdir -p "${HOME}/.cache" | ||||
| echo "before_cache.sh: cache size" | ||||
| du -chd 1 "${HOME}/.cache" | sort -rh | head -20 | ||||
|  | ||||
| echo "before_cache.sh: ccache stats" | ||||
| ccache -s 2>/dev/null || true | ||||
| # Do not keep ccache stats (uploaded to cache otherwise; reset initially anyway). | ||||
| find "${HOME}/.ccache" -name stats -delete | ||||
|  | ||||
| # Update the third-party dependency cache only if the build was successful. | ||||
| if ended_successfully && [ -d "${DEPS_BUILD_DIR}" ]; then | ||||
|   # Do not cache downloads.  They should not be needed with up-to-date deps. | ||||
|   | ||||
| @@ -16,11 +16,6 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the | ||||
|   exit 1 | ||||
| fi | ||||
|  | ||||
| echo "before_script.sh: ccache stats (will be cleared)" | ||||
| ccache -s | ||||
| # Reset ccache stats for real results in before_cache. | ||||
| ccache --zero-stats | ||||
|  | ||||
| # Compile dependencies. | ||||
| build_deps | ||||
|  | ||||
|   | ||||
| @@ -24,9 +24,7 @@ build_deps() { | ||||
|   mkdir -p "${DEPS_BUILD_DIR}" | ||||
|  | ||||
|   # Use cached dependencies if $CACHE_MARKER exists. | ||||
|   if test "${CACHE_ENABLE}" = "false" ; then | ||||
|     export CCACHE_RECACHE=1 | ||||
|   elif test -f "${CACHE_MARKER}" ; then | ||||
|   if test -f "${CACHE_MARKER}"; then | ||||
|     echo "Using third-party dependencies from cache (last update: $(_stat "${CACHE_MARKER}"))." | ||||
|     cp -a "${CACHE_NVIM_DEPS_DIR}"/. "${DEPS_BUILD_DIR}" | ||||
|   fi | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 bfredl
					bfredl