diff --git a/.gitignore b/.gitignore index 7018967..d59cebe 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,7 @@ # Ignore python stuff **/__pycache__ -**/.pytest_cache \ No newline at end of file +**/.pytest_cache + +# Ignore les fichiers système de MacOS +**/.DS_Store \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f46ecee..373ffda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ stages: variables: ENTRY_FOLDER: assets - RELEASE_VERSION: v0.$CI_MERGE_REQUEST_IID + 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. diff --git a/.gitlab/BL2_frozen_wasteland.yml b/.gitlab/BL2_frozen_wasteland.yml deleted file mode 100644 index 018ef75..0000000 --- a/.gitlab/BL2_frozen_wasteland.yml +++ /dev/null @@ -1,32 +0,0 @@ -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/BL2_frozen_wastelands.yml b/.gitlab/BL2_frozen_wastelands.yml new file mode 100644 index 0000000..befd80c --- /dev/null +++ b/.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 diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_1.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_1.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_1.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_1.jpg index d1daa0a..238ce84 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_1.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_1.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_10.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_10.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_10.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_10.jpg index b391503..5c1daab 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_10.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_10.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_11.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_11.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_11.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_11.jpg index 14a551a..0c62f37 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_11.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_11.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_12.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_12.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_12.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_12.jpg index e3523d3..ea037b9 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_12.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_12.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_13.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_13.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_13.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_13.jpg index b8bdfff..20d2e3f 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_13.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_13.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_14.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_14.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_14.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_14.jpg index c7e44ba..0731e4b 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_14.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_14.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_15.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_15.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_15.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_15.jpg index 1ad07c8..9ef0b09 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_15.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_15.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_16.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_16.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_16.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_16.jpg index ebaea5f..c68a886 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_16.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_16.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_17.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_17.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_17.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_17.jpg index 1e5829f..6a4c55a 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_17.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_17.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_18.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_18.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_18.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_18.jpg index a2d0dc3..443a140 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_18.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_18.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_19.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_19.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_19.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_19.jpg index f613839..5daaf81 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_19.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_19.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_2.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_2.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_2.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_2.jpg index 2b25504..adc9327 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_2.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_2.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_20.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_20.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_20.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_20.jpg index 1208706..23c3316 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_20.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_20.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_21.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_21.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_21.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_21.jpg index 583d2a1..42cf65b 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_21.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_21.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_22.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_22.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_22.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_22.jpg index dccdd0b..9eebdba 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_22.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_22.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_23.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_23.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_23.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_23.jpg index db55401..1becebd 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_23.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_23.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_3.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_3.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_3.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_3.jpg index bd13885..9382aaf 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_3.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_3.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_4.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_4.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_4.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_4.jpg index 9e23db0..fd0e0bf 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_4.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_4.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_5.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_5.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_5.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_5.jpg index a475b28..752ad54 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_5.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_5.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_6.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_6.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_6.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_6.jpg index f72741c..0c0efcf 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_6.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_6.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_7.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_7.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_7.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_7.jpg index 107f444..e2ecf26 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_7.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_7.jpg differ diff --git a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_9.jpg b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_9.jpg similarity index 99% rename from assets/BL2_frozen_wasteland/BL2_frozen_wasteland_9.jpg rename to assets/BL2_frozen_wastelands/BL2_frozen_wastelands_9.jpg index 60672e4..ca10c2f 100644 Binary files a/assets/BL2_frozen_wasteland/BL2_frozen_wasteland_9.jpg and b/assets/BL2_frozen_wastelands/BL2_frozen_wastelands_9.jpg differ