From 8c75c790347c82339f7730d92d527950595af627 Mon Sep 17 00:00:00 2001
From: Daniel Mundra <11160-dmundra@users.noreply.drupalcode.org>
Date: Fri, 28 Feb 2025 16:56:56 +0000
Subject: [PATCH 1/6] Adding tugboat
---
.tugboat/config.yml | 46 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 .tugboat/config.yml
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
new file mode 100644
index 0000000..2e8e464
--- /dev/null
+++ b/.tugboat/config.yml
@@ -0,0 +1,46 @@
+services:
+ php:
+ # Specify the version of Drupal you wish to use for Tugboat below.
+ image: tugboatqa/drupal:11
+ default: true
+ http: false
+ depends: mysql
+ commands:
+ update: |
+ set -eux
+ # This is an environment variable we added in the Dockerfile that
+ # provides the path to Drupal composer root (not the web root).
+ cd $DRUPAL_COMPOSER_ROOT
+ # We need to change the minimum stability to dev to use the path
+ composer config minimum-stability dev
+ # We configure the Drupal project to use the checkout of the module as a
+ # Composer package repository.
+ composer config repositories.tugboat path $TUGBOAT_ROOT
+ # Now we can require this module
+ composer require drupal/simplesamlphp_custom_attributes
+ # Install Drupal on the site.
+ vendor/bin/drush \
+ --yes \
+ --db-url=mysql://tugboat:tugboat@mysql:3306/tugboat \
+ --site-name="Live preview for ${TUGBOAT_PREVIEW_NAME}" \
+ --account-pass=admin \
+ site:install standard
+ # Add tugboat URLs to the Drupal trusted host patterns.
+ echo "\$settings['trusted_host_patterns'] = ['\.tugboatqa\.com\$'];" >> $DOCROOT/sites/default/settings.php
+ # Set up the files directory permissions.
+ mkdir -p $DRUPAL_DOCROOT/sites/default/files
+ chgrp -R www-data $DRUPAL_DOCROOT/sites/default/files
+ chmod 2775 $DRUPAL_DOCROOT/sites/default/files
+ chmod -R g+w $DRUPAL_DOCROOT/sites/default/files
+ # Enable the module.
+ vendor/bin/drush --yes pm:enable simplesamlphp_custom_attributes
+ build: |
+ set -eux
+ cd $DRUPAL_COMPOSER_ROOT
+ composer install --optimize-autoloader
+ # Update this module, including all dependencies.
+ composer update drupal/simplesamlphp_custom_attributes --with-all-dependencies
+ vendor/bin/drush --yes updb
+ vendor/bin/drush cache:rebuild
+ mysql:
+ image: tugboatqa/mariadb
\ No newline at end of file
--
GitLab
From da49d670531eaa15854fef2159462ba6d4dd979f Mon Sep 17 00:00:00 2001
From: Daniel Mundra <11160-dmundra@users.noreply.drupalcode.org>
Date: Fri, 28 Feb 2025 17:49:32 +0000
Subject: [PATCH 2/6] Updating composer version of simplesamlphp_auth and
switching tugboat to D10
---
.tugboat/config.yml | 2 +-
composer.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
index 2e8e464..f39a1e8 100644
--- a/.tugboat/config.yml
+++ b/.tugboat/config.yml
@@ -1,7 +1,7 @@
services:
php:
# Specify the version of Drupal you wish to use for Tugboat below.
- image: tugboatqa/drupal:11
+ image: tugboatqa/drupal:10
default: true
http: false
depends: mysql
diff --git a/composer.json b/composer.json
index 2166208..ba8b287 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"homepage": "https://www.drupal.org/project/simplesamlphp_custom_attributes",
"license": "GPL-2.0+",
"require": {
- "drupal/simplesamlphp_auth": "^3.2 || ^4"
+ "drupal/simplesamlphp_auth": "^4"
},
"config": {
"allow-plugins": {
--
GitLab
From 641be866673e236d3fe3cf309f4305c53f727765 Mon Sep 17 00:00:00 2001
From: Daniel Mundra <11160-dmundra@users.noreply.drupalcode.org>
Date: Fri, 28 Feb 2025 17:53:21 +0000
Subject: [PATCH 3/6] Switching tests to just D10 for now
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3af21cd..f16c352 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,9 @@ include:
#
# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
################
-# variables:
+variables:
+ OPT_IN_TEST_PREVIOUS_MAJOR: 1
+ OPT_IN_TEST_CURRENT: 0
# SKIP_ESLINT: '1'
###################################################################################
--
GitLab
From 06a9ca1278e9356be6537204daf8dc4a18ce64b9 Mon Sep 17 00:00:00 2001
From: Daniel Mundra <daniel.mundra@civicactions.com>
Date: Fri, 28 Feb 2025 09:57:23 -0800
Subject: [PATCH 4/6] Allowing simplesamlphp/composer-xmlprovider-installer.
---
composer.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index ba8b287..6790e09 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,8 @@
},
"config": {
"allow-plugins": {
- "simplesamlphp/composer-module-installer": true
+ "simplesamlphp/composer-module-installer": true,
+ "simplesamlphp/composer-xmlprovider-installer": true
}
}
}
--
GitLab
From dbd120c4de67fae5407669cbc8753fdd41837473 Mon Sep 17 00:00:00 2001
From: Daniel Mundra <11160-dmundra@users.noreply.drupalcode.org>
Date: Sat, 1 Mar 2025 15:06:15 +0000
Subject: [PATCH 5/6] Edit config.yml
---
.tugboat/config.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
index f39a1e8..bc28c23 100644
--- a/.tugboat/config.yml
+++ b/.tugboat/config.yml
@@ -17,6 +17,7 @@ services:
# Composer package repository.
composer config repositories.tugboat path $TUGBOAT_ROOT
# Now we can require this module
+ composer config --no-plugins allow-plugins.simplesamlphp/composer-xmlprovider-installer true
composer require drupal/simplesamlphp_custom_attributes
# Install Drupal on the site.
vendor/bin/drush \
--
GitLab
From 1965ee0c92bb308f488d22af47536bdf4cd43674 Mon Sep 17 00:00:00 2001
From: Daniel Mundra <11160-dmundra@users.noreply.drupalcode.org>
Date: Sat, 1 Mar 2025 15:09:53 +0000
Subject: [PATCH 6/6] updating tugboat config
---
.tugboat/config.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
index bc28c23..e544824 100644
--- a/.tugboat/config.yml
+++ b/.tugboat/config.yml
@@ -17,6 +17,7 @@ services:
# Composer package repository.
composer config repositories.tugboat path $TUGBOAT_ROOT
# Now we can require this module
+ composer config --no-plugins allow-plugins.simplesamlphp/composer-module-installer true
composer config --no-plugins allow-plugins.simplesamlphp/composer-xmlprovider-installer true
composer require drupal/simplesamlphp_custom_attributes
# Install Drupal on the site.
--
GitLab