diff options
| -rw-r--r-- | .github/actions/cache/action.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml index da36c71a1d..07f8feaa84 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.DEPS_BUILD_DIR }} + path: .deps key: ${{ env.CACHE_KEY }}-${{ hashFiles('cmake**', 'ci/**', '.github/workflows/test.yml', 'CMakeLists.txt', 'runtime/CMakeLists.txt', 'src/nvim/**/CMakeLists.txt') }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 22be9bf719..a43c84d6bf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,6 @@ env: ASAN_OPTIONS: detect_leaks=1:check_initialization_order=1:handle_abort=1:handle_sigill=1:log_path=${{ github.workspace }}/build/log/asan:intercept_tls_get_addr=0 BIN_DIR: ${{ github.workspace }}/bin BUILD_DIR: ${{ github.workspace }}/build - DEPS_BUILD_DIR: ${{ github.workspace }}/nvim-deps INSTALL_PREFIX: ${{ github.workspace }}/nvim-install LOG_DIR: ${{ github.workspace }}/build/log NVIM_LOG_FILE: ${{ github.workspace }}/build/.nvimlog @@ -72,8 +71,8 @@ jobs: - name: Build third-party deps run: | - cmake -S cmake.deps -B $DEPS_BUILD_DIR -G Ninja - cmake --build $DEPS_BUILD_DIR + cmake -S cmake.deps -B .deps -G Ninja + cmake --build .deps - if: success() || failure() && steps.abort_job.outputs.status == 'success' name: configure @@ -193,8 +192,8 @@ jobs: - name: Build third-party deps run: | - cmake -S cmake.deps -B $DEPS_BUILD_DIR -G Ninja ${{ matrix.deps_flags }} - cmake --build $DEPS_BUILD_DIR + cmake -S cmake.deps -B .deps -G Ninja ${{ matrix.deps_flags }} + cmake --build .deps - name: Build run: | @@ -273,8 +272,8 @@ jobs: - name: Build third-party deps run: | - cmake -S cmake.deps -B $DEPS_BUILD_DIR -G "Ninja Multi-Config" - cmake --build $DEPS_BUILD_DIR + cmake -S cmake.deps -B .deps -G "Ninja Multi-Config" + cmake --build .deps - name: Configure run: cmake -B build -G "Ninja Multi-Config" -D CMAKE_C_COMPILER=gcc @@ -309,8 +308,8 @@ jobs: - name: Build deps run: | - cmake -S cmake.deps -B $env:DEPS_BUILD_DIR -G Ninja -D CMAKE_BUILD_TYPE='RelWithDebInfo' - cmake --build $env:DEPS_BUILD_DIR + cmake -S cmake.deps -B .deps -G Ninja -D CMAKE_BUILD_TYPE='RelWithDebInfo' + cmake --build .deps - name: Build run: | |