From 48a26f91c3f604f6bd953a0a6241b1f8e30d8613 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Aug 2025 10:48:01 +1000 Subject: [PATCH] CI: change the wayland-web job to use rules "only: ..." is deprecated and we should be using rules Part-of: --- .gitlab-ci.yml | 15 ++++++--------- .gitlab-ci/ci.template | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fb6ddc0..b3d2adcd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1413,15 +1413,12 @@ build rpm: wayland-web: stage: deploy trigger: wayland/wayland.freedesktop.org - except: - refs: - - schedules variables: MESON_ARGS: '-Ddocumentation=true -Ddebug-gui=false -Dlibwacom=false -Dtests=false' MESON_BUILDDIR: 'builddir' - only: - refs: - - main - variables: - - $GITLAB_USER_LOGIN != "marge-bot" - - $CI_PROJECT_PATH == "libinput/libinput" + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' + when: never + - if: '$CI_COMMIT_BRANCH == "main" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO' + when: on_success + - when: never diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 007bc1c6..50752081 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -813,15 +813,12 @@ build rpm: wayland-web: stage: deploy trigger: wayland/wayland.freedesktop.org - except: - refs: - - schedules variables: MESON_ARGS: '-Ddocumentation=true -Ddebug-gui=false -Dlibwacom=false -Dtests=false' MESON_BUILDDIR: 'builddir' - only: - refs: - - main - variables: - - $GITLAB_USER_LOGIN != "marge-bot" - - $CI_PROJECT_PATH == "libinput/libinput" + rules: + - if: '$CI_PIPELINE_SOURCE == "schedule"' + when: never + - if: '$CI_COMMIT_BRANCH == "main" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO' + when: on_success + - when: never