From bbdf05f4ce956b73ba2370f22cbf50583a483df7 Mon Sep 17 00:00:00 2001
From: Simon <simon.priet@gmail.com>
Date: Thu, 18 May 2023 22:43:17 +0200
Subject: [PATCH] Tente un fixe pour la pipeline

---
 .gitlab-ci.yml                           | 23 ++++++++++++++++++-----
 test/existing_valid_theme_set/theme.json |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7067dc..717039d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
-include:
-  - .gitlab/existing_valid_theme_set.yml
-  - .gitlab/missing_tag_set.yml
-  - .gitlab/unbalanced_set.yml
-  - .gitlab/valid_set.yml
+# include:
+#   - .gitlab/existing_valid_theme_set.yml
+#   - .gitlab/missing_tag_set.yml
+#   - .gitlab/unbalanced_set.yml
+#   - .gitlab/valid_set.yml
 
 stages:
   - Manifest
@@ -24,6 +24,7 @@ variables:
     #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
     - if: $CI_COMMIT_TAG
       when: never
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
     - changes:
         - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
   script:
@@ -38,6 +39,11 @@ variables:
     when: on_success
     expire_in: "1 hour"
 
+manifest-job/existing_valid_theme_set:
+  variables:
+    PACKAGE_NAME: existing_valid_theme_set
+  extends: .manifest-job
+
 .test-job:
   stage: Test
   image: python:latest
@@ -51,6 +57,13 @@ variables:
     - python -m pytest src/test_images.py --tb=line -rA --color=yes
   allow_failure: true
 
+test-images-job/existing_valid_theme_set:
+  needs:
+    - manifest-job/existing_valid_theme_set
+  variables:
+    PACKAGE_NAME: existing_valid_theme_set
+  extends: .test-job
+
 # 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
diff --git a/test/existing_valid_theme_set/theme.json b/test/existing_valid_theme_set/theme.json
index e097f93..238786a 100644
--- a/test/existing_valid_theme_set/theme.json
+++ b/test/existing_valid_theme_set/theme.json
@@ -9,5 +9,5 @@
 	"imageCredits": "©Thoscellen, ©BlueTwelve",
 	"sunriseImageList": [],
 	"displayName": "Stray",
-	"sunsetImageList": [],
+	"sunsetImageList": []
 }
\ No newline at end of file