Merge branch 'BL2_frozen_wasteland' into 'main'

See merge request Thoscellen/Wallset!8

.gitlab-ci.yml

@@ -9,8 +9,8 @@ stages:
   - Release
 
 variables:
-  ENTRY_FOLDER: test # test directory for testing CI/CD, or assets directory for normal operations
-  RELEASE_VERSION: v0.$CI_PIPELINE_IID
+  ENTRY_FOLDER: assets
+  RELEASE_VERSION: v0.$CI_MERGE_REQUEST_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.
@@ -18,7 +18,6 @@ variables:
   stage: Manifest
   image: node:latest
   rules:
-    #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
     - if: $CI_COMMIT_TAG
       when: never
     - changes:
@@ -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}/*
@@ -53,7 +51,6 @@ variables:
   stage: Bundle
   image: javieraviles/zip:latest
   rules:
-    #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
     - if: $CI_COMMIT_TAG
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -71,7 +68,6 @@ variables:
   stage: Distribute
   image: curlimages/curl:latest
   rules:
-    #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
     - if: $CI_COMMIT_TAG
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -87,7 +83,6 @@ variables:
   stage: Release
   image: registry.gitlab.com/gitlab-org/release-cli:latest
   rules:
-    #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
     - if: $CI_COMMIT_TAG
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

.gitlab/BL2_frozen_wasteland.yml

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

.gitlab/existing_valid_theme_set.yml

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

.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/unbalanced_set.yml

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

.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