From 7a433f4d756df1cbdde11a7cbd3224dfedcf1314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net>
Date: Tue, 21 Jan 2025 22:26:37 -0500
Subject: [PATCH 1/5] Add CANARY_CORE_RECOMMENDED and CANARY_PREFER_STABLE
variables
---
.gitlab-ci.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35d868bc6..9b8c6d44c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,12 +115,13 @@ build test project:
- *create-project
# Generate `composer.json` by merging our dev requirements into the project template.
- .ddev/homeadditions/bin/generate-composer-json > $BUILD_DIR/composer.json
- # If this is a "canary" build, allow dev versions of all dependencies.
- - if [ -n "$CANARY" ]; then composer config prefer-stable false --working-dir=$BUILD_DIR; fi
+ - cd $BUILD_DIR
+ - if [ -n "$CANARY_CORE_RECOMMENDED" ]; then composer require --no-update "drupal/core-recommended:$CANARY_CORE_RECOMMENDED"; fi
+ - if [ -n "$CANARY_PREFER_STABLE" ]; then composer config prefer-stable $CANARY_PREFER_STABLE; fi
# Install dependencies.
- - composer install --working-dir=$BUILD_DIR
+ - composer install
# Remove all `.git` directories in the built project.
- - find $BUILD_DIR -depth -type d -name '.git' -exec rm -r -f {} ';'
+ - find . -depth -type d -name '.git' -exec rm -r -f {} ';'
artifacts:
paths:
- $BUILD_DIR
--
GitLab
From 38212d9126795b9915fb924c69a6687b8e39f717 Mon Sep 17 00:00:00 2001
From: Adam G-H <32250-phenaproxima@users.noreply.drupalcode.org>
Date: Wed, 22 Jan 2025 15:04:46 +0000
Subject: [PATCH 2/5] Issue #3501423 by phenaproxima, heyyo: Make the
components use stable version constraints for each other
---
project_template/composer.json | 21 +++++++++++++------
.../composer.json | 2 +-
recipes/drupal_cms_page/composer.json | 2 +-
recipes/drupal_cms_starter/composer.json | 4 ++--
4 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/project_template/composer.json b/project_template/composer.json
index ff61c0a73..990b5eace 100644
--- a/project_template/composer.json
+++ b/project_template/composer.json
@@ -21,18 +21,19 @@
"drupal/core-project-message": "^11.1.1",
"drupal/core-recommended": "^11.1.1",
"drupal/drupal_cms_accessibility_tools": "^1",
- "drupal/drupal_cms_ai": "^1.0.1",
+ "drupal/drupal_cms_ai": "^1",
"drupal/drupal_cms_analytics": "^1",
"drupal/drupal_cms_blog": "^1",
"drupal/drupal_cms_case_study": "^1",
"drupal/drupal_cms_events": "^1",
"drupal/drupal_cms_forms": "^1",
- "drupal/drupal_cms_news": "^1.0.1",
- "drupal/drupal_cms_page": "^1.0.1",
- "drupal/drupal_cms_person": "^1.0.1",
+ "drupal/drupal_cms_news": "^1",
+ "drupal/drupal_cms_page": "^1",
+ "drupal/drupal_cms_person": "^1",
"drupal/drupal_cms_project": "^1",
- "drupal/drupal_cms_seo_tools": "^1.0.1",
- "drupal/drupal_cms_starter": "^1.0.1",
+ "drupal/drupal_cms_seo_tools": "^1",
+ "drupal/drupal_cms_starter": "^1",
+ "drupal/experience_builder": "0.x-dev@dev",
"drupal/project_browser": "@alpha",
"drupal/webform": "@beta",
"drush/drush": "^13"
@@ -83,5 +84,13 @@
" * Get involved with the Drupal community: https://drupal.org/getting-involved"
]
}
+ },
+ "scripts": {
+ "pre-package-update": "ExperienceBuilderDemo::onPackageUpdate"
+ },
+ "autoload": {
+ "classmap": [
+ "ExperienceBuilderDemo.php"
+ ]
}
}
diff --git a/recipes/drupal_cms_content_type_base/composer.json b/recipes/drupal_cms_content_type_base/composer.json
index 98c4a471e..4042bdde8 100644
--- a/recipes/drupal_cms_content_type_base/composer.json
+++ b/recipes/drupal_cms_content_type_base/composer.json
@@ -7,7 +7,7 @@
"drupal/autosave_form": "^1.7",
"drupal/bpmn_io": "^2.0.3",
"drupal/core": ">=10.4",
- "drupal/drupal_cms_image": "^1.0.1",
+ "drupal/drupal_cms_image": "^1",
"drupal/eca": "^2.1",
"drupal/linkit": "^7",
"drupal/pathauto": "^1.13",
diff --git a/recipes/drupal_cms_page/composer.json b/recipes/drupal_cms_page/composer.json
index 9abfaf20b..2501abd2a 100644
--- a/recipes/drupal_cms_page/composer.json
+++ b/recipes/drupal_cms_page/composer.json
@@ -5,7 +5,7 @@
"license": ["GPL-2.0-or-later"],
"require": {
"drupal/core": ">=10.4",
- "drupal/drupal_cms_content_type_base": "^1.0.1"
+ "drupal/drupal_cms_content_type_base": "^1"
},
"version": "1.x-dev"
}
diff --git a/recipes/drupal_cms_starter/composer.json b/recipes/drupal_cms_starter/composer.json
index 22c033156..a4cd89864 100644
--- a/recipes/drupal_cms_starter/composer.json
+++ b/recipes/drupal_cms_starter/composer.json
@@ -12,10 +12,10 @@
"drupal/drupal_cms_admin_ui": "^1",
"drupal/drupal_cms_anti_spam": "^1",
"drupal/drupal_cms_authentication": "^1",
- "drupal/drupal_cms_olivero": "^1.0.1",
+ "drupal/drupal_cms_olivero": "^1",
"drupal/drupal_cms_page": "^1",
"drupal/drupal_cms_privacy_basic": "^1",
- "drupal/drupal_cms_remote_video": "^1.0.1",
+ "drupal/drupal_cms_remote_video": "^1",
"drupal/drupal_cms_search": "^1",
"drupal/drupal_cms_seo_basic": "^1",
"drupal/easy_email_express": "^1.0.2",
--
GitLab
From 715cf69ea25f3dc791540f95690ca4f222f824de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net>
Date: Wed, 22 Jan 2025 13:02:22 -0500
Subject: [PATCH 3/5] Adjust constraints for components that have bug fixes.
---
project_template/composer.json | 8 ++++----
recipes/drupal_cms_content_type_base/composer.json | 2 +-
recipes/drupal_cms_page/composer.json | 2 +-
recipes/drupal_cms_starter/composer.json | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/project_template/composer.json b/project_template/composer.json
index 990b5eace..21c06949d 100644
--- a/project_template/composer.json
+++ b/project_template/composer.json
@@ -21,17 +21,17 @@
"drupal/core-project-message": "^11.1.1",
"drupal/core-recommended": "^11.1.1",
"drupal/drupal_cms_accessibility_tools": "^1",
- "drupal/drupal_cms_ai": "^1",
+ "drupal/drupal_cms_ai": "^1.0.1",
"drupal/drupal_cms_analytics": "^1",
"drupal/drupal_cms_blog": "^1",
"drupal/drupal_cms_case_study": "^1",
"drupal/drupal_cms_events": "^1",
"drupal/drupal_cms_forms": "^1",
- "drupal/drupal_cms_news": "^1",
+ "drupal/drupal_cms_news": "^1.0.1",
"drupal/drupal_cms_page": "^1",
- "drupal/drupal_cms_person": "^1",
+ "drupal/drupal_cms_person": "^1.0.1",
"drupal/drupal_cms_project": "^1",
- "drupal/drupal_cms_seo_tools": "^1",
+ "drupal/drupal_cms_seo_tools": "^1.0.1",
"drupal/drupal_cms_starter": "^1",
"drupal/experience_builder": "0.x-dev@dev",
"drupal/project_browser": "@alpha",
diff --git a/recipes/drupal_cms_content_type_base/composer.json b/recipes/drupal_cms_content_type_base/composer.json
index 4042bdde8..98c4a471e 100644
--- a/recipes/drupal_cms_content_type_base/composer.json
+++ b/recipes/drupal_cms_content_type_base/composer.json
@@ -7,7 +7,7 @@
"drupal/autosave_form": "^1.7",
"drupal/bpmn_io": "^2.0.3",
"drupal/core": ">=10.4",
- "drupal/drupal_cms_image": "^1",
+ "drupal/drupal_cms_image": "^1.0.1",
"drupal/eca": "^2.1",
"drupal/linkit": "^7",
"drupal/pathauto": "^1.13",
diff --git a/recipes/drupal_cms_page/composer.json b/recipes/drupal_cms_page/composer.json
index 2501abd2a..9abfaf20b 100644
--- a/recipes/drupal_cms_page/composer.json
+++ b/recipes/drupal_cms_page/composer.json
@@ -5,7 +5,7 @@
"license": ["GPL-2.0-or-later"],
"require": {
"drupal/core": ">=10.4",
- "drupal/drupal_cms_content_type_base": "^1"
+ "drupal/drupal_cms_content_type_base": "^1.0.1"
},
"version": "1.x-dev"
}
diff --git a/recipes/drupal_cms_starter/composer.json b/recipes/drupal_cms_starter/composer.json
index a4cd89864..22c033156 100644
--- a/recipes/drupal_cms_starter/composer.json
+++ b/recipes/drupal_cms_starter/composer.json
@@ -12,10 +12,10 @@
"drupal/drupal_cms_admin_ui": "^1",
"drupal/drupal_cms_anti_spam": "^1",
"drupal/drupal_cms_authentication": "^1",
- "drupal/drupal_cms_olivero": "^1",
+ "drupal/drupal_cms_olivero": "^1.0.1",
"drupal/drupal_cms_page": "^1",
"drupal/drupal_cms_privacy_basic": "^1",
- "drupal/drupal_cms_remote_video": "^1",
+ "drupal/drupal_cms_remote_video": "^1.0.1",
"drupal/drupal_cms_search": "^1",
"drupal/drupal_cms_seo_basic": "^1",
"drupal/easy_email_express": "^1.0.2",
--
GitLab
From 48875c38d58113ec1ab3f89b2dc564258713d637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net>
Date: Wed, 22 Jan 2025 17:59:17 -0500
Subject: [PATCH 4/5] Bump project template constraints for drupal_cms_page and
drupal_cms_starter.
---
project_template/composer.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/project_template/composer.json b/project_template/composer.json
index 21c06949d..8b69993f8 100644
--- a/project_template/composer.json
+++ b/project_template/composer.json
@@ -28,11 +28,11 @@
"drupal/drupal_cms_events": "^1",
"drupal/drupal_cms_forms": "^1",
"drupal/drupal_cms_news": "^1.0.1",
- "drupal/drupal_cms_page": "^1",
+ "drupal/drupal_cms_page": "^1.0.1",
"drupal/drupal_cms_person": "^1.0.1",
"drupal/drupal_cms_project": "^1",
"drupal/drupal_cms_seo_tools": "^1.0.1",
- "drupal/drupal_cms_starter": "^1",
+ "drupal/drupal_cms_starter": "^1.0.1",
"drupal/experience_builder": "0.x-dev@dev",
"drupal/project_browser": "@alpha",
"drupal/webform": "@beta",
--
GitLab
From 895ce8488dc76fa5d3a4ec11829cc950c16c6a8e Mon Sep 17 00:00:00 2001
From: Adam G-H <32250-phenaproxima@users.noreply.drupalcode.org>
Date: Mon, 27 Jan 2025 21:43:06 +0000
Subject: [PATCH 5/5] Issue #3501987 by phenaproxima, catch, tim.plunkett:
Remove the XB demo
---
project_template/composer.json | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/project_template/composer.json b/project_template/composer.json
index 8b69993f8..ff61c0a73 100644
--- a/project_template/composer.json
+++ b/project_template/composer.json
@@ -33,7 +33,6 @@
"drupal/drupal_cms_project": "^1",
"drupal/drupal_cms_seo_tools": "^1.0.1",
"drupal/drupal_cms_starter": "^1.0.1",
- "drupal/experience_builder": "0.x-dev@dev",
"drupal/project_browser": "@alpha",
"drupal/webform": "@beta",
"drush/drush": "^13"
@@ -84,13 +83,5 @@
" * Get involved with the Drupal community: https://drupal.org/getting-involved"
]
}
- },
- "scripts": {
- "pre-package-update": "ExperienceBuilderDemo::onPackageUpdate"
- },
- "autoload": {
- "classmap": [
- "ExperienceBuilderDemo.php"
- ]
}
}
--
GitLab