Skip to content

Commit

Permalink
Merge branch 'develop' into SHS-6009--social-media-field-visibility
Browse files Browse the repository at this point in the history
  • Loading branch information
ahughes3 authored Jan 24, 2025
2 parents 8172c97 + 16621c4 commit 7d6d72b
Show file tree
Hide file tree
Showing 17 changed files with 333 additions and 152 deletions.
46 changes: 18 additions & 28 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,30 @@
github:
prebuilds:
master: true
branches: false
pullRequests: true
pullRequestsFromForks: false
addCheck: false
addComment: false
addBadge: false
ports:
- port: 3306
onOpen: ignore
visibility: private
- port: 33060
onOpen: ignore
visibility: private
- port: 8001
- port: 8001-8999
onOpen: ignore
visibility: public
image: pookmish/drupal8ci:gitpod
tasks:
- before: >
eval $(command gp env -e) &&
mkdir -p ~/.ssh &&
[[ ! -z $SSH_PUBLIC_KEY ]] &&
echo $SSH_PUBLIC_KEY | base64 -d > ~/.ssh/id_rsa.pub &&
chmod 644 ~/.ssh/id_rsa.pub &&
[[ ! -z $SSH_PRIVATE_KEY ]] &&
echo $SSH_PRIVATE_KEY | base64 -d > ~/.ssh/id_rsa &&
chmod 600 ~/.ssh/id_rsa &&
[[ ! -z $GITCONFIG ]] &&
echo $GITCONFIG | base64 -d > ~/.gitconfig &&
chmod 644 ~/.gitconfig
- name: SSH Keys
before: |
mkdir -p ~/.ssh
if [[ ! -z $SSH_PRIVATE_KEY ]]; then
echo $SSH_PRIVATE_KEY | base64 -d > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa &&
git remote set-url origin [email protected]:SU-HSDO/suhumsci.git
fi
if [[ ! -z $GITCONFIG ]]; then
echo $GITCONFIG | base64 -d > ~/.gitconfig && chmod 644 ~/.gitconfig
fi
init: >
export PREVIEW_FULL_URL=`gp url 8001` &&
export PREVIEW_URL=${PREVIEW_FULL_URL#"https://"} &&
cp .gitpod/blt.yml blt/local.blt.yml &&
cp .gitpod/sites.php docroot/sites/local.sites.php &&
composer install --no-interaction &&
rm -rf docroot/*/custom/* &&
composer install --prefer-source --no-interaction &&
Expand All @@ -43,15 +33,15 @@ tasks:
blt settings &&
mysql -u root -e 'CREATE DATABASE IF NOT EXISTS drupal_default; CREATE DATABASE IF NOT EXISTS drupal' &&
blt sws:keys &&
blt source:build:simplesamlphp-config &&
mysql -e 'SET GLOBAL max_allowed_packet=67108864;' &&
blt drupal:sync --site=hs_colorful -n &&
drush sql-sync @hs_colorful.local @self -y
if [[ ! -z $SSH_PRIVATE_KEY ]]; then
blt drupal:sync --site=hs_colorful -n &&
drush sql-sync @hs_colorful.local @self -y
else
blt drupal:install --no-interaction
fi
command: >
git config core.fileMode false &&
blt blt:telemetry:disable --no-interaction &&
git remote set-url origin [email protected]:SU-HSDO/suhumsci.git &&
apache2ctl restart &&
gp ports await 8001 &&
drush uli &&
Expand Down
10 changes: 10 additions & 0 deletions .gitpod/gitpod.settings.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<?php

error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);

$config['samlauth.authentication']['sp_x509_certificate'] = 'file:' . DRUPAL_ROOT . '/../keys/saml/cert/saml.crt';
$config['samlauth.authentication']['sp_private_key'] = 'file:' . DRUPAL_ROOT . '/../keys/saml/cert/saml.pem';
$config['samlauth.authentication']['idp_certs'] = [
'file:' . DRUPAL_ROOT . '/../keys/saml/cert/signing.crt',
];
$config['stanford_samlauth.settings']['role_mapping']['workgroup_api'] = [
'cert' => DRUPAL_ROOT . '/../keys/saml/workgroup_api.cert',
'key' => DRUPAL_ROOT . '/../keys/saml/workgroup_api.key',
];
19 changes: 19 additions & 0 deletions .gitpod/sites.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

$settings = glob(__DIR__ . '/*/settings.php');

$workspace_url = getenv('GITPOD_WORKSPACE_URL');
$workspace_domain = preg_replace('/^.*?\/\//', '', $workspace_url);

$port = 8002;
foreach ($settings as $settings_file) {
$site_dir = str_replace(__DIR__ . '/', '', $settings_file);
$site_dir = str_replace('/settings.php', '', $site_dir);

if ($site_dir == 'default') {
$site_dir = 'swshumsci';
}

$sites["$port-$workspace_domain"] = $site_dir;
$port++;
}
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"drupal/auto_entitylabel": "^3.0@beta",
"drupal/better_exposed_filters": "^7.0",
"drupal/better_normalizers": "^2.0",
"drupal/block_class": "^2.0",
"drupal/block_class": "^4.0",
"drupal/block_content_permissions": "^1.10",
"drupal/cancel_button": "^1.1",
"drupal/chosen": "^4.0",
Expand Down Expand Up @@ -229,6 +229,9 @@
"extra": {
"enable-patching": true,
"patches": {
"drupal/block_class": {
"Click JavaScript to close details causes modals to scroll unnecessarily https://www.drupal.org/project/block_class/issues/3497768": "patches/contrib/block_class/60.patch"
},
"drupal/config_ignore": {
"https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2020-01-11/support-for-export-2857247-44.patch",
"https://www.drupal.org/project/config_ignore/issues/2865419": "https://www.drupal.org/files/issues/2020-07-20/config_ignore-wildcard_force_import.patch"
Expand Down Expand Up @@ -283,6 +286,9 @@
"https://www.drupal.org/project/redirect/issues/3057250": "https://www.drupal.org/files/issues/2024-08-11/redirect--2024-08-11--3057250-79.patch",
"https://www.drupal.org/project/redirect/issues/3018897": "https://www.drupal.org/files/issues/2024-08-12/redirect-3018897-28.patch"
},
"drupal/shield": {
"https://www.drupal.org/project/shield/issues/3479117": "patches/shield-undefined_array_key_explode-3479117.patch"
},
"drupal/ui_patterns": {
"Ui Patterns Views Preview": "patches/contrib/ui_patterns_views-preview.patch"
},
Expand Down
Loading

0 comments on commit 7d6d72b

Please sign in to comment.