From 40068b2359b4935ae3d93615416177aef63bd623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 25 Oct 2025 12:05:46 +0200 Subject: [PATCH] ci: Consistently use dashes in job/stage names We currently have a mix of dashes and underscores, with the former being predominantly used by newer jobs, so settle on that. Part-of: --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b1a15f4..e2068b7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ include: tarball-artifact-path: "$TARBALL_ARTIFACT_PATH" stages: - - pre_review + - pre-review - prepare - review - build @@ -30,7 +30,7 @@ variables: MESON_BUILD_DIR: build TARBALL_ARTIFACT_PATH: "${MESON_BUILD_DIR}/meson-dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.xz" -.pipeline_guard: &pipeline_guard +.pipeline-guard: &pipeline_guard rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_COMMIT_TAG' @@ -38,15 +38,15 @@ variables: - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/' - when: 'manual' -.prereview_req: &prereview_req +.prereview-req: &prereview_req needs: - - check_commit_log + - check-commit-log - check-merge-request -check_commit_log: +check-commit-log: extends: - .fdo.ci-fairy - stage: pre_review + stage: pre-review script: - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ; then @@ -65,7 +65,7 @@ check_commit_log: check-merge-request: extends: - .fdo.ci-fairy - stage: pre_review + stage: pre-review script: - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ; then @@ -82,14 +82,14 @@ check-merge-request: junit: check-merge-request-report.xml check-reuse: - stage: pre_review + stage: pre-review image: name: fsfe/reuse:latest entrypoint: [""] script: - reuse lint -js_check: +js-check: stage: review <<: *prereview_req script: @@ -106,7 +106,7 @@ eslint: reports: junit: "$LINT_LOG" -potfile_js_check: +potfile-js-check: stage: review <<: *prereview_req script: