Merge branch 'cicd' into 'main'

Ecriture du générateur de manifeste

See merge request Thoscellen/Wallset!4

.gitignore

@@ -1,12 +1,3 @@
-# Ignore les résultats de compilations locales
-**/builds/
 
 # Ignore node_module
 **/node_modules/
-
-# Ignore python stuff
-**/__pycache__
-**/.pytest_cache
-
-# Ignore les fichiers système de MacOS
-**/.DS_Store

.gitlab-ci.yml

@@ -1,101 +0,0 @@
-include:
-  - .gitlab/*.yml
-
-stages:
-  - Manifest
-  - Test
-  - Bundle
-  - Distribute
-  - Release
-
-variables:
-  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.
-.manifest-job:
-  stage: Manifest
-  image: node:latest
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - changes:
-        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
-  script:
-    - cd src/
-    - npm install
-    - npm run start
-    - cat ../${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
-    - npm run test
-  artifacts:
-    paths:
-      - ${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
-    when: on_success
-    expire_in: "1 hour"
-
-.test-job:
-  stage: Test
-  image: python:latest
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
-  script:
-    - pip install -U pytest pillow iteration_utilities
-    - python -m pytest src/test_images.py --tb=line -rA --color=yes
-  allow_failure: true
-
-# Jobs from here run Merged_results or Push/Merge Commits to the main branch. Tag is created on release so no run with tag creation
-.bundle-job:
-  stage: Bundle
-  image: javieraviles/zip:latest
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      changes:
-        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
-  script:
-    - zip -j ${PACKAGE_NAME}.zip ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
-  artifacts:
-    paths:
-      - ${PACKAGE_NAME}.zip
-    when: on_success
-    expire_in: "1 hour"
-
-.upload-job:
-  stage: Distribute
-  image: curlimages/curl:latest
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      changes:
-        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
-  script:
-    - |
-      curl --fail \
-      --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-      --upload-file ${PACKAGE_NAME}.zip "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip?select=package_file"
-
-.release-job:
-  stage: Release
-  image: registry.gitlab.com/gitlab-org/release-cli:latest
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      changes:
-        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
-  script:
-    - echo "Releasing assets for $PACKAGE_NAME"
-  release:
-    name: "Release $PACKAGE_NAME $RELEASE_VERSION"
-    tag_name: "$PACKAGE_NAME.$RELEASE_VERSION"
-    description: "Version $RELEASE_VERSION"
-    ref: "$CI_COMMIT_SHA"
-    assets:
-      links:
-        - name: ${PACKAGE_NAME}
-          url: "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip"

.gitlab/.gitlab-ci.yml

@@ -0,0 +1,173 @@
+stages:
+  - Manifest
+  - Test
+  - Bundle
+  - Distribute
+  - Release
+
+variables:
+  ENTRY_FOLDER: "test" # test directory for testing CI/CD, or assets directory for normal operations
+  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.
+.manifest-job: &manifest
+  stage: Manifest
+  image: node:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never # Do not run this job when a tag is created manually
+    - changes:
+        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
+  script:
+    - cd src/build_job
+    - npm install
+    - npm run start
+    - cat ../../${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
+  artifacts:
+    paths:
+      - ${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
+    when: on_success
+    expire_in: "1 hour"
+
+manifest-job/valid_set:
+  variables:
+    PACKAGE_NAME: "valid_set"
+  <<: *manifest
+
+.test-images-job: &test-images
+  stage: Test
+  image: python:latest
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
+  script:
+    - pip install -U pytest pillow iteration_utilities
+    - python -m pytest src/test_images_job/test_wpp.py --tb=line -rA --color=yes --code-highlight=yes -q
+  allow_failure: true
+
+test-images-job/valid_set:
+  variables:
+    PACKAGE_NAME: "valid_set"
+  <<: *test-images
+
+test-images-job/missing_tag_set:
+  variables:
+    PACKAGE_NAME: "missing_tag_set"
+  <<: *test-images
+
+.test-manifest-job: &test-manifest
+  stage: Test
+  image: node:latest
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
+  script:
+    - cd src/test_manifest_job
+    - npm install ajv ajv-errors mocha mocha-steps chai
+    - cd ../..
+    - node src/test_manifest_job/node_modules/mocha/bin/_mocha --require mocha-steps --colors src/test_manifest_job/wpp_checker.js
+
+test-manifest-job/valid_set:
+  variables:
+    PACKAGE_NAME: "valid_set"
+  <<: *test-manifest
+
+test-manifest-job/missing_tag_set:
+  variables:
+    PACKAGE_NAME: "missing_tag_set"
+  <<: *test-manifest
+
+# Jobs from here run Merged_results or Push/Merge Commits to the main branch. Tag is created on release so no run with tag creation
+.bundle-job: &bundle
+  stage: Bundle
+  image: javieraviles/zip:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never # Do not run this job when a tag is created manually
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      changes:
+        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
+  script:
+    - zip -j ${PACKAGE_NAME}.zip ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
+  artifacts:
+    paths:
+      - ${PACKAGE_NAME}.zip
+    when: on_success
+    expire_in: "1 hour"
+
+bundle-job/valid_set:
+  variables:
+    PACKAGE_NAME: "valid_set"
+  <<: *bundle
+
+bundle-job/missing_tag_set:
+  variables:
+    PACKAGE_NAME: "missing_tag_set"
+  <<: *bundle
+
+.upload-job: &upload
+  stage: Distribute
+  image: curlimages/curl:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never # Do not run this job when a tag is created manually
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      changes:
+        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
+  script:
+    - |
+      curl --fail \
+      --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
+      --upload-file ${PACKAGE_NAME}.zip "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip?select=package_file"
+
+upload-job/valid_set:
+  needs:
+    - bundle-job/valid_set
+  variables:
+    PACKAGE_NAME: "valid_set"
+  <<: *upload
+
+upload-job/missing_tag_set:
+  needs:
+    - bundle-job/missing_tag_set
+  variables:
+    PACKAGE_NAME: "missing_tag_set"
+  <<: *upload
+
+.release-job: &release
+  stage: Release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never # Do not run this job when a tag is created manually
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      changes:
+        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
+  script:
+    - echo "Releasing assets for $PACKAGE_NAME"
+  release:
+    name: "Release $PACKAGE_NAME $RELEASE_VERSION"
+    tag_name: "$PACKAGE_NAME.$RELEASE_VERSION"
+    description: "Version $RELEASE_VERSION"
+    ref: "$CI_COMMIT_SHA"
+    assets:
+      links:
+        - name: ${PACKAGE_NAME}
+          url: "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip"
+
+release-job/valid_set:
+  needs:
+    - upload-job/valid_set
+  variables:
+    PACKAGE_NAME: "valid_set"
+  <<: *release
+
+release-job/missing_tag_set:
+  needs:
+    - upload-job/missing_tag_set
+  variables:
+    PACKAGE_NAME: "missing_tag_set"
+  <<: *release

.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_Athenas_Tree.yml

@@ -1,32 +0,0 @@
-manifest-job/BL3_Athenas_Tree:
-  variables:
-    PACKAGE_NAME: "BL3_Athenas_Tree"
-  extends: .manifest-job
-
-test-images-job/BL3_Athenas_Tree:
-  needs:
-    - manifest-job/BL3_Athenas_Tree
-  variables:
-    PACKAGE_NAME: "BL3_Athenas_Tree"
-  extends: .test-job
-
-bundle-job/BL3_Athenas_Tree:
-  needs:
-    - manifest-job/BL3_Athenas_Tree
-  variables:
-    PACKAGE_NAME: "BL3_Athenas_Tree"
-  extends: .bundle-job
-
-upload-job/BL3_Athenas_Tree:
-  needs:
-    - bundle-job/BL3_Athenas_Tree
-  variables:
-    PACKAGE_NAME: "BL3_Athenas_Tree"
-  extends: .upload-job
-
-release-job/BL3_Athenas_Tree:
-  needs:
-    - upload-job/BL3_Athenas_Tree
-  variables:
-    PACKAGE_NAME: "BL3_Athenas_Tree"
-  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

.vscode/launch.json

@@ -1,121 +1,30 @@
 {
+	// Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
+	// Pointez pour afficher la description des attributs existants.
+	// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "Gen-Manifest Valid_set",
-			"cwd": "${workspaceFolder}/src",
 			"type": "node",
 			"request": "launch",
-			"runtimeExecutable": "npm",
+			"name": "Tester avec Valid_set",
-			"runtimeArgs": [
-				"run",
-				"start"
-			],
-			"env": {
-				"CI_PROJECT_DIR": "${workspaceFolder}",
-				"ENTRY_FOLDER": "test",
-				"PACKAGE_NAME": "valid_set"
-			},
 			"skipFiles": [
 				"<node_internals>/**"
 			],
-		},
+			"program": "${workspaceFolder}/src/test_manifest_job/node_modules/mocha/bin/_mocha",
-		{
-			"name": "Test-Manifest Valid_set",
-			"cwd": "${workspaceFolder}/src",
-			"type": "node",
-			"request": "launch",
-			"runtimeExecutable": "npm",
-			"runtimeArgs": [
-				"run",
-				"test"
-			],
-			"env": {
-				"CI_PROJECT_DIR": "${workspaceFolder}",
-				"ENTRY_FOLDER": "test",
-				"PACKAGE_NAME": "valid_set"
-			},
-			"skipFiles": [
-				"<node_internals>/**"
-			],
-		},
-		{
-			"name": "Test-Images Valid_set",
-			"cwd": "${workspaceFolder}/src",
-			"console": "internalConsole",
-			"type": "python",
-			"request": "launch",
-			"module": "pytest",
 			"args": [
-				"test_images.py",
+				"${workspaceFolder}/src/test_manifest_job/wpp_checker.js",
-				"-rA",
+				"--require mocha-steps",
-				"--tb=line",
+				"--colors",
-				"--color=yes"
 			],
 			"env": {
-				"CI_PROJECT_DIR": "${workspaceFolder}",
 				"ENTRY_FOLDER": "test",
 				"PACKAGE_NAME": "valid_set"
 			},
-			"justMyCode": true
+			"internalConsoleOptions": "openOnSessionStart",
-		},
+			"console": "integratedTerminal",
-		{
+			"cwd": "${workspaceFolder}",
-			"name": "Gen-Manifest existing_valid_theme_set",
+			"autoAttachChildProcesses": true,
-			"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,12 +1,5 @@
 {
 	"conventionalCommits.scopes": [
-		"cicd",
+		"cicd"
-		"#5",
-		"#9",
-		"#13",
-		"#14",
-		"#15",
-		"#2",
-		"#24"
 	]
 }

assets/BL3_Athenas_Tree/theme.json

@@ -1,38 +0,0 @@
-{
-	"displayName": "Borderlands 3: Athenas Tree",
-	"imageFilename": "BL3_Athenas_Tree*.jpg",
-	"imageCredits": "Gearbox",
-	"sunriseImageList": [
-		18,
-		19,
-		20,
-		21,
-		22,
-		23,
-		24
-	],
-	"dayImageList": [
-		25,
-		1,
-		2,
-		3,
-		4,
-		5,
-		6,
-		7
-	],
-	"sunsetImageList": [
-		8,
-		9,
-		10,
-		11,
-		12
-	],
-	"nightImageList": [
-		13,
-		14,
-		15,
-		16,
-		17
-	]
-}