diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0e5cbb..f46ecee 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/.gitlab/BL2_frozen_wasteland.yml b/.gitlab/BL2_frozen_wasteland.yml new file mode 100644 index 0000000..018ef75 --- /dev/null +++ b/.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 diff --git a/.gitlab/existing_valid_theme_set.yml b/.gitlab/existing_valid_theme_set.yml deleted file mode 100644 index 2179d25..0000000 --- a/.gitlab/existing_valid_theme_set.yml +++ /dev/null @@ -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 diff --git a/.gitlab/missing_tag_set.yml b/.gitlab/missing_tag_set.yml deleted file mode 100644 index f230554..0000000 --- a/.gitlab/missing_tag_set.yml +++ /dev/null @@ -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 diff --git a/.gitlab/unbalanced_set.yml b/.gitlab/unbalanced_set.yml deleted file mode 100644 index 7a6d3ef..0000000 --- a/.gitlab/unbalanced_set.yml +++ /dev/null @@ -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 diff --git a/.gitlab/valid_set.yml b/.gitlab/valid_set.yml deleted file mode 100644 index 341697c..0000000 --- a/.gitlab/valid_set.yml +++ /dev/null @@ -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 diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_1.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_1.jpg new file mode 100644 index 0000000..d1daa0a Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_1.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_10.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_10.jpg new file mode 100644 index 0000000..b391503 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_10.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_11.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_11.jpg new file mode 100644 index 0000000..14a551a Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_11.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_12.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_12.jpg new file mode 100644 index 0000000..e3523d3 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_12.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_13.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_13.jpg new file mode 100644 index 0000000..b8bdfff Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_13.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_14.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_14.jpg new file mode 100644 index 0000000..c7e44ba Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_14.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_15.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_15.jpg new file mode 100644 index 0000000..1ad07c8 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_15.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_16.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_16.jpg new file mode 100644 index 0000000..ebaea5f Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_16.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_17.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_17.jpg new file mode 100644 index 0000000..1e5829f Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_17.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_18.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_18.jpg new file mode 100644 index 0000000..a2d0dc3 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_18.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_19.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_19.jpg new file mode 100644 index 0000000..f613839 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_19.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_2.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_2.jpg new file mode 100644 index 0000000..2b25504 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_2.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_20.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_20.jpg new file mode 100644 index 0000000..1208706 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_20.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_21.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_21.jpg new file mode 100644 index 0000000..583d2a1 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_21.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_22.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_22.jpg new file mode 100644 index 0000000..dccdd0b Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_22.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_23.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_23.jpg new file mode 100644 index 0000000..db55401 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_23.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_3.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_3.jpg new file mode 100644 index 0000000..bd13885 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_3.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_4.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_4.jpg new file mode 100644 index 0000000..9e23db0 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_4.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_5.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_5.jpg new file mode 100644 index 0000000..a475b28 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_5.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_6.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_6.jpg new file mode 100644 index 0000000..f72741c Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_6.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_7.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_7.jpg new file mode 100644 index 0000000..107f444 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_7.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_9.jpg b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_9.jpg new file mode 100644 index 0000000..60672e4 Binary files /dev/null and b/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_9.jpg differ