Skip to content

Commit 97f3a44

Browse files
committed
Fixup for Win32 CI build
- Fix GCC 14+ pointer-type error by converting to warning - Disable doc build - cleanup after Ruby MSYS2 install to avoid conflicts
1 parent 6a49856 commit 97f3a44

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
- uses: ruby/setup-ruby@v1
2424
with:
2525
ruby-version: '3'
26+
- name: Clean Ruby MSYS2 temp directory
27+
run: Remove-Item -Recurse -Force D:\a\_temp\msys64
28+
shell: pwsh
2629
- uses: msys2/setup-msys2@v2
2730
with:
2831
msystem: MINGW32

core/alsp_src/win32/gcc_makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ CC=gcc -m32
1616

1717
# Added -Wno-error=pointer-sign to avoid blocking errors in socket code
1818

19-
CFLAGS += -MMD -Wall -Wextra -Wno-unused-parameter
19+
CFLAGS += -MMD -Wall -Wextra -Wno-unused-parameter -Wno-incompatible-pointer-types

win32/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ all: standard
22

33
core:
44
$(MAKE) -C ../core/win32 all
5-
$(MAKE) -C ../docs all
5+
: $(MAKE) -C ../docs all
6+
mkdir -p ../docs/_local_site
67
cd ../foreign_sdk/win32 ; ./make.bat
78

89
odbc:
@@ -22,5 +23,5 @@ test: core
2223

2324
distclean:
2425
$(MAKE) -C ../core/win32 distclean
25-
$(MAKE) -C ../docs clean
26+
: $(MAKE) -C ../docs clean
2627
sh ../unix/superclean.sh

0 commit comments

Comments
 (0)