Merge branch 'BL2_frozen_wastelands' into 'main'

BL2 Actualise les métadonnées liés au Copyright

See merge request Thoscellen/Wallset!14

.gitignore

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

.gitlab-ci.yml

@@ -1,6 +1,5 @@
 include:
-  - .gitlab/valid_set.yml
-  - .gitlab/missing_tag_set.yml
+  - .gitlab/*.yml
 
 stages:
   - Manifest
@@ -10,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.
@@ -21,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:
@@ -40,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}/*
@@ -56,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}/*

.gitlab/BL2_frozen_wastelands.yml

@@ -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

.gitlab/BL3_Sanctuary_Bay.yml

@@ -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

.gitlab/HFW_Three_Spires_Mountain.yml

@@ -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

.gitlab/HFW_Weat_Tuft.yml

@@ -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

.gitlab/missing_tag_set.yml

@@ -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

.gitlab/valid_set.yml

@@ -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

.vscode/launch.json

@@ -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,10 +53,69 @@
 				"--color=yes"
 			],
 			"env": {
-				"ENTRY_FOLDER": "${workspaceFolder}/test",
+				"CI_PROJECT_DIR": "${workspaceFolder}",
+				"ENTRY_FOLDER": "test",
 				"PACKAGE_NAME": "valid_set"
 			},
 			"justMyCode": true
 		},
+		{
+			"name": "Gen-Manifest existing_valid_theme_set",
+			"cwd": "${workspaceFolder}/src",
+			"type": "node",
+			"request": "launch",
+			"runtimeExecutable": "npm",
+			"runtimeArgs": [
+				"run",
+				"start"
+			],
+			"env": {
+				"CI_PROJECT_DIR": "${workspaceFolder}",
+				"ENTRY_FOLDER": "test",
+				"PACKAGE_NAME": "existing_valid_theme_set"
+			},
+			"skipFiles": [
+				"<node_internals>/**"
+			],
+		},
+		{
+			"name": "Test-Manifest existing_valid_theme_set",
+			"cwd": "${workspaceFolder}/src",
+			"type": "node",
+			"request": "launch",
+			"runtimeExecutable": "npm",
+			"runtimeArgs": [
+				"run",
+				"test"
+			],
+			"env": {
+				"CI_PROJECT_DIR": "${workspaceFolder}",
+				"ENTRY_FOLDER": "test",
+				"PACKAGE_NAME": "existing_valid_theme_set"
+			},
+			"skipFiles": [
+				"<node_internals>/**"
+			],
+		},
+		{
+			"name": "Test-Images existing_valid_theme_set",
+			"cwd": "${workspaceFolder}/src",
+			"console": "internalConsole",
+			"type": "python",
+			"request": "launch",
+			"module": "pytest",
+			"args": [
+				"test_images.py",
+				"-rA",
+				"--tb=line",
+				"--color=yes"
+			],
+			"env": {
+				"CI_PROJECT_DIR": "${workspaceFolder}",
+				"ENTRY_FOLDER": "test",
+				"PACKAGE_NAME": "existing_valid_theme_set"
+			},
+			"justMyCode": true
+		},
 	]
 }

.vscode/settings.json

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