diff options
| author | Jordan Petridis <jpetridis@gnome.org> | 2019-07-18 12:28:00 +0300 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2019-08-02 12:29:47 -0400 |
| commit | 48bb97116f313c4122fac3484d894f445d1c4bee (patch) | |
| tree | 7b79b7fb70d499614f414f1606feab2ab27db565 | |
| parent | aaa1d01d382031c47f4df2a06d9288324e5b7b94 (diff) | |
| download | libnice-48bb97116f313c4122fac3484d894f445d1c4bee.tar.gz | |
CI: add basic msys2 build
For now it uses the gstreamer docker image and shared runner, based
on windows server 1607. The runner will migrate to windows 1807
soonish hopefully.
This commit also adds a glib wrap file needed to build
libnice.
| -rw-r--r-- | .gitlab-ci.yml | 33 | ||||
| -rw-r--r-- | subprojects/glib.wrap | 5 |
2 files changed, 38 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7212ffe..e57ac80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,6 +79,39 @@ build meson: paths: - build/ +build msys2: + image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v6' + stage: 'build' + tags: + - 'docker' + - 'windows' + - '1607' + variables: + MESON_ARGS: > + --prefix=${CI_PROJECT_DIR}/libnice-prefix + # Make sure any failure in PowerShell scripts is fatal + ErrorActionPreference: 'Stop' + WarningPreference: 'Stop' + before_script: + - pip3 install -U meson + script: + # For some reason, options are separated by newline instead of space, so we + # have to replace them first. + - $env:MESON_ARGS = $env:MESON_ARGS.replace("`n"," ") + + - $env:PATH += ";C:\msys64\usr\bin;C:\msys64\mingw64/bin;C:\msys64\mingw32/bin" + # Build and run the tests. + # This is part of the same job due to a bug in the gitlab-runner + # that prevents us from exporting artifacts with docker-windows + # executors. It has since been fixed in gitlab 12.1, but + # we are blocked from upgrading currently. + # + # Gitlab Runner issue: https://gitlab.com/gitlab-org/gitlab-runner/issues/4291 + # Blocked upgrade issue: https://gitlab.freedesktop.org/gstreamer/gst-ci/issues/6#note_192780 + - C:\msys64\usr\bin\bash -c "meson build $env:MESON_ARGS && + ninja -C build && + meson test -C build --print-errorlogs --suite libnice" + test meson: stage: test image: registry.freedesktop.org/libnice/libnice/centos7/meson-build diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap new file mode 100644 index 0000000..9dcc8ea --- /dev/null +++ b/subprojects/glib.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory=glib +url=https://gitlab.gnome.org/GNOME/glib.git +push-url=git@gitlab.gnome.org:GNOME/glib.git +revision=glib-2-58 |