aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordundargoc <gocdundar@gmail.com>2023-03-09 12:27:30 +0100
committerdundargoc <gocdundar@gmail.com>2023-03-11 09:38:29 +0100
commit5aaed9cbfccec009ac91f6a576d72584a061d63c (patch)
tree7ad9dac51f158814ff8b8e6b0e73cb14be8a1490
parent6cd7b5eeef6728a66b73865f39e29688920a5960 (diff)
downloadrneovim-5aaed9cbfccec009ac91f6a576d72584a061d63c.tar.gz
rneovim-5aaed9cbfccec009ac91f6a576d72584a061d63c.tar.bz2
rneovim-5aaed9cbfccec009ac91f6a576d72584a061d63c.zip
ci: test build with external dependencies on every pull request
Only testing the build with external dependencies on build system changes is too naive, as demonstrated by b9f19d3e286d95d9209afbc479fa2eb908067fb1.
-rw-r--r--.github/workflows/build.yml43
-rw-r--r--.github/workflows/test.yml45
2 files changed, 45 insertions, 43 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10e3e2bdeb..fa1f74e4d1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,46 +71,3 @@ jobs:
- name: Install
run: make install
-
- with-external-deps:
- runs-on: ubuntu-22.04
- timeout-minutes: 10
- steps:
- - uses: actions/checkout@v3
-
- - name: Install dependencies
- run: |
- sudo add-apt-repository ppa:neovim-ppa/stable
- ./.github/scripts/install_deps.sh
- sudo apt-get install -y \
- libluajit-5.1-dev \
- libmsgpack-dev \
- libtermkey-dev \
- libtree-sitter-dev \
- libunibilium-dev \
- libuv1-dev \
- lua-busted \
- lua-filesystem \
- lua-inspect \
- lua-lpeg \
- lua-nvim \
- luajit
- # libvterm-dev \
- # lua-luv-dev
-
- # Remove comments from packages once we start using these external
- # dependencies.
-
- - name: Build third-party deps
- run: |
- # Ideally all dependencies should external for this job, but some
- # dependencies don't have the required version available. We use the
- # bundled versions for these with the hopes of being able to remove them
- # later on.
- cmake -S cmake.deps -B .deps -G Ninja -D USE_BUNDLED=OFF -D USE_BUNDLED_LUV=ON -D USE_BUNDLED_LIBVTERM=ON
- cmake --build .deps
-
- - name: Build
- run: |
- cmake -B build -G Ninja
- cmake --build build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a43c84d6bf..69da867012 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -359,3 +359,48 @@ jobs:
$env:PATH = "C:\msys64\usr\bin;$env:PATH"
& "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path test\old\testdir) VERBOSE=1
$env:PATH = $OldPath
+
+ with-external-deps:
+ runs-on: ubuntu-22.04
+ timeout-minutes: 10
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Install dependencies
+ run: |
+ sudo add-apt-repository ppa:neovim-ppa/stable
+ ./.github/scripts/install_deps.sh
+ sudo apt-get install -y \
+ libluajit-5.1-dev \
+ libmsgpack-dev \
+ libtermkey-dev \
+ libtree-sitter-dev \
+ libunibilium-dev \
+ libuv1-dev \
+ lua-busted \
+ lua-filesystem \
+ lua-inspect \
+ lua-lpeg \
+ lua-nvim \
+ luajit
+ # libvterm-dev \
+ # lua-luv-dev
+
+ # Remove comments from packages once we start using these external
+ # dependencies.
+
+ - uses: ./.github/actions/cache
+
+ - name: Build third-party deps
+ run: |
+ # Ideally all dependencies should external for this job, but some
+ # dependencies don't have the required version available. We use the
+ # bundled versions for these with the hopes of being able to remove them
+ # later on.
+ cmake -S cmake.deps -B .deps -G Ninja -D USE_BUNDLED=OFF -D USE_BUNDLED_LUV=ON -D USE_BUNDLED_LIBVTERM=ON
+ cmake --build .deps
+
+ - name: Build
+ run: |
+ cmake -B build -G Ninja
+ cmake --build build