From 76c161406371d87034f2bc6e37d2fb15e8efae87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net> Date: Tue, 18 Mar 2025 15:58:19 -0400 Subject: [PATCH] Overwrite tag in subtree split CI job. --- .gitlab-ci.yml | 2 +- drupal_cms_olivero/composer.json | 2 +- project_template/composer.json | 2 +- recipes/drupal_cms_accessibility_tools/composer.json | 2 +- recipes/drupal_cms_admin_ui/composer.json | 2 +- recipes/drupal_cms_ai/composer.json | 2 +- recipes/drupal_cms_analytics/composer.json | 2 +- recipes/drupal_cms_anti_spam/composer.json | 2 +- recipes/drupal_cms_authentication/composer.json | 2 +- recipes/drupal_cms_blog/composer.json | 2 +- recipes/drupal_cms_case_study/composer.json | 2 +- recipes/drupal_cms_content_type_base/composer.json | 2 +- recipes/drupal_cms_events/composer.json | 2 +- recipes/drupal_cms_forms/composer.json | 2 +- recipes/drupal_cms_google_analytics/composer.json | 2 +- recipes/drupal_cms_image/composer.json | 2 +- recipes/drupal_cms_news/composer.json | 2 +- recipes/drupal_cms_page/composer.json | 2 +- recipes/drupal_cms_person/composer.json | 2 +- recipes/drupal_cms_privacy_basic/composer.json | 2 +- recipes/drupal_cms_project/composer.json | 2 +- recipes/drupal_cms_remote_video/composer.json | 2 +- recipes/drupal_cms_search/composer.json | 2 +- recipes/drupal_cms_seo_basic/composer.json | 2 +- recipes/drupal_cms_seo_tools/composer.json | 2 +- recipes/drupal_cms_starter/composer.json | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2493483df..8543a3f7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -291,6 +291,6 @@ subtree split: - git checkout -b split $COMMIT - git remote set-url origin $URL - git remote -v - - if [[ -n "$CI_COMMIT_BRANCH" ]]; then git push origin HEAD:$CI_COMMIT_BRANCH; elif [[ -n "$CI_COMMIT_TAG" ]]; then git tag $CI_COMMIT_TAG && git push origin $CI_COMMIT_TAG; fi + - if [[ -n "$CI_COMMIT_BRANCH" ]]; then git push origin HEAD:$CI_COMMIT_BRANCH; elif [[ -n "$CI_COMMIT_TAG" ]]; then git tag --force $CI_COMMIT_TAG && git push origin $CI_COMMIT_TAG; fi rules: - *deploy-rules diff --git a/drupal_cms_olivero/composer.json b/drupal_cms_olivero/composer.json index 27eabaea0..b92ab38eb 100644 --- a/drupal_cms_olivero/composer.json +++ b/drupal_cms_olivero/composer.json @@ -6,5 +6,5 @@ "require": { "drupal/core": "^11" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/project_template/composer.json b/project_template/composer.json index 6cdf95ffa..d3b159439 100644 --- a/project_template/composer.json +++ b/project_template/composer.json @@ -1,6 +1,6 @@ { "name": "drupal/cms", - "version": "1.1.x-dev", + "version": "1.1.0", "description": "Drupal CMS is a ready-to-use platform built on Drupal core, offering smart defaults to get started quickly and enterprise-grade tools for marketers, designers, and content creators.", "type": "project", "license": "GPL-2.0-or-later", diff --git a/recipes/drupal_cms_accessibility_tools/composer.json b/recipes/drupal_cms_accessibility_tools/composer.json index de041311d..eac962108 100644 --- a/recipes/drupal_cms_accessibility_tools/composer.json +++ b/recipes/drupal_cms_accessibility_tools/composer.json @@ -8,5 +8,5 @@ "drupal/drupal_cms_page": "~1.1.0", "drupal/editoria11y": "^2.2" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_admin_ui/composer.json b/recipes/drupal_cms_admin_ui/composer.json index a96da6023..19b05bf1d 100644 --- a/recipes/drupal_cms_admin_ui/composer.json +++ b/recipes/drupal_cms_admin_ui/composer.json @@ -11,5 +11,5 @@ "drupal/sam": "^1.2", "drupal/tagify": "^1.2" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_ai/composer.json b/recipes/drupal_cms_ai/composer.json index d54f5d3fc..bc4a202cd 100644 --- a/recipes/drupal_cms_ai/composer.json +++ b/recipes/drupal_cms_ai/composer.json @@ -16,5 +16,5 @@ "conflict": { "drupal/project_browser": "<2-alpha7" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_analytics/composer.json b/recipes/drupal_cms_analytics/composer.json index 137b06a9e..84642db99 100644 --- a/recipes/drupal_cms_analytics/composer.json +++ b/recipes/drupal_cms_analytics/composer.json @@ -5,5 +5,5 @@ "require": { "drupal/drupal_cms_google_analytics": "~1.1.0" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_anti_spam/composer.json b/recipes/drupal_cms_anti_spam/composer.json index 581ec42ee..e529e3705 100644 --- a/recipes/drupal_cms_anti_spam/composer.json +++ b/recipes/drupal_cms_anti_spam/composer.json @@ -10,5 +10,5 @@ "drupal/friendly_captcha_challenge": "^0.9", "drupal/honeypot": "^2.1" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_authentication/composer.json b/recipes/drupal_cms_authentication/composer.json index 9ddcef10f..b308054fa 100644 --- a/recipes/drupal_cms_authentication/composer.json +++ b/recipes/drupal_cms_authentication/composer.json @@ -10,5 +10,5 @@ "drupal/login_emailusername": "^3", "drupal/token": "^1" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_blog/composer.json b/recipes/drupal_cms_blog/composer.json index cb2cf4710..a068b24a3 100644 --- a/recipes/drupal_cms_blog/composer.json +++ b/recipes/drupal_cms_blog/composer.json @@ -10,5 +10,5 @@ "drupal/better_exposed_filters": "^7", "drupal/selective_better_exposed_filters": "^3" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_case_study/composer.json b/recipes/drupal_cms_case_study/composer.json index ce3bd107a..dbd48d759 100644 --- a/recipes/drupal_cms_case_study/composer.json +++ b/recipes/drupal_cms_case_study/composer.json @@ -8,5 +8,5 @@ "drupal/add_content_by_bundle": "^1.2.2", "drupal/drupal_cms_page": "~1.1.0" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_content_type_base/composer.json b/recipes/drupal_cms_content_type_base/composer.json index 22e9e1d1c..ffbd39c2f 100644 --- a/recipes/drupal_cms_content_type_base/composer.json +++ b/recipes/drupal_cms_content_type_base/composer.json @@ -17,5 +17,5 @@ "drupal/scheduler_content_moderation_integration": "^3.0.4", "drupal/tagify": "^1.2" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_events/composer.json b/recipes/drupal_cms_events/composer.json index 8018eb492..136b36e3a 100644 --- a/recipes/drupal_cms_events/composer.json +++ b/recipes/drupal_cms_events/composer.json @@ -16,5 +16,5 @@ "drupal/smart_date": "^4.2.1", "geocoder-php/nominatim-provider": "^5.7" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_forms/composer.json b/recipes/drupal_cms_forms/composer.json index 06aac4cf3..3fbc138a2 100644 --- a/recipes/drupal_cms_forms/composer.json +++ b/recipes/drupal_cms_forms/composer.json @@ -9,5 +9,5 @@ "drupal/core": ">=10.4", "drupal/webform": "^6.3-beta1" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_google_analytics/composer.json b/recipes/drupal_cms_google_analytics/composer.json index 59045e3f3..978905de0 100644 --- a/recipes/drupal_cms_google_analytics/composer.json +++ b/recipes/drupal_cms_google_analytics/composer.json @@ -10,5 +10,5 @@ "conflict": { "drupal/project_browser": "<2-alpha7" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_image/composer.json b/recipes/drupal_cms_image/composer.json index 07c03b513..afd5a5b35 100644 --- a/recipes/drupal_cms_image/composer.json +++ b/recipes/drupal_cms_image/composer.json @@ -8,5 +8,5 @@ "drupal/focal_point": "^2", "drupal/svg_image": "^3.1" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_news/composer.json b/recipes/drupal_cms_news/composer.json index c91117938..8f6da7c15 100644 --- a/recipes/drupal_cms_news/composer.json +++ b/recipes/drupal_cms_news/composer.json @@ -10,5 +10,5 @@ "drupal/better_exposed_filters": "^7", "drupal/selective_better_exposed_filters": "^3" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_page/composer.json b/recipes/drupal_cms_page/composer.json index 7f69ebe28..b484a0841 100644 --- a/recipes/drupal_cms_page/composer.json +++ b/recipes/drupal_cms_page/composer.json @@ -7,5 +7,5 @@ "drupal/core": ">=10.4", "drupal/drupal_cms_content_type_base": "~1.1.0" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_person/composer.json b/recipes/drupal_cms_person/composer.json index 8fae25a6b..d4c957785 100644 --- a/recipes/drupal_cms_person/composer.json +++ b/recipes/drupal_cms_person/composer.json @@ -8,5 +8,5 @@ "drupal/add_content_by_bundle": "^1.2.2", "drupal/drupal_cms_page": "~1.1.0" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_privacy_basic/composer.json b/recipes/drupal_cms_privacy_basic/composer.json index f64e521b3..5ed8ea7d6 100644 --- a/recipes/drupal_cms_privacy_basic/composer.json +++ b/recipes/drupal_cms_privacy_basic/composer.json @@ -11,5 +11,5 @@ "drupal/klaro": "^3", "drupal/menu_link_attributes": "^1.5" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_project/composer.json b/recipes/drupal_cms_project/composer.json index 0bccc9126..4022da5f7 100644 --- a/recipes/drupal_cms_project/composer.json +++ b/recipes/drupal_cms_project/composer.json @@ -8,5 +8,5 @@ "drupal/add_content_by_bundle": "^1.2.2", "drupal/drupal_cms_page": "~1.1.0" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_remote_video/composer.json b/recipes/drupal_cms_remote_video/composer.json index 788caf63d..c192a96bf 100644 --- a/recipes/drupal_cms_remote_video/composer.json +++ b/recipes/drupal_cms_remote_video/composer.json @@ -7,5 +7,5 @@ "drupal/core": ">=10.4", "drupal/drupal_cms_privacy_basic": "~1.1.0" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_search/composer.json b/recipes/drupal_cms_search/composer.json index 76213239a..3b28f4623 100644 --- a/recipes/drupal_cms_search/composer.json +++ b/recipes/drupal_cms_search/composer.json @@ -10,5 +10,5 @@ "drupal/search_api_exclude": "^2", "drupal/simple_search_form" : "^1.5" }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_seo_basic/composer.json b/recipes/drupal_cms_seo_basic/composer.json index 71df43552..e826cf231 100644 --- a/recipes/drupal_cms_seo_basic/composer.json +++ b/recipes/drupal_cms_seo_basic/composer.json @@ -15,5 +15,5 @@ "drupal/drupal_cms_analytics": "Adds recipes for tracking website traffic.", "drupal/drupal_cms_accessibility_tools": "Adds automated checks to help ensure content conforms to web accessibility guidelines." }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_seo_tools/composer.json b/recipes/drupal_cms_seo_tools/composer.json index 98e0a55d9..582a26cd2 100644 --- a/recipes/drupal_cms_seo_tools/composer.json +++ b/recipes/drupal_cms_seo_tools/composer.json @@ -21,5 +21,5 @@ "drupal/drupal_cms_analytics": "Adds recipes for tracking website traffic.", "drupal/drupal_cms_accessibility_tools": "Adds automated checks to help ensure content conforms to web accessibility guidelines." }, - "version": "1.1.x-dev" + "version": "1.1.0" } diff --git a/recipes/drupal_cms_starter/composer.json b/recipes/drupal_cms_starter/composer.json index 16d80704e..ac6229004 100644 --- a/recipes/drupal_cms_starter/composer.json +++ b/recipes/drupal_cms_starter/composer.json @@ -22,5 +22,5 @@ "drupal/project_browser": "^2-beta1", "drupal/token": "^1" }, - "version": "1.1.x-dev" + "version": "1.1.0" } -- GitLab