diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-22 15:35:03 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-22 18:10:28 +0200 |
| commit | fc3b9c72841b00db7a594098fe7b3c245ffdb6c8 (patch) | |
| tree | eee49158a8fc2f53fedddb49b6f9132d0d70a753 | |
| parent | e0d0bbec5bfc1ac91a51bf3ed386fa9aabacdae0 (diff) | |
| download | gobject-introspection-fc3b9c72841b00db7a594098fe7b3c245ffdb6c8.tar.gz | |
ci: add a msvc job
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 21 | ||||
| -rw-r--r-- | tests/scanner/meson.build | 6 |
3 files changed, 38 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1b0c3cf..17759dd4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,3 +90,15 @@ msys2-mingw32-python3: name: "gi-_%CI_COMMIT_REF_NAME%" paths: - _build/meson-logs + +vs2017-x64-python3: + stage: build + tags: + - win32 + script: + - .gitlab-ci/test-msvc.bat + artifacts: + when: on_failure + name: "gi-_%CI_COMMIT_REF_NAME%" + paths: + - _build/meson-logs diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat new file mode 100644 index 00000000..6812f942 --- /dev/null +++ b/.gitlab-ci/test-msvc.bat @@ -0,0 +1,21 @@ +@echo on +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 +@echo on + +py -3 -c "import urllib.request, sys; urllib.request.urlretrieve(*sys.argv[1:])" "https://github.com/lexxmark/winflexbison/releases/download/v2.5.14/win_flex_bison-2.5.14.zip" win_flex_bison.zip +py -3 -m zipfile -e win_flex_bison.zip win_flex_bison + +py -3 -c "import urllib.request, sys; urllib.request.urlretrieve(*sys.argv[1:])" "https://sourceforge.net/projects/pkgconfiglite/files/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip/download" pkg-config-lite-0.28-1.zip +py -3 -m zipfile -e pkg-config-lite-0.28-1.zip . + +SET PATH=%CD%\pkg-config-lite-0.28-1\bin;%CD%\win_flex_bison;%PATH% + +pip3 install --upgrade --user meson==0.47.1 || goto :error +meson _build || goto :error +ninja -C _build || goto :error + +meson test -C _build --suite=gobject-introspection || goto :error + +goto :EOF +:error +exit /b 1 diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build index e64345a0..86c7d5da 100644 --- a/tests/scanner/meson.build +++ b/tests/scanner/meson.build @@ -4,7 +4,6 @@ scanner_test_env.append('PYTHONPATH', join_paths(meson.current_build_dir(), '../ scanner_test_files = [ 'test_shlibs.py', - 'test_sourcescanner.py', ] # FIXME: Windows @@ -12,6 +11,11 @@ if host_system != 'windows' scanner_test_files += ['test_transformer.py'] endif +# FIXME: MSVC +if cc.get_id() != 'msvc' + scanner_test_files += ['test_sourcescanner.py'] +endif + foreach f : scanner_test_files test(f, python, args: files(f), env: scanner_test_env) endforeach |