diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-05-23 12:33:30 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-05-23 12:33:30 +0000 |
| commit | e82fb8e894ad4fa5471ceb82daf75ac455bf38ad (patch) | |
| tree | 54543ca0c1158ae7c64753f74c5b1554e27630d6 | |
| parent | 111daecd3bcfebc23c98b1c4f206a3024d1c38b2 (diff) | |
| parent | 2f695388e9ea90775dfef6b8020b6312e191bc4e (diff) | |
| download | gtk+-e82fb8e894ad4fa5471ceb82daf75ac455bf38ad.tar.gz | |
Merge branch 'ci-meson-bump' into 'main'
CI: bump meson version from 0.59 to 0.60.3
See merge request GNOME/gtk!4751
| -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 |