diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f7dcb1..093db2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,9 +18,9 @@ variables: stage: Manifest image: node:latest rules: + #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - if: $CI_COMMIT_TAG when: never - #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* script: @@ -53,9 +53,9 @@ variables: stage: Bundle image: javieraviles/zip:latest rules: + #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - 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}/* @@ -71,9 +71,9 @@ variables: stage: Distribute image: curlimages/curl:latest rules: + #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - 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}/* @@ -87,9 +87,9 @@ variables: stage: Release image: registry.gitlab.com/gitlab-org/release-cli:latest rules: + #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - 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/existing_valid_theme_set/theme.json b/test/existing_valid_theme_set/theme.json index 99cedfd..a3a35d5 100644 --- a/test/existing_valid_theme_set/theme.json +++ b/test/existing_valid_theme_set/theme.json @@ -2,12 +2,12 @@ "dayImageList": [ 1 ], + "imageFilename": "stray__*.jpg", "nightImageList": [ 2 ], + "imageCredits": "©Thoscellen, ©BlueTwelve", "sunriseImageList": [], "sunsetImageList": [], - "imageFilename": "stray__*.jpg", - "imageCredits": "©Thoscellen, ©BlueTwelve", "displayName": "Stray" } \ No newline at end of file