Skip to content

Commit e7c765f

Browse files
h-eastchrisbra
authored andcommitted
patch 9.1.1840: Generating prototype files does not work on all platforms
Problem: Generating prototype files does not work on all platforms Solution: Rework prototypes generation using python instead of cproto, enable it in CI to test it for each PR (Hirohito Higashi). closes: #18045 Signed-off-by: Hirohito Higashi <h.east.727@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent ce5f9f4 commit e7c765f

File tree

160 files changed

+1755
-1555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+1755
-1555
lines changed

.github/MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,7 @@ src/po/ru.po @RestorerZ
689689
src/po/sr.po @eevan78
690690
src/po/tr.po @bitigchi
691691
src/po/uk.po @sakhnik
692+
src/proto/gen_prototypes.py @h-east
692693
src/xxd/ @jnweiger
693694

694695
# vim:ft=codeowners

.github/workflows/ci.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
architecture: arm64
8585
- features: normal
8686
compiler: gcc
87-
extra: [vimtags]
87+
extra: [vimtags, proto]
8888
- features: huge
8989
compiler: gcc
9090
extra: [no_x11]
@@ -182,6 +182,9 @@ jobs:
182182
libattr1-dev
183183
)
184184
fi
185+
if ${{ contains(matrix.extra, 'proto') }}; then
186+
PKGS+=( python3-clang )
187+
fi
185188
sudo apt-get update && sudo apt-get upgrade -y --allow-downgrades && sudo apt-get install -y --allow-downgrades "${PKGS[@]}"
186189
187190
- name: Install gcc-${{ env.GCC_VER }}
@@ -270,6 +273,9 @@ jobs:
270273
if ${{ contains(matrix.extra, 'vimtags') }}; then
271274
echo "TEST=-C runtime/doc vimtags VIMEXE=../../${SRCDIR}/vim"
272275
fi
276+
if ${{ contains(matrix.extra, 'proto') }}; then
277+
echo "TEST=-C src protoclean proto"
278+
fi
273279
echo "CFLAGS=${CFLAGS}"
274280
echo "CONFOPT=${CONFOPT}"
275281
# Disables GTK attempt to integrate with the accessibility service that does run in CI.
@@ -354,6 +360,15 @@ jobs:
354360
true
355361
)
356362
363+
- name: Generate Proto files
364+
if: contains(matrix.extra, 'proto')
365+
run: |
366+
# This will exit with an error code if the generated proto files differ from source
367+
(
368+
git diff --exit-code -- src/proto/
369+
true
370+
)
371+
357372
- name: Generate gcov files
358373
if: matrix.coverage
359374
run: |

Filelist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ SRC_ALL = \
251251
src/testdir/viewdumps.vim \
252252
src/proto.h \
253253
src/protodef.h \
254+
src/proto/gen_prototypes.py \
254255
src/proto/alloc.pro \
255256
src/proto/arabic.pro \
256257
src/proto/arglist.pro \

0 commit comments

Comments
 (0)