Simon/Wallset
1
1
Fork 0
Code Issues 21 Pull Requests 1 Actions Packages Projects 2 Releases Activity

Merge branch 'cicd' into 'main'

Browse Source 
Règle la CI pour se déclencher après une demande de fusion

See merge request Thoscellen/Wallset!7
This commit is contained in:
Simon
2023-05-18 13:15:09 +00:00
parent 4d394dc080 6ec4d836cc
commit 226a3a3856
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -73,6 +73,7 @@ variables:
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
changes: changes:
- ${ENTRY_FOLDER}/${PACKAGE_NAME}/* - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
@@ -88,6 +89,7 @@ variables:
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
changes: changes:
- ${ENTRY_FOLDER}/${PACKAGE_NAME}/* - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*

2
test/missing_tag_set/theme.json
View File

@@ -1,7 +1,7 @@
{ {
"imageFilename": "bl3_landscape_*.jpg", "imageFilename": "bl3_landscape_*.jpg",
"imageCredits": "© Gearbox", "imageCredits": "© Gearbox",
"displayName": "", "displayName": "BL3",
"dayImageList": [ "dayImageList": [
2 2
], ],