Contrôle la CD de bout en bout

# Conflicts:
#   src/build-manifest.js

.gitignore

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

.gitlab-ci.yml

@@ -9,8 +9,8 @@ stages:
   - Release
 
 variables:
-  ENTRY_FOLDER: assets
+  ENTRY_FOLDER: $CI_PROJECT_DIR/test # test directory for testing CI/CD, or assets directory for normal operations
-  RELEASE_VERSION: v$CI_PIPELINE_IID
+  RELEASE_VERSION: v0.$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,13 +20,14 @@ 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:
@@ -38,6 +39,7 @@ 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}/*
@@ -53,14 +55,15 @@ 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}/*
   script:
-    - zip -j ${PACKAGE_NAME}.ddw ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
+    - zip -j ${PACKAGE_NAME}.zip ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
   artifacts:
     paths:
-      - ${PACKAGE_NAME}.ddw
+      - ${PACKAGE_NAME}.zip
     when: on_success
     expire_in: "1 hour"
 
@@ -70,6 +73,7 @@ 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}/*
@@ -77,7 +81,7 @@ variables:
     - |
       curl --fail \
       --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-      --upload-file ${PACKAGE_NAME}.ddw "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.ddw?select=package_file"
+      --upload-file ${PACKAGE_NAME}.zip "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip?select=package_file"
 
 .release-job:
   stage: Release
@@ -85,6 +89,7 @@ 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}/*
@@ -97,6 +102,5 @@ variables:
     ref: "$CI_COMMIT_SHA"
     assets:
       links:
-        - name: ${PACKAGE_NAME}.ddw
+        - name: ${PACKAGE_NAME}
-          url: "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.ddw"
+          url: "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip"
-          link_type: package

.gitlab/BL2_frozen_wastelands.yml

@@ -1,32 +0,0 @@
-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_Lunch_in_Trashlantis.yml

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

.gitlab/BL3_Sanctuary_Bay.yml

@@ -1,32 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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/existing_valid_theme_set.yml

@@ -0,0 +1,32 @@
+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

.gitlab/missing_tag_set.yml

@@ -0,0 +1,32 @@
+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/unbalanced_set.yml

@@ -0,0 +1,32 @@
+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

.gitlab/valid_set.yml

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

.vscode/settings.json

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