ci: use meson 1.1.1 in the 1.22 branch Windows CI

[platform/upstream/gstreamer.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0d4319..3f3c59f 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ variables:
   GIT_DEPTH: 1
 
   # Branch to track for modules that have no ref specified in the manifest
-  GST_UPSTREAM_BRANCH: 'main'
+  GST_UPSTREAM_BRANCH: '1.22'
 
   FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'
 
@@ -152,8 +152,6 @@ gst-indent amd64 docker:
 
 windows amd64 docker:
   stage: "preparation"
-  needs:
-    - "trigger"
   timeout: '3h'
   variables:
     # Unlike the buildah/linux jobs, this file
@@ -361,6 +359,9 @@ build clang fedora x86_64:
         *modules_changes
     - changes:
         - subprojects/win-*/*
+  before_script:
+    # Install more recent version. We need at least 0.63 for diff_files support in wraps
+    - pip3 install -U meson==1.1.1
   script:
     # Make sure powershell exits on errors
     # https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_preference_variables?view=powershell-6
@@ -472,7 +473,6 @@ build msys2 :
     - >
       ./gst-env.py
       gst-validate-launcher ${TEST_SUITE}
-      --check-bugs
       --dump-on-failure
       --mute
       --shuffle
@@ -677,6 +677,10 @@ valgrind ges:
       - subprojects/gst-plugins-bad/**/*
       - subprojects/gst-editing-services/**/*
       - subprojects/gst-python/**/*
+  # valgrind ges jobs are racy across the board and simply fail too often.
+  # Someone needs to go through job logs and figure out which jobs to mark
+  # as flaky. Until then, just ignore failures.
+  allow_failure: true
 
 # ---- Integration ----- #