ci: remove unnecessary environment variables (#22175)

5 files changed, 15 insertions, 21 deletions

diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml
index d6a5d1e43f..819380f351 100644
--- a/.github/actions/cache/action.yml
+++ b/.github/actions/cache/action.yml
@@ -16,7 +16,7 @@ runs:
     # files to search through.
     - uses: actions/cache@v3
       with:
-        path: ${{ env.CACHE_NVIM_DEPS_DIR }}
+        path: ${{ env.DEPS_BUILD_DIR }}
         key: ${{ env.CACHE_KEY }}-${{ hashFiles('cmake**', 'ci/**',
           '.github/workflows/ci.yml', 'CMakeLists.txt',
           'runtime/CMakeLists.txt', 'src/nvim/**/CMakeLists.txt') }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c171920d4f..c27100072f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,8 +85,8 @@ jobs:
       - if: success() || failure() && steps.abort_job.outputs.status == 'success'
         name: luacheck
         run: |
-          cmake -B $BUILD_DIR -G Ninja
-          cmake --build $BUILD_DIR --target lintlua-luacheck
+          cmake -B build -G Ninja
+          cmake --build build --target lintlua-luacheck
 
       - if: success() || failure() && steps.abort_job.outputs.status == 'success'
         name: lintsh
@@ -274,10 +274,10 @@ jobs:
       - name: Install minimum required version of cmake
         run: |
           curl --retry 5 --silent --show-error --fail -o /tmp/cmake-installer.sh "$CMAKE_URL"
-          mkdir -p "$HOME/.local/bin" /opt/cmake-custom
+          mkdir -p "$BIN_DIR" /opt/cmake-custom
           chmod a+x /tmp/cmake-installer.sh
           /tmp/cmake-installer.sh --prefix=/opt/cmake-custom --skip-license
-          ln -sfn /opt/cmake-custom/bin/cmake "$HOME/.local/bin/cmake"
+          ln -sfn /opt/cmake-custom/bin/cmake "$BIN_DIR/cmake"
           cmake_version="$(cmake --version | head -1)"
           echo "$cmake_version" | grep -qF "cmake version $CMAKE_VERSION" || {
             echo "Unexpected CMake version: $cmake_version"
@@ -300,8 +300,6 @@ jobs:
     timeout-minutes: 45
     env:
       DEPS_BUILD_DIR: ${{ github.workspace }}/nvim-deps
-      CACHE_NVIM_DEPS_DIR: ${{ github.workspace }}/nvim-deps
-      DEPS_PREFIX: ${{ github.workspace }}/nvim-deps/usr
     name: windows (MSVC_64)
     steps:
       - uses: actions/checkout@v3
@@ -318,7 +316,7 @@ jobs:
 
       - name: Build nvim
         run: |
-          cmake -B build -G Ninja -D CMAKE_BUILD_TYPE='RelWithDebInfo' -D DEPS_PREFIX="$env:DEPS_PREFIX" -D CI_BUILD=ON
+          cmake -B build -G Ninja -D CMAKE_BUILD_TYPE='RelWithDebInfo' -D CI_BUILD=ON
           cmake --build build
 
       - name: Install test deps
diff --git a/.github/workflows/env.sh b/.github/workflows/env.sh
index 08e5ad97ab..7be26e1a72 100755
--- a/.github/workflows/env.sh
+++ b/.github/workflows/env.sh
@@ -4,19 +4,17 @@ set -e -u
 FLAVOR=${1:-}
 
 BUILD_DIR=$CI_BUILD_DIR/build
-BIN_DIR=$HOME/.local/bin
+BIN_DIR=$CI_BUILD_DIR/bin
 DEPS_BUILD_DIR=$HOME/nvim-deps
-INSTALL_PREFIX=$HOME/nvim-install
+INSTALL_PREFIX=$CI_BUILD_DIR/nvim-install
 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=$DEPS_BUILD_DIR
-CACHE_MARKER=$CACHE_NVIM_DEPS_DIR/.ci_cache_marker
+CACHE_DIR=$CI_BUILD_DIR/.cache
 CACHE_UNCRUSTIFY=$CACHE_DIR/uncrustify
 DEPS_CMAKE_FLAGS=
 FUNCTIONALTEST=functionaltest
-CMAKE_FLAGS="-D CI_BUILD=ON -D CMAKE_BUILD_TYPE=Debug -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX -D BUSTED_OUTPUT_TYPE=nvim -D DEPS_PREFIX=$DEPS_BUILD_DIR/usr -D MIN_LOG_LEVEL=3"
+CMAKE_FLAGS="-D CI_BUILD=ON -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX -D MIN_LOG_LEVEL=3"
 CLANG_SANITIZER=
 ASAN_OPTIONS=
 UBSAN_OPTIONS=
@@ -57,6 +55,7 @@ esac
 cat <<EOF >> "$GITHUB_ENV"
 CMAKE_FLAGS=$CMAKE_FLAGS
 BUILD_DIR=$BUILD_DIR
+BIN_DIR=$BIN_DIR
 DEPS_BUILD_DIR=$DEPS_BUILD_DIR
 DEPS_CMAKE_FLAGS=$DEPS_CMAKE_FLAGS
 FUNCTIONALTEST=$FUNCTIONALTEST
@@ -64,9 +63,7 @@ INSTALL_PREFIX=$INSTALL_PREFIX
 LOG_DIR=$LOG_DIR
 NVIM_LOG_FILE=$NVIM_LOG_FILE
 VALGRIND_LOG=$VALGRIND_LOG
-CACHE_DIR=$HOME/.cache
-CACHE_NVIM_DEPS_DIR=$CACHE_NVIM_DEPS_DIR
-CACHE_MARKER=$CACHE_MARKER
+CACHE_DIR=$CACHE_DIR
 CACHE_UNCRUSTIFY=$CACHE_UNCRUSTIFY
 CLANG_SANITIZER=$CLANG_SANITIZER
 ASAN_OPTIONS=$ASAN_OPTIONS
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f547e27b3b..838caf3fca 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -112,8 +112,7 @@ jobs:
   windows:
     runs-on: windows-2019
     env:
-      DEPS_BUILD_DIR: ${{ format('{0}/nvim-deps', github.workspace) }}
-      DEPS_PREFIX: ${{ format('{0}/nvim-deps/usr', github.workspace) }}
+      DEPS_BUILD_DIR: ${{ github.workspace }}/nvim-deps
       CMAKE_BUILD_TYPE: "RelWithDebInfo"
     name: windows (MSVC_64)
     steps:
@@ -128,7 +127,7 @@ jobs:
           cmake --build $env:DEPS_BUILD_DIR
       - name: build package
         run: |
-          cmake -B build -G Ninja -DCMAKE_BUILD_TYPE='RelWithDebInfo' -DDEPS_PREFIX="$env:DEPS_PREFIX"
+          cmake -B build -G Ninja -DCMAKE_BUILD_TYPE='RelWithDebInfo'
           cmake --build build --target package
       - uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/vim-patches.yml b/.github/workflows/vim-patches.yml
index 159eb09e7c..305f8019f1 100644
--- a/.github/workflows/vim-patches.yml
+++ b/.github/workflows/vim-patches.yml
@@ -11,7 +11,7 @@ jobs:
       contents: write
       pull-requests: write
     env:
-      VIM_SOURCE_DIR: ${{ format('{0}/vim-src', github.workspace) }}
+      VIM_SOURCE_DIR: ${{ github.workspace }}/vim-src
       VERSION_BRANCH: marvim/ci-version-update
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps: