Issue #3493335 by phenaproxima, catch, poker10, tim.plunkett, pameeela, yesct,...

Issue #3493335 by phenaproxima, catch, poker10, tim.plunkett, pameeela, yesct, damienmckenna, greggles: Change minimum-stability to stable for 1.0 release

.ddev/commands/web/tag

@@ -13,8 +13,12 @@ if [ -z "$VERSION" ]; then
   exit 1
 fi
 
-# Find all `composer.json` files and change their `*` version constraints.
-find . -maxdepth 3 -type f -name composer.json -exec sed --in-place "s/\"\*\"/\"~$VERSION\"/g" {} ';'
+COMPONENTS=$(find $PWD -maxdepth 2 -type d -name 'drupal_cms_*' -or -name project_template)
+
+# Change all components' version constraints.
+for dir in $COMPONENTS; do
+  adjust-constraints $dir "~$VERSION"
+done
 
 # Generate pre-parsed versions of the recipes available to the installer,
 # and store them in a serialized file format for one-time use. This greatly
@@ -23,24 +27,13 @@ cd $DDEV_DOCROOT
 ./profiles/drupal_cms_installer/build-cache.sh
 cd -
 
-# Bump the minimum stability of the project template and ensure it correctly
-# conflicts with `drupal/drupal`.
-cd project_template
-composer config minimum-stability beta
-jq --indent 4 '.conflict."drupal/drupal" = "*"' composer.json > tag.json
-mv -f tag.json composer.json
-cd -
-
-# For visbility, output every line we're executing, as interpreted by the shell.
-set -x
-
-# Remove any untracked files.
-git clean -d --force
+# Bump the minimum stability of the project template.
+composer config minimum-stability stable --working-dir=project_template
 
 # Stage all changes, but if we're just testing this script, don't actually commit
 # or tag anything.
-git add .
-if [[ "$VERSION" == "test" ]]; then
+git add $COMPONENTS
+if [[ $2 == "test" ]]; then
   exit 0
 fi
 
@@ -49,5 +42,7 @@ git commit --message=$VERSION
 git tag $VERSION
 
 # Make another commit that puts this branch back into its pre-tagged state.
-find . -maxdepth 2 -type d -name 'drupal_cms_*' -or -name project_template -exec git checkout HEAD^1 {} ';'
+for dir in $COMPONENTS; do
+  git checkout HEAD^1 $dir
+done
 git commit --all --message="Back to dev."

.ddev/homeadditions/bin/adjust-constraints

+#!/usr/bin/env bash
+
+# Alters dependency constraints for Drupal CMS components required by a
+# given `composer.json` file.
+# Usage: adjust-constraints path/to/component <constraint>
+# Example: adjust-constraints project_template "~1.2.3"
+
+DIR=$1
+
+DEPENDENCIES=$(jq -r '.require | keys | .[] | select(startswith("drupal/drupal_cms_"))' $DIR/composer.json)
+
+echo "Adjusting constraints in $DIR."
+
+for package in $DEPENDENCIES; do
+  composer require --quiet --no-update --working-dir=$DIR "$package:$2"
+done

.gitlab-ci.yml

@@ -108,6 +108,10 @@ default:
 build test project:
   stage: test
   script:
+    # If this is a merge request branch, ensure that any recipe which requires the
+    # target branch (e.g., `"drupal/drupal_cms_ai": "1.x-dev"`) will know to refer
+    # to the detached HEAD we're operating from.
+    - if [ $CI_PIPELINE_SOURCE == "merge_request_event" ]; then find . -maxdepth 2 -type d -name 'drupal_cms_*' -exec composer config extra.branch-alias.dev-$CI_COMMIT_SHA $CI_MERGE_REQUEST_TARGET_BRANCH_NAME-dev --working-dir={} ';' ; fi
     - *create-project
     # Generate `composer.json` by merging our dev requirements into the project template.
     - .ddev/homeadditions/bin/generate-composer-json > $BUILD_DIR/composer.json

project_template/composer.json

@@ -19,20 +19,24 @@
         "drupal/core-composer-scaffold": "^11.1.1",
         "drupal/core-project-message": "^11.1.1",
         "drupal/core-recommended": "^11.1.1",
-        "drupal/drupal_cms_starter": "*",
-        "drupal/drupal_cms_analytics": "*",
-        "drupal/drupal_cms_accessibility_tools": "*",
-        "drupal/drupal_cms_ai": "*",
-        "drupal/drupal_cms_blog": "*",
-        "drupal/drupal_cms_case_study": "*",
-        "drupal/drupal_cms_events": "*",
-        "drupal/drupal_cms_forms": "*",
-        "drupal/drupal_cms_news": "*",
-        "drupal/drupal_cms_person": "*",
-        "drupal/drupal_cms_project": "*",
-        "drupal/drupal_cms_seo_tools": "*",
-        "drush/drush": "^13",
-        "drupal/project_browser": "@alpha"
+        "drupal/dashboard": "@beta",
+        "drupal/drupal_cms_accessibility_tools": "1.0.x-dev",
+        "drupal/drupal_cms_ai": "1.0.x-dev",
+        "drupal/drupal_cms_analytics": "1.0.x-dev",
+        "drupal/drupal_cms_blog": "1.0.x-dev",
+        "drupal/drupal_cms_case_study": "1.0.x-dev",
+        "drupal/drupal_cms_events": "1.0.x-dev",
+        "drupal/drupal_cms_forms": "1.0.x-dev",
+        "drupal/drupal_cms_news": "1.0.x-dev",
+        "drupal/drupal_cms_page": "1.0.x-dev",
+        "drupal/drupal_cms_person": "1.0.x-dev",
+        "drupal/drupal_cms_project": "1.0.x-dev",
+        "drupal/drupal_cms_seo_tools": "1.0.x-dev",
+        "drupal/drupal_cms_starter": "1.0.x-dev",
+        "drupal/klaro": "@rc",
+        "drupal/project_browser": "@alpha",
+        "drupal/webform": "@beta",
+        "drush/drush": "^13"
     },
     "conflict": {
         "drupal/drupal": "*"

recipes/drupal_cms_accessibility_tools/composer.json

@@ -5,7 +5,7 @@
     "license": ["GPL-2.0-or-later"],
     "require": {
         "drupal/core": ">=10.3",
-        "drupal/drupal_cms_page": "*",
+        "drupal/drupal_cms_page": "1.0.x-dev",
         "drupal/editoria11y": "^2.2"
     }
 }

recipes/drupal_cms_ai/composer.json

@@ -10,7 +10,7 @@
     "drupal/ai_image_alt_text": "^1",
     "drupal/ai_provider_anthropic": "^1",
     "drupal/ai_provider_openai": "^1",
-    "drupal/drupal_cms_privacy_basic": "*",
+    "drupal/drupal_cms_privacy_basic": "1.0.x-dev",
     "league/commonmark": "^2.4"
   }
 }

recipes/drupal_cms_analytics/composer.json

@@ -3,6 +3,6 @@
     "type": "metapackage",
     "description": "Adds recipes for tracking website traffic.",
     "require": {
-        "drupal/drupal_cms_google_analytics": "*"
+        "drupal/drupal_cms_google_analytics": "1.0.x-dev"
     }
 }

recipes/drupal_cms_authentication/composer.json

@@ -6,7 +6,7 @@
     "require": {
         "drupal/bpmn_io": "^2.0.3",
         "drupal/core": ">=10.3",
-        "drupal/eca": "^2.1.0",
+        "drupal/eca": "^2.1",
         "drupal/login_emailusername": "^3",
         "drupal/token": "^1"
     }

recipes/drupal_cms_blog/composer.json

@@ -6,7 +6,7 @@
     "require": {
         "drupal/core": ">=10.4",
         "drupal/add_content_by_bundle": "^1.2.2",
-        "drupal/drupal_cms_page": "*",
+        "drupal/drupal_cms_page": "1.0.x-dev",
         "drupal/better_exposed_filters": "^7",
         "drupal/selective_better_exposed_filters": "^3"
     }

recipes/drupal_cms_case_study/composer.json

@@ -6,6 +6,6 @@
     "require": {
         "drupal/core": ">=10.4",
         "drupal/add_content_by_bundle": "^1.2.2",
-        "drupal/drupal_cms_page": "*"
+        "drupal/drupal_cms_page": "1.0.x-dev"
     }
 }

recipes/drupal_cms_content_type_base/composer.json

@@ -7,8 +7,8 @@
         "drupal/autosave_form": "^1.7",
         "drupal/bpmn_io": "^2.0.3",
         "drupal/core": ">=10.4",
-        "drupal/drupal_cms_image": "*",
-        "drupal/eca": "^2.1.0",
+        "drupal/drupal_cms_image": "1.0.x-dev",
+        "drupal/eca": "^2.1",
         "drupal/linkit": "^7",
         "drupal/pathauto": "^1.13",
         "drupal/token": "^1",

recipes/drupal_cms_events/composer.json

@@ -7,9 +7,9 @@
     "drupal/core": ">=10.4",
     "drupal/add_content_by_bundle": "^1.2.2",
     "drupal/address": "^2",
-    "drupal/addtocal_augment": "^1.2@rc",
-    "drupal/drupal_cms_page": "*",
-    "drupal/drupal_cms_privacy_basic": "*",
+    "drupal/addtocal_augment": "^1.2.3",
+    "drupal/drupal_cms_page": "1.0.x-dev",
+    "drupal/drupal_cms_privacy_basic": "1.0.x-dev",
     "drupal/geocoder": "^4.10",
     "drupal/geofield": "^1.47",
     "drupal/leaflet": "^10.2.33",

recipes/drupal_cms_forms/composer.json

@@ -4,8 +4,8 @@
     "type": "drupal-recipe",
     "license": ["GPL-2.0-or-later"],
     "require": {
-        "drupal/drupal_cms_anti_spam": "*",
-        "drupal/drupal_cms_page": "*",
+        "drupal/drupal_cms_anti_spam": "1.0.x-dev",
+        "drupal/drupal_cms_page": "1.0.x-dev",
         "drupal/core": ">=10.4",
         "drupal/webform": "^6.3-beta1"
     }

recipes/drupal_cms_google_analytics/composer.json

@@ -5,6 +5,6 @@
     "require": {
         "drupal/core": ">=10.4",
         "drupal/google_tag": "^2.0.7",
-        "drupal/drupal_cms_privacy_basic": "*"
+        "drupal/drupal_cms_privacy_basic": "1.0.x-dev"
     }
 }

recipes/drupal_cms_news/composer.json

@@ -6,7 +6,7 @@
     "require": {
         "drupal/core": ">=10.4",
         "drupal/add_content_by_bundle": "^1.2.2",
-        "drupal/drupal_cms_page": "*",
+        "drupal/drupal_cms_page": "1.0.x-dev",
         "drupal/better_exposed_filters": "^7",
         "drupal/selective_better_exposed_filters": "^3"
     }

recipes/drupal_cms_page/composer.json

@@ -5,6 +5,6 @@
     "license": ["GPL-2.0-or-later"],
     "require": {
         "drupal/core": ">=10.4",
-        "drupal/drupal_cms_content_type_base": "*"
+        "drupal/drupal_cms_content_type_base": "1.0.x-dev"
     }
 }

recipes/drupal_cms_person/composer.json

@@ -5,6 +5,6 @@
     "license": ["GPL-2.0-or-later"],
     "require": {
         "drupal/core": ">=10.4",
-        "drupal/drupal_cms_content_type_base": "*"
+        "drupal/drupal_cms_content_type_base": "1.0.x-dev"
     }
 }

recipes/drupal_cms_privacy_basic/composer.json

@@ -7,7 +7,7 @@
         "drupal/bpmn_io": "^2.0.3",
         "drupal/core": ">=10.4",
         "drupal/eca": "^2.1",
-        "drupal/drupal_cms_page": "*",
+        "drupal/drupal_cms_page": "1.0.x-dev",
         "drupal/klaro": "^3-rc16",
         "drupal/menu_link_attributes": "^1.5"
     }

recipes/drupal_cms_project/composer.json

@@ -6,6 +6,6 @@
     "require": {
         "drupal/core": ">=10.4",
         "drupal/add_content_by_bundle": "^1.2.2",
-        "drupal/drupal_cms_page": "*"
+        "drupal/drupal_cms_page": "1.0.x-dev"
     }
 }

recipes/drupal_cms_remote_video/composer.json

@@ -5,6 +5,6 @@
     "license": ["GPL-2.0-or-later"],
     "require": {
         "drupal/core": ">=10.4",
-        "drupal/drupal_cms_privacy_basic": "*"
+        "drupal/drupal_cms_privacy_basic": "1.0.x-dev"
     }
 }