gitlab CI: trigger the wayland website pipeline directly

See the documentation here:
https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#trigger-a-pipeline-when-an-upstream-project-is-rebuilt

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf7b9a6..1f6598d 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -904,19 +904,10 @@ build rpm:
     - meson dist --no-test
     - rpmbuild -ta meson-dist/libinput*.tar.xz
 
+
 wayland-web:
-  image: alpine:latest
   stage: deploy
-  script:
-    - apk add curl
-    # Requirements:
-    # - variable WAYLAND_WEB_TOKEN defined as type File in libinput's CI/CD settings
-    # - content of that file is the token value, as generated by the Pipeline Triggers
-    #   of the wayland.freedesktop.org project.
-    - curl --request POST
-           --form "token=<$WAYLAND_WEB_TOKEN"
-           --form ref=master
-           https://gitlab.freedesktop.org/api/v4/projects/wayland${SLASH}wayland${DOT}freedesktop${DOT}org/trigger/pipeline
+  trigger: wayland/wayland.freedesktop.org
   except:
     refs:
       - schedules
@@ -925,7 +916,3 @@ wayland-web:
       - master
     variables:
       - $CI_PROJECT_PATH == "libinput/libinput"
-  dependencies: []
-  variables:
-    DOT: "%2E"
-    SLASH: "%2F"

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 76c7e11..821f39d 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -707,19 +707,10 @@ build rpm:
     - meson dist --no-test
     - rpmbuild -ta meson-dist/libinput*.tar.xz
 
+
 wayland-web:
-  image: alpine:latest
   stage: deploy
-  script:
-    - apk add curl
-    # Requirements:
-    # - variable WAYLAND_WEB_TOKEN defined as type File in libinput's CI/CD settings
-    # - content of that file is the token value, as generated by the Pipeline Triggers
-    #   of the wayland.freedesktop.org project.
-    - curl --request POST
-           --form "token=<$WAYLAND_WEB_TOKEN"
-           --form ref=master
-           https://gitlab.freedesktop.org/api/v4/projects/wayland${SLASH}wayland${DOT}freedesktop${DOT}org/trigger/pipeline
+  trigger: wayland/wayland.freedesktop.org
   except:
     refs:
       - schedules
@@ -728,8 +719,4 @@ wayland-web:
       - master
     variables:
       - $CI_PROJECT_PATH == "libinput/libinput"
-  dependencies: []
-  variables:
-    DOT: "%2E"
-    SLASH: "%2F"