From 0c753c1df646e5b8befdfa66ce55c4459ade9574 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Thu, 7 Apr 2022 13:39:49 +0100
Subject: [PATCH] ci: Move the valgrind job definition

Move it closer to the `scan-build` and `coverity` jobs, which are both
also `.only-schedules`. This makes the job order in the CI file a bit
more logical.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
---
 .gitlab-ci.yml | 72 +++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5c664576..d2c039d24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -219,42 +219,6 @@ G_DISABLE_ASSERT:
       - "_build/meson-logs"
       - "_build/${CI_JOB_NAME}-report.xml"
 
-valgrind:
-  extends:
-    - .build-linux
-    - .only-schedules
-  image: $FEDORA_IMAGE
-  stage: analysis
-  needs: []
-  variables:
-    MESON_TEST_TIMEOUT_MULTIPLIER: 10
-  script:
-    - meson ${MESON_COMMON_OPTIONS}
-            --werror
-            -Dsystemtap=true
-            -Ddtrace=true
-            -Dinstalled_tests=true
-            _build
-    - ninja -C _build
-    - bash -x ./.gitlab-ci/run-tests.sh
-                 --log-file _build/meson-logs/testlog-valgrind.json
-                 --wrap "valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes --leak-check=full --leak-resolution=high --num-callers=50 --show-leak-kinds=definite,possible --show-error-list=yes --suppressions=${CI_PROJECT_DIR}/glib.supp"
-                 --no-suite no-valgrind
-                 --no-suite slow
-  # FIXME: Remove this when we have zero valgrind leaks.
-  # https://gitlab.gnome.org/GNOME/glib/issues/333
-  allow_failure: true
-  artifacts:
-    reports:
-      junit: "_build/${CI_JOB_NAME}-report.xml"
-    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
-    when: always
-    expire_in: 1 week
-    paths:
-      - "_build/config.h"
-      - "_build/glib/glibconfig.h"
-      - "_build/meson-logs"
-
 .cross-build-linux:
   extends: .build-linux
   stage: build
@@ -554,6 +518,42 @@ coverity:
     paths:
       - "cov-int/build-log.txt"
 
+valgrind:
+  extends:
+    - .build-linux
+    - .only-schedules
+  image: $FEDORA_IMAGE
+  stage: analysis
+  needs: []
+  variables:
+    MESON_TEST_TIMEOUT_MULTIPLIER: 10
+  script:
+    - meson ${MESON_COMMON_OPTIONS}
+            --werror
+            -Dsystemtap=true
+            -Ddtrace=true
+            -Dinstalled_tests=true
+            _build
+    - ninja -C _build
+    - bash -x ./.gitlab-ci/run-tests.sh
+                 --log-file _build/meson-logs/testlog-valgrind.json
+                 --wrap "valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes --leak-check=full --leak-resolution=high --num-callers=50 --show-leak-kinds=definite,possible --show-error-list=yes --suppressions=${CI_PROJECT_DIR}/glib.supp"
+                 --no-suite no-valgrind
+                 --no-suite slow
+  # FIXME: Remove this when we have zero valgrind leaks.
+  # https://gitlab.gnome.org/GNOME/glib/issues/333
+  allow_failure: true
+  artifacts:
+    reports:
+      junit: "_build/${CI_JOB_NAME}-report.xml"
+    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: always
+    expire_in: 1 week
+    paths:
+      - "_build/config.h"
+      - "_build/glib/glibconfig.h"
+      - "_build/meson-logs"
+
 pages:
   stage: deploy
   only: