From c528d56c3e0f9e85dd266231b04495cd28592fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire?= <gregoire.kubler@proton.me>
Date: Fri, 20 Sep 2024 11:45:10 +0200
Subject: [PATCH] feat : created dedicated deploy file to avoid mixing includes
---
.../ci/release/cibuildwheel_ubuntu.gitlab-ci.yml | 3 ++-
.../release/cibuildwheel_windows.gitlab-ci.yml | 3 ++-
...tlab-ci.yml => deploy_template.gitlab-ci.yml} | 16 ----------------
.gitlab/ci/release/pip.gitlab-ci.yml | 3 ++-
.../ci/release/release_template.gitlab-ci.yml | 15 +++++++++++++++
5 files changed, 21 insertions(+), 19 deletions(-)
rename .gitlab/ci/release/{template.gitlab-ci.yml => deploy_template.gitlab-ci.yml} (81%)
create mode 100644 .gitlab/ci/release/release_template.gitlab-ci.yml
diff --git a/.gitlab/ci/release/cibuildwheel_ubuntu.gitlab-ci.yml b/.gitlab/ci/release/cibuildwheel_ubuntu.gitlab-ci.yml
index 3999c37..ca2912f 100644
--- a/.gitlab/ci/release/cibuildwheel_ubuntu.gitlab-ci.yml
+++ b/.gitlab/ci/release/cibuildwheel_ubuntu.gitlab-ci.yml
@@ -1,5 +1,6 @@
include:
- - local: '/.gitlab/ci/release/template.gitlab-ci.yml'
+ - local: '/.gitlab/ci/release/release_template.gitlab-ci.yml'
+ - local: '/.gitlab/ci/release/deploy_template.gitlab-ci.yml'
release:pip:ubuntu:
extends: .release:pip:template
diff --git a/.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml b/.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml
index 4ac2b09..ec05617 100644
--- a/.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml
+++ b/.gitlab/ci/release/cibuildwheel_windows.gitlab-ci.yml
@@ -1,5 +1,6 @@
include:
- - local: '/.gitlab/ci/release/template.gitlab-ci.yml'
+ - local: '/.gitlab/ci/release/release_template.gitlab-ci.yml'
+ - local: '/.gitlab/ci/release/deploy_template.gitlab-ci.yml'
release:pip:windows:
extends: .release:pip:template
diff --git a/.gitlab/ci/release/template.gitlab-ci.yml b/.gitlab/ci/release/deploy_template.gitlab-ci.yml
similarity index 81%
rename from .gitlab/ci/release/template.gitlab-ci.yml
rename to .gitlab/ci/release/deploy_template.gitlab-ci.yml
index 1f3dd48..0cfb274 100644
--- a/.gitlab/ci/release/template.gitlab-ci.yml
+++ b/.gitlab/ci/release/deploy_template.gitlab-ci.yml
@@ -1,19 +1,3 @@
-include:
- - local: '/.gitlab/ci/default.gitlab-ci.yml'
-
-##################################
-# RELEASE
-.release:pip:template:
- extends: .rules:release
- stage: release
- tags:
- - release
- artifacts:
- name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
- paths:
- - wheelhouse/
- expire_in: 1 day
-
##################################
# DEPLOY
include:
diff --git a/.gitlab/ci/release/pip.gitlab-ci.yml b/.gitlab/ci/release/pip.gitlab-ci.yml
index ef3fd39..df3a523 100644
--- a/.gitlab/ci/release/pip.gitlab-ci.yml
+++ b/.gitlab/ci/release/pip.gitlab-ci.yml
@@ -1,5 +1,6 @@
include:
- - local: '/.gitlab/ci/release/template.gitlab-ci.yml'
+ - local: '/.gitlab/ci/release/release_template.gitlab-ci.yml'
+ - local: '/.gitlab/ci/release/deploy_template.gitlab-ci.yml'
release:pip:ubuntu:
extends: .release:pip:template
diff --git a/.gitlab/ci/release/release_template.gitlab-ci.yml b/.gitlab/ci/release/release_template.gitlab-ci.yml
new file mode 100644
index 0000000..cee3a56
--- /dev/null
+++ b/.gitlab/ci/release/release_template.gitlab-ci.yml
@@ -0,0 +1,15 @@
+include:
+ - local: '/.gitlab/ci/default.gitlab-ci.yml'
+
+##################################
+# RELEASE
+.release:pip:template:
+ extends: .rules:release
+ stage: release
+ tags:
+ - release
+ artifacts:
+ name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+ paths:
+ - wheelhouse/
+ expire_in: 1 day
--
GitLab