diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2022-05-22 11:38:14 +0200 |
|---|---|---|
| committer | Christoph Reiter <creiter@src.gnome.org> | 2022-05-22 11:46:54 +0200 |
| commit | 2f695388e9ea90775dfef6b8020b6312e191bc4e (patch) | |
| tree | cd82bf9cb0ee485162e08c7bbecae7f37bb6fddb | |
| parent | f77f941401864c698446f1ce1e36e65d7209897f (diff) | |
| download | gtk+-2f695388e9ea90775dfef6b8020b6312e191bc4e.tar.gz | |
CI: bump meson version from 0.59 to 0.60.3
We pull in glib main via a submodule in CI and glib has recently
bumped its meson requirement to >= 0.60:
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2641
Install 0.60.3 where needed to make things build again.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7dccd22275..c2a742d86b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -173,7 +173,7 @@ macos: needs: [] before_script: - bash .gitlab-ci/show-info-osx.sh - - pip3 install --user meson==0.59 + - pip3 install --user meson==0.60.3 - pip3 install --user ninja - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH - export MESON_FORCE_BACKTRACE=1 diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index a3ac0a4719..cf8d9b130c 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar @echo on :: FIXME: make warnings fatal -pip3 install --upgrade --user meson==0.59 || goto :error +pip3 install --upgrade --user meson==0.60.3 || goto :error meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error ninja -C _build || goto :error |