diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2022-08-04 22:21:37 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2022-08-04 22:26:04 +0200 |
| commit | efe100df9e52a27991bad7a60d3907fe0c8542cb (patch) | |
| tree | 7fb44067a2aa89e5da95cc12f1dfb8081a26ef9d /.gitlab-ci | |
| parent | a07ee709d257ba793d827eaa30302dd8cb847955 (diff) | |
| download | gtk+-efe100df9e52a27991bad7a60d3907fe0c8542cb.tar.gz | |
CI: remove workaround for some subproject builds failing on Windows
In some cases subproject builds under MSYS2 failed, see
https://gitlab.gnome.org/GNOME/gtk/-/issues/2243
https://gitlab.gnome.org/GNOME/gtk/-/issues/3002
https://gitlab.gnome.org/GNOME/gtk/-/issues/5053
These manual pango/glib build instructions were added to work around
the problem by avoiding the subprojects.
https://gitlab.gnome.org/GNOME/gtk/-/issues/5053 uncovered the bug in
binutils, which is now fixed in master there and was also backported
into MSYS2 which we use in CI.
So we can just remove the workaround again now.
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/test-msys2.sh | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 0929a6133c..ddd66c185f 100644 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -38,25 +38,6 @@ mkdir -p _ccache export CCACHE_BASEDIR="$(pwd)" export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" -# https://gitlab.gnome.org/GNOME/gtk/-/issues/2243 -# https://gitlab.gnome.org/GNOME/gtk/-/issues/3002 - -if ! pkg-config --atleast-version=2.66.0 glib-2.0; then - git clone https://gitlab.gnome.org/GNOME/glib.git _glib - meson setup _glib_build _glib - meson compile -C _glib_build - meson install -C _glib_build -fi -pkg-config --modversion glib-2.0 - -if ! pkg-config --atleast-version=1.50.0 pango; then - git clone https://gitlab.gnome.org/GNOME/pango.git _pango - meson setup _pango_build _pango - meson compile -C _pango_build - meson install -C _pango_build -fi -pkg-config --modversion pango - # Build ccache --zero-stats ccache --show-stats |