Compare commits

..

21 Commits

Author SHA1 Message Date
bcb37ce6a9 fix(#5): Actualise les métadonnées liés au Copyright 2023-07-15 22:13:19 +02:00
90fd647107 Fix(#5):Corrige une typo dans le nom des images 2023-07-15 22:13:06 +02:00
a3147e55d8 Fix(#5):Supprime les images en doublon 2023-07-15 22:12:36 +02:00
9ed214a29d feat(#5): Publie le set "Frozen Wastelands - Borderlands 3"
Publie le set "Frozen Wastelands"
2023-07-15 22:11:22 +02:00
Simon
ec5443b9f6 Merge branch 'HFW_Weat_Tuft' into 'main'
Weat Tuft - Horizon Forbidden West

See merge request Thoscellen/Wallset!13
2023-07-15 19:59:28 +00:00
Simon
f3f61781e0 Weat Tuft - Horizon Forbidden West 2023-07-15 19:59:28 +00:00
Simon
8df11cd258 Merge branch 'HFW_Three_Spires_Mountain' into 'main'
Three Spires Mountain - Horizon Forbidden West

See merge request Thoscellen/Wallset!12
2023-07-15 19:49:44 +00:00
Simon
519b4a11e1 Three Spires Mountain - Horizon Forbidden West 2023-07-15 19:49:44 +00:00
2aa87bae00 Corrige l'assignation spot jour et nuit 2023-05-19 20:36:04 +02:00
Simon
4599ca2ccd Publie le set "Sanctuary Bay - Borderlands 3"
Fusionne la branche 'BL3_Sanctuary_Bay' dans 'main'
Voir la demande de fusion Thoscellen/Wallset!11
2023-05-18 22:43:44 +00:00
125cb732ee Publie le set "Sanctuary Bay - Borderlands 3" 2023-05-19 00:35:20 +02:00
Simon
aae97ec78a Merge branch 'BL2_frozen_wastelands' into 'main'
feat(#5): Publie le set "Frozen Wastelands"

See merge request Thoscellen/Wallset!10
2023-05-18 22:09:47 +00:00
Simon
f1845c7101 feat(#5): Publie le set "Frozen Wastelands" 2023-05-18 22:09:46 +00:00
Simon
f56b7877dc Merge branch 'BL2_frozen_wasteland' into 'main'
See merge request Thoscellen/Wallset!8
2023-05-18 21:40:52 +00:00
Simon
181caf6092 Publie le set "Frozen Wastelands" 2023-05-18 21:40:52 +00:00
Simon
e31f02cd38 Merge branch 'cicd' into 'main'
Tente un fixe pour la pipeline.

See merge request Thoscellen/Wallset!9
2023-05-18 21:17:34 +00:00
Simon
123733def0 Tente un fixe pour la pipeline. 2023-05-18 21:17:34 +00:00
Simon
226a3a3856 Merge branch 'cicd' into 'main'
Règle la CI pour se déclencher après une demande de fusion

See merge request Thoscellen/Wallset!7
2023-05-18 13:15:09 +00:00
Simon
6ec4d836cc Règle la CI pour se déclencher après une demande de fusion 2023-05-18 13:15:09 +00:00
Simon
4d394dc080 Merge branch 'cicd' into 'main'
Détecte si un thème est déjà présent

See merge request Thoscellen/Wallset!6
2023-05-18 12:30:10 +00:00
Simon
d541628920 Détecte si un thème est déjà présent 2023-05-18 12:30:10 +00:00
108 changed files with 166 additions and 155 deletions

5
.gitignore vendored
View File

@@ -4,4 +4,7 @@
# Ignore python stuff
**/__pycache__
**/.pytest_cache
**/.pytest_cache
# Ignore les fichiers système de MacOS
**/.DS_Store

View File

@@ -9,8 +9,8 @@ stages:
- Release
variables:
ENTRY_FOLDER: $CI_PROJECT_DIR/test # test directory for testing CI/CD, or assets directory for normal operations
RELEASE_VERSION: v0.$CI_PIPELINE_IID
ENTRY_FOLDER: assets
RELEASE_VERSION: v$CI_PIPELINE_IID
PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE_NAME}/${RELEASE_VERSION}"
# Jobs from here run on Merge Requests as prerequisite for merging.
@@ -20,14 +20,13 @@ variables:
rules:
- if: $CI_COMMIT_TAG
when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
- changes:
- ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
script:
- cd src/
- npm install
- npm run start
- cat ${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
- cat ../${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
- npm run test
artifacts:
paths:
@@ -39,7 +38,6 @@ variables:
stage: Test
image: python:latest
rules:
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes:
- ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
@@ -55,7 +53,6 @@ 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}/*
@@ -73,7 +70,6 @@ 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}/*
@@ -89,7 +85,6 @@ 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}/*

View File

@@ -0,0 +1,32 @@
manifest-job/BL2_frozen_wastelands:
variables:
PACKAGE_NAME: "BL2_frozen_wastelands"
extends: .manifest-job
test-images-job/BL2_frozen_wastelands:
needs:
- manifest-job/BL2_frozen_wastelands
variables:
PACKAGE_NAME: "BL2_frozen_wastelands"
extends: .test-job
bundle-job/BL2_frozen_wastelands:
needs:
- manifest-job/BL2_frozen_wastelands
variables:
PACKAGE_NAME: "BL2_frozen_wastelands"
extends: .bundle-job
upload-job/BL2_frozen_wastelands:
needs:
- bundle-job/BL2_frozen_wastelands
variables:
PACKAGE_NAME: "BL2_frozen_wastelands"
extends: .upload-job
release-job/BL2_frozen_wastelands:
needs:
- upload-job/BL2_frozen_wastelands
variables:
PACKAGE_NAME: "BL2_frozen_wastelands"
extends: .release-job

View File

@@ -0,0 +1,32 @@
manifest-job/BL3_Sanctuary_Bay:
variables:
PACKAGE_NAME: "BL3_Sanctuary_Bay"
extends: .manifest-job
test-images-job/BL3_Sanctuary_Bay:
needs:
- manifest-job/BL3_Sanctuary_Bay
variables:
PACKAGE_NAME: "BL3_Sanctuary_Bay"
extends: .test-job
bundle-job/BL3_Sanctuary_Bay:
needs:
- manifest-job/BL3_Sanctuary_Bay
variables:
PACKAGE_NAME: "BL3_Sanctuary_Bay"
extends: .bundle-job
upload-job/BL3_Sanctuary_Bay:
needs:
- bundle-job/BL3_Sanctuary_Bay
variables:
PACKAGE_NAME: "BL3_Sanctuary_Bay"
extends: .upload-job
release-job/BL3_Sanctuary_Bay:
needs:
- upload-job/BL3_Sanctuary_Bay
variables:
PACKAGE_NAME: "BL3_Sanctuary_Bay"
extends: .release-job

View File

@@ -0,0 +1,32 @@
manifest-job/HFW_Three_Spires_Mountain:
variables:
PACKAGE_NAME: "HFW_Three_Spires_Mountain"
extends: .manifest-job
test-images-job/HFW_Three_Spires_Mountain:
needs:
- manifest-job/HFW_Three_Spires_Mountain
variables:
PACKAGE_NAME: "HFW_Three_Spires_Mountain"
extends: .test-job
bundle-job/HFW_Three_Spires_Mountain:
needs:
- manifest-job/HFW_Three_Spires_Mountain
variables:
PACKAGE_NAME: "HFW_Three_Spires_Mountain"
extends: .bundle-job
upload-job/HFW_Three_Spires_Mountain:
needs:
- bundle-job/HFW_Three_Spires_Mountain
variables:
PACKAGE_NAME: "HFW_Three_Spires_Mountain"
extends: .upload-job
release-job/HFW_Three_Spires_Mountain:
needs:
- upload-job/HFW_Three_Spires_Mountain
variables:
PACKAGE_NAME: "HFW_Three_Spires_Mountain"
extends: .release-job

32
.gitlab/HFW_Weat_Tuft.yml Normal file
View File

@@ -0,0 +1,32 @@
manifest-job/HFW_Weat_Tuft:
variables:
PACKAGE_NAME: "HFW_Weat_Tuft"
extends: .manifest-job
test-images-job/HFW_Weat_Tuft:
needs:
- manifest-job/HFW_Weat_Tuft
variables:
PACKAGE_NAME: "HFW_Weat_Tuft"
extends: .test-job
bundle-job/HFW_Weat_Tuft:
needs:
- manifest-job/HFW_Weat_Tuft
variables:
PACKAGE_NAME: "HFW_Weat_Tuft"
extends: .bundle-job
upload-job/HFW_Weat_Tuft:
needs:
- bundle-job/HFW_Weat_Tuft
variables:
PACKAGE_NAME: "HFW_Weat_Tuft"
extends: .upload-job
release-job/HFW_Weat_Tuft:
needs:
- upload-job/HFW_Weat_Tuft
variables:
PACKAGE_NAME: "HFW_Weat_Tuft"
extends: .release-job

View File

@@ -1,32 +0,0 @@
manifest-job/existing_valid_theme_set:
variables:
PACKAGE_NAME: "existing_valid_theme_set"
extends: .manifest-job
test-images-job/existing_valid_theme_set:
needs:
- manifest-job/existing_valid_theme_set
variables:
PACKAGE_NAME: "existing_valid_theme_set"
extends: .test-job
bundle-job/existing_valid_theme_set:
needs:
- manifest-job/existing_valid_theme_set
variables:
PACKAGE_NAME: "existing_valid_theme_set"
extends: .bundle-job
upload-job/existing_valid_theme_set:
needs:
- bundle-job/existing_valid_theme_set
variables:
PACKAGE_NAME: "existing_valid_theme_set"
extends: .upload-job
release-job/existing_valid_theme_set:
needs:
- upload-job/existing_valid_theme_set
variables:
PACKAGE_NAME: "existing_valid_theme_set"
extends: .release-job

View File

@@ -1,32 +0,0 @@
manifest-job/missing_tag_set:
variables:
PACKAGE_NAME: "missing_tag_set"
extends: .manifest-job
test-images-job/missing_tag_set:
needs:
- manifest-job/missing_tag_set
variables:
PACKAGE_NAME: "missing_tag_set"
extends: .test-job
bundle-job/missing_tag_set:
needs:
- manifest-job/missing_tag_set
variables:
PACKAGE_NAME: "missing_tag_set"
extends: .bundle-job
upload-job/missing_tag_set:
needs:
- bundle-job/missing_tag_set
variables:
PACKAGE_NAME: "missing_tag_set"
extends: .upload-job
release-job/missing_tag_set:
needs:
- upload-job/missing_tag_set
variables:
PACKAGE_NAME: "missing_tag_set"
extends: .release-job

View File

@@ -1,32 +0,0 @@
manifest-job/unbalanced_set:
variables:
PACKAGE_NAME: "unbalanced_set"
extends: .manifest-job
test-images-job/unbalanced_set:
needs:
- manifest-job/unbalanced_set
variables:
PACKAGE_NAME: "unbalanced_set"
extends: .test-job
bundle-job/unbalanced_set:
needs:
- manifest-job/unbalanced_set
variables:
PACKAGE_NAME: "unbalanced_set"
extends: .bundle-job
upload-job/unbalanced_set:
needs:
- bundle-job/unbalanced_set
variables:
PACKAGE_NAME: "unbalanced_set"
extends: .upload-job
release-job/unbalanced_set:
needs:
- upload-job/unbalanced_set
variables:
PACKAGE_NAME: "unbalanced_set"
extends: .release-job

View File

@@ -1,32 +0,0 @@
manifest-job/valid_set:
variables:
PACKAGE_NAME: "valid_set"
extends: .manifest-job
test-images-job/valid_set:
needs:
- manifest-job/valid_set
variables:
PACKAGE_NAME: "valid_set"
extends: .test-job
bundle-job/valid_set:
needs:
- manifest-job/valid_set
variables:
PACKAGE_NAME: "valid_set"
extends: .bundle-job
upload-job/valid_set:
needs:
- bundle-job/valid_set
variables:
PACKAGE_NAME: "valid_set"
extends: .upload-job
release-job/valid_set:
needs:
- upload-job/valid_set
variables:
PACKAGE_NAME: "valid_set"
extends: .release-job

18
.vscode/launch.json vendored
View File

@@ -12,7 +12,8 @@
"start"
],
"env": {
"ENTRY_FOLDER": "${workspaceFolder}/test",
"CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "valid_set"
},
"skipFiles": [
@@ -30,7 +31,8 @@
"test"
],
"env": {
"ENTRY_FOLDER": "${workspaceFolder}/test",
"CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "valid_set"
},
"skipFiles": [
@@ -51,7 +53,8 @@
"--color=yes"
],
"env": {
"ENTRY_FOLDER": "${workspaceFolder}/test",
"CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "valid_set"
},
"justMyCode": true
@@ -67,7 +70,8 @@
"start"
],
"env": {
"ENTRY_FOLDER": "${workspaceFolder}/test",
"CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "existing_valid_theme_set"
},
"skipFiles": [
@@ -85,7 +89,8 @@
"test"
],
"env": {
"ENTRY_FOLDER": "${workspaceFolder}/test",
"CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "existing_valid_theme_set"
},
"skipFiles": [
@@ -106,7 +111,8 @@
"--color=yes"
],
"env": {
"ENTRY_FOLDER": "${workspaceFolder}/test",
"CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "existing_valid_theme_set"
},
"justMyCode": true

View File

@@ -1,5 +1,8 @@
{
"conventionalCommits.scopes": [
"cicd"
"cicd",
"#5",
"#13",
"#14"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 977 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 968 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 929 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 944 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 952 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1002 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 892 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 876 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 935 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 942 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 996 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 877 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 947 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 980 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 954 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1009 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 990 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 929 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 919 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 929 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1021 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 908 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 989 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 975 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 805 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 955 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 999 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Some files were not shown because too many files have changed in this diff Show More