Skip to content

Commit cc43421

Browse files
committed
Fix MacVim CI not re-generating help tags properly
We previously added a step to rebuild the Vim help tags when publishing so that we could get the latest tags when generating a MacVim release (sometimes Vim's runtime is lagging behind and doesn't have that done). However, the step was so placed so far back (after building/testing) that it doesn't actually do anything, as MacVim was already built. Move it earlier so we build MacVim after vimtags are re-generated. As part of doing this we also need to split building Vim itself earlier as vimtags generation requires having a Vim binary. So the updated steps are 1. Vim, 2. help tags, 3. MacVim, 4. Tests. Previously they were 1. Vim/MacVim, 2. Tests, 3. help tags.
1 parent 08d6d41 commit cc43421

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

.github/workflows/ci-macvim.yaml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,27 @@ jobs:
158158
cat src/auto/config.mk
159159
cat src/auto/config.h
160160
161-
- name: Build
161+
# Build Vim first, separately from MacVim, so that we can use it to run
162+
# vimtags afterwards to get the most correct help tags before we copy
163+
# that into the MacVim bundle.
164+
- name: Build Vim
165+
env:
166+
LC_ALL: C
167+
run: |
168+
set -o verbose
169+
170+
NPROC=$(getconf _NPROCESSORS_ONLN)
171+
echo "Building Vim with ${NPROC} cores"
172+
173+
make -C src -j${NPROC} Vim
174+
175+
# Re-generate Vim help tags, because sometimes the Vim's runtime is not
176+
# updated to have the latest tags.
177+
- name: Update Vim help tags
178+
if: matrix.publish
179+
run: make -C runtime/doc vimtags VIMEXE=../../src/vim
180+
181+
- name: Build MacVim
162182
env:
163183
LC_ALL: C
164184
run: |
@@ -210,10 +230,6 @@ jobs:
210230
check_arch "${VIM_BIN}"
211231
check_arch "${MACVIM_BIN}"
212232
213-
- name: Update Vim help tags
214-
if: matrix.publish
215-
run: make -C runtime/doc vimtags VIMEXE=../../${VIM_BIN}
216-
217233
- name: Test
218234
timeout-minutes: 20
219235
run: make test

0 commit comments

Comments
 (0)