mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-20 16:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: remove environment variable DEPS_BUILD_DIR from CI

Browse Source 
If one uses .deps when DEPS_BUILD_DIR is defined in another location it
leads to very surprising behaviors, as it looks for libraries in other
places other than .deps.
This commit is contained in:
dundargoc
2023-03-09 12:27:20 +01:00
parent 236c20795e
commit 6cd7b5eeef
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/cache/action.yml vendored
View File

@@ -16,7 +16,7 @@ runs:
# files to search through. # files to search through.
- uses: actions/cache@v3 - uses: actions/cache@v3
with: with:
path: ${{ env.DEPS_BUILD_DIR }} path: .deps
key: ${{ env.CACHE_KEY }}-${{ hashFiles('cmake**', 'ci/**', key: ${{ env.CACHE_KEY }}-${{ hashFiles('cmake**', 'ci/**',
'.github/workflows/test.yml', 'CMakeLists.txt', '.github/workflows/test.yml', 'CMakeLists.txt',
'runtime/CMakeLists.txt', 'src/nvim/**/CMakeLists.txt') }} 'runtime/CMakeLists.txt', 'src/nvim/**/CMakeLists.txt') }}

17
.github/workflows/test.yml vendored
View File

@@ -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 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 BIN_DIR: ${{ github.workspace }}/bin
BUILD_DIR: ${{ github.workspace }}/build BUILD_DIR: ${{ github.workspace }}/build
DEPS_BUILD_DIR: ${{ github.workspace }}/nvim-deps
INSTALL_PREFIX: ${{ github.workspace }}/nvim-install INSTALL_PREFIX: ${{ github.workspace }}/nvim-install
LOG_DIR: ${{ github.workspace }}/build/log LOG_DIR: ${{ github.workspace }}/build/log
NVIM_LOG_FILE: ${{ github.workspace }}/build/.nvimlog NVIM_LOG_FILE: ${{ github.workspace }}/build/.nvimlog
@@ -72,8 +71,8 @@ jobs:
- name: Build third-party deps - name: Build third-party deps
run: | run: |
cmake -S cmake.deps -B $DEPS_BUILD_DIR -G Ninja cmake -S cmake.deps -B .deps -G Ninja
cmake --build $DEPS_BUILD_DIR cmake --build .deps
- if: success() || failure() && steps.abort_job.outputs.status == 'success' - if: success() || failure() && steps.abort_job.outputs.status == 'success'
name: configure name: configure
@@ -193,8 +192,8 @@ jobs:
- name: Build third-party deps - name: Build third-party deps
run: | run: |
cmake -S cmake.deps -B $DEPS_BUILD_DIR -G Ninja ${{ matrix.deps_flags }} cmake -S cmake.deps -B .deps -G Ninja ${{ matrix.deps_flags }}
cmake --build $DEPS_BUILD_DIR cmake --build .deps
- name: Build - name: Build
run: | run: |
@@ -273,8 +272,8 @@ jobs:
- name: Build third-party deps - name: Build third-party deps
run: | run: |
cmake -S cmake.deps -B $DEPS_BUILD_DIR -G "Ninja Multi-Config" cmake -S cmake.deps -B .deps -G "Ninja Multi-Config"
cmake --build $DEPS_BUILD_DIR cmake --build .deps
- name: Configure - name: Configure
run: cmake -B build -G "Ninja Multi-Config" -D CMAKE_C_COMPILER=gcc run: cmake -B build -G "Ninja Multi-Config" -D CMAKE_C_COMPILER=gcc
@@ -309,8 +308,8 @@ jobs:
- name: Build deps - name: Build deps
run: | run: |
cmake -S cmake.deps -B $env:DEPS_BUILD_DIR -G Ninja -D CMAKE_BUILD_TYPE='RelWithDebInfo' cmake -S cmake.deps -B .deps -G Ninja -D CMAKE_BUILD_TYPE='RelWithDebInfo'
cmake --build $env:DEPS_BUILD_DIR cmake --build .deps
- name: Build - name: Build
run: | run: |