Skip to content

Commit c70b172

Browse files
authored
Merge pull request #1146 from ychin/github-actions-fix-tests
Fix MacVim GitHub Actions CI tests
2 parents 7caffe5 + b9058dd commit c70b172

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/ci-macvim.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ env:
2727
HAS_GETTEXT: 1
2828

2929
BASH_SILENCE_DEPRECATION_WARNING: 1
30+
TERM: xterm
3031

3132
jobs:
3233

@@ -108,8 +109,11 @@ jobs:
108109
set -o verbose
109110
NPROC=$(getconf _NPROCESSORS_ONLN) && echo "Building MacVim with ${NPROC} cores"
110111
make -j${NPROC}
111-
- name: Show Vim version
112-
run: ${VIMCMD} --version
112+
- name: Check version
113+
run: |
114+
${VIMCMD} --version
115+
${VIMCMD} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
116+
${VIMCMD} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
113117
- name: Smoketest
114118
run: |
115119
set -o errexit
@@ -141,11 +145,9 @@ jobs:
141145
run: make -C runtime/doc vimtags VIMEXE=../../src/MacVim/build/Release/MacVim.app/Contents/bin/vim
142146

143147
- name: Test
144-
if: false # TODO: Tests are failing, turn off temporarily to unblock
145148
timeout-minutes: 20
146149
run: make test
147150
- name: Test GUI
148-
if: false # TODO: Tests are failing, turn off temporarily to unblock
149151
timeout-minutes: 20
150152
run: make -C src/testdir clean && make -C src testgui
151153

0 commit comments

Comments
 (0)