diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfd41f2..6f7dcb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ variables: rules: - if: $CI_COMMIT_TAG when: never - - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" + #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* script: @@ -39,7 +39,7 @@ variables: stage: Test image: python:latest rules: - - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" + #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* @@ -55,7 +55,7 @@ variables: rules: - if: $CI_COMMIT_TAG when: never - - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" + #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* @@ -73,7 +73,7 @@ variables: rules: - if: $CI_COMMIT_TAG when: never - - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" + #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* @@ -89,7 +89,7 @@ variables: rules: - if: $CI_COMMIT_TAG when: never - - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" + #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* diff --git a/test/existing_valid_theme_set/theme.json b/test/existing_valid_theme_set/theme.json index 8c3678f..99cedfd 100644 --- a/test/existing_valid_theme_set/theme.json +++ b/test/existing_valid_theme_set/theme.json @@ -5,8 +5,8 @@ "nightImageList": [ 2 ], - "sunsetImageList": [], "sunriseImageList": [], + "sunsetImageList": [], "imageFilename": "stray__*.jpg", "imageCredits": "©Thoscellen, ©BlueTwelve", "displayName": "Stray" diff --git a/test/missing_tag_set/theme.json b/test/missing_tag_set/theme.json index ce8667a..cbdd46e 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": "BL3", + "imageCredits": "© Gearbox", "dayImageList": [ 2 ],