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 ],