Skip to content

Commit ac095b5

Browse files
elmarcoPatchew Applier
authored andcommitted
WIP: gitlab-ci: enable rust for msys2-64bit
Currently fails with meson issue: mesonbuild/meson#14991 Signed-off-by: Marc-André Lureau <[email protected]> Message-Id: <[email protected]>
1 parent 72ae4ca commit ac095b5

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.gitlab-ci.d/windows.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ msys2-64bit:
1717
# This feature doesn't (currently) work with PowerShell, it stops
1818
# the echo'ing of commands being run and doesn't show any timing
1919
FF_SCRIPT_SECTIONS: 0
20-
CONFIGURE_ARGS: --disable-system --enable-tools -Ddebug=false -Doptimization=0
20+
CONFIGURE_ARGS: --disable-system --enable-tools -Ddebug=false -Doptimization=0 --enable-rust
2121
# The Windows git is a bit older so override the default
2222
GIT_FETCH_EXTRA_FLAGS: --no-tags --prune --quiet
2323
artifacts:
@@ -76,6 +76,7 @@ msys2-64bit:
7676
bison diffutils flex
7777
git grep make sed
7878
mingw-w64-x86_64-binutils
79+
mingw-w64-x86_64-ca-certificates
7980
mingw-w64-x86_64-ccache
8081
mingw-w64-x86_64-curl-winssl
8182
mingw-w64-x86_64-gcc
@@ -86,6 +87,9 @@ msys2-64bit:
8687
mingw-w64-x86_64-pixman
8788
mingw-w64-x86_64-pkgconf
8889
mingw-w64-x86_64-python
90+
mingw-w64-x86_64-python-certifi
91+
mingw-w64-x86_64-rust
92+
mingw-w64-x86_64-rust-bindgen
8993
mingw-w64-x86_64-zstd"
9094
- Write-Output "Running build at $(Get-Date -Format u)"
9195
- $env:JOBS = $(.\msys64\usr\bin\bash -lc nproc)
@@ -96,10 +100,12 @@ msys2-64bit:
96100
- $env:CCACHE_MAXSIZE = "500M"
97101
- $env:CCACHE_DEPEND = 1 # cache misses are too expensive with preprocessor mode
98102
- $env:CC = "ccache gcc"
103+
- $env:LIBCLANG_PATH = Join-Path -Path $PWD.Path -ChildPath "msys64/mingw64/bin"
99104
- mkdir build
100105
- cd build
101106
- ..\msys64\usr\bin\bash -lc "ccache --zero-stats"
102107
- ..\msys64\usr\bin\bash -lc "../configure $CONFIGURE_ARGS"
108+
- ..\msys64\usr\bin\bash -lc "make V=1 rust/util/bindings.inc.rs"
103109
- ..\msys64\usr\bin\bash -lc "make -j$env:JOBS"
104110
- ..\msys64\usr\bin\bash -lc "make check MTESTARGS='$TEST_ARGS' || { cat meson-logs/testlog.txt; exit 1; } ;"
105111
- ..\msys64\usr\bin\bash -lc "ccache --show-stats"

0 commit comments

Comments
 (0)