From ec932961cc5596009f3179edd620bc778a1503d7 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Thu, 9 Feb 2023 21:13:03 +0100
Subject: ci: inline internal caching script to Github actions (#22192)

I don't think it's possible to meaningfully abstract away caching on
multiple providers, as each provider has different mechanisms
on how they work.
---
 .github/workflows/ci.yml | 9 ---------
 .github/workflows/env.sh | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d1a6b5dcaa..f80c34fe96 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,9 +110,6 @@ jobs:
         run: |
           git diff --color --exit-code
 
-      - name: Cache dependencies
-        run: ./ci/before_cache.sh
-
   lintc:
     # This job tests two things: it lints the code but also builds neovim using
     # system dependencies instead of bundled dependencies. This is to make sure
@@ -173,9 +170,6 @@ jobs:
       - if: success() || failure() && steps.abort_job.outputs.status == 'success'
         run: cmake --build build --target clang-tidy
 
-      - name: Cache dependencies
-        run: ./ci/before_cache.sh
-
   posix:
     name: ${{ matrix.runner }} ${{ matrix.flavor }} (cc=${{ matrix.cc }})
     strategy:
@@ -282,9 +276,6 @@ jobs:
         name: Install nvim
         run: ./ci/run_tests.sh install_nvim
 
-      - name: Cache dependencies
-        run: ./ci/before_cache.sh
-
   windows:
     runs-on: windows-2019
     timeout-minutes: 45
diff --git a/.github/workflows/env.sh b/.github/workflows/env.sh
index 24d85fc23c..08e5ad97ab 100755
--- a/.github/workflows/env.sh
+++ b/.github/workflows/env.sh
@@ -11,7 +11,7 @@ LOG_DIR=$BUILD_DIR/log
 NVIM_LOG_FILE=$BUILD_DIR/.nvimlog
 VALGRIND_LOG=$LOG_DIR/valgrind-%p.log
 CACHE_DIR=$HOME/.cache
-CACHE_NVIM_DEPS_DIR=$CACHE_DIR/nvim-deps
+CACHE_NVIM_DEPS_DIR=$DEPS_BUILD_DIR
 CACHE_MARKER=$CACHE_NVIM_DEPS_DIR/.ci_cache_marker
 CACHE_UNCRUSTIFY=$CACHE_DIR/uncrustify
 DEPS_CMAKE_FLAGS=
-- 
cgit