From 6ec4d836cce126a5019f48f9b4375e681e5437bb Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 18 May 2023 13:15:09 +0000 Subject: [PATCH] =?UTF-8?q?R=C3=A8gle=20la=20CI=20pour=20se=20d=C3=A9clenc?= =?UTF-8?q?her=20apr=C3=A8s=20une=20demande=20de=20fusion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 ++ test/missing_tag_set/theme.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f96e3d3..bfd41f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,6 +73,7 @@ variables: rules: - if: $CI_COMMIT_TAG when: never + - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* @@ -88,6 +89,7 @@ variables: rules: - if: $CI_COMMIT_TAG when: never + - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* diff --git a/test/missing_tag_set/theme.json b/test/missing_tag_set/theme.json index 3add1bb..ce8667a 100644 --- a/test/missing_tag_set/theme.json +++ b/test/missing_tag_set/theme.json @@ -1,7 +1,7 @@ { "imageFilename": "bl3_landscape_*.jpg", "imageCredits": "© Gearbox", - "displayName": "", + "displayName": "BL3", "dayImageList": [ 2 ],