Skip to content

Commit

Permalink
9.3.25
Browse files Browse the repository at this point in the history
  • Loading branch information
pookmish authored Aug 24, 2022
2 parents 7febf74 + f270ed9 commit 892c5a3
Show file tree
Hide file tree
Showing 52 changed files with 1,965 additions and 1,317 deletions.
17 changes: 16 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,20 @@ add_ssh: &add_ssh
fingerprints:
- "88:4a:09:8a:0f:d7:ee:ed:74:4e:f3:33:5e:98:ce:85"

## Add Known Hosts
add_known_hosts: &add_known_hosts
run:
name: Add SSH Known Hosts
command: |
ssh-keyscan svn-23450.prod.hosting.acquia.com >> ~/.ssh/known_hosts
ssh-keyscan web-42199.prod.hosting.acquia.com >> ~/.ssh/known_hosts
ssh-keyscan staging-25390.prod.hosting.acquia.com >> ~/.ssh/known_hosts
ssh-keyscan -t rsa,dsa github.com >> ~/.ssh/known_hosts
## Defines images and working directory.
defaults: &defaults
docker:
- image: pookmish/drupal8ci:php8
- image: pookmish/drupal8ci:latest
- image: selenium/standalone-chrome:latest
- image: circleci/mysql:5.7
environment:
Expand Down Expand Up @@ -68,6 +78,7 @@ acceptance_first: &acceptance_first
<<: *defaults
steps:
- *add_ssh
- *add_known_hosts
- attach_workspace:
at: .
- *disable_telemetry
Expand All @@ -84,6 +95,7 @@ acceptance_second: &acceptance_second
<<: *defaults
steps:
- *add_ssh
- *add_known_hosts
- attach_workspace:
at: .
- *disable_telemetry
Expand Down Expand Up @@ -132,6 +144,7 @@ deploy_branch: &deploy_branch
<<: *defaults
steps:
- *add_ssh
- *add_known_hosts
- attach_workspace:
at: .
- *disable_telemetry
Expand All @@ -147,6 +160,7 @@ deploy_tag: &deploy_tag
<<: *defaults
steps:
- *add_ssh
- *add_known_hosts
- checkout
- restore_cache: *restore_cache
- run: composer install --optimize-autoloader
Expand All @@ -164,6 +178,7 @@ update_dependencies: &update_dependencies
<<: *defaults
steps:
- *add_ssh
- *add_known_hosts
- checkout
- restore_cache: *restore_cache
- run: composer install --optimize-autoloader
Expand Down
2 changes: 1 addition & 1 deletion blt/src/Blt/Plugin/Commands/HsCircleCiCommands.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function jobNewReleaseBranch(string $last_version) {
->run();

$message = "$new_version Release" . PHP_EOL . PHP_EOL . '# DO NOT DELETE';
$this->taskExec("g pr create -B develop -b '$message'")
$this->taskExec("gh pr create -B develop -b '$message' -f")
->run();
}

Expand Down
13 changes: 7 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
],
"require": {
"php": ">=8.0",
"acquia/blt": "^13.4",
"acquia/blt": "^13.5",
"acquia/blt-multisite": "^1.0",
"acquia/blt-simplesamlphp": "^1.0",
"ckeditor-plugin/liststyle": "4.14.0",
Expand Down Expand Up @@ -155,7 +155,7 @@
"drupal/conditional_fields": "^4.0@alpha",
"drupal/config_filter": "^1.0",
"drupal/config_ignore": "^2.2",
"drupal/config_pages_overrides": "^1.0@beta",
"drupal/config_pages_overrides": "^2.0",
"drupal/config_readonly": "^1.0@beta",
"drupal/config_split": "^1.0",
"drupal/config_update": "^1.7",
Expand Down Expand Up @@ -213,7 +213,7 @@
"drupal/paragraphs_edit": "^2.0@alpha",
"drupal/path_redirect_import": "^2.0",
"drupal/pathauto": "^1.8",
"drupal/porterstemmer": "^1.1",
"drupal/porterstemmer": "^2.0",
"drupal/printfriendly": "^3.5",
"drupal/publishcontent": "^1.2",
"drupal/purge": "^3.2",
Expand All @@ -231,7 +231,7 @@
"drupal/slick_paragraphs": "^2.0",
"drupal/smart_date": "^3.1",
"drupal/smart_trim": "^1.3",
"drupal/spamspan": "^1.2",
"drupal/spamspan": "^2.0",
"drupal/stage_file_proxy": "^1.1",
"drupal/taxonomy_menu_ui": "^2.0",
"drupal/term_condition": "^2.0",
Expand All @@ -254,7 +254,7 @@
"drupal/webp": "^1.0@beta",
"drupal/xmlsitemap": "^1.0",
"drupal/yearonly": "^9.0",
"drush/drush": "^10.3",
"drush/drush": "^11.1",
"harvesthq/chosen": "^1.8",
"kenwheeler/slick": "^1.8",
"onlyextart/colorbox": "dev-master#e58476becbc89dc671093d1bcd9f99b2167fa8f7",
Expand Down Expand Up @@ -319,7 +319,8 @@
"https://www.drupal.org/project/drupal/issues/2999491": "https://www.drupal.org/files/issues/2020-10-06/2999491--reusable-title-display--56.patch",
"https://www.drupal.org/project/drupal/issues/2981837": "https://www.drupal.org/files/issues/2019-05-22/findMigrationDependencies-null-process-value-2981837-5.patch",
"https://www.drupal.org/project/drupal/issues/2925297": "https://www.drupal.org/files/issues/2019-09-26/core-typed_config_handle_missing_config-2925297-18.patch",
"https://www.drupal.org/project/drupal/issues/1349080": "https://www.drupal.org/files/issues/2021-04-02/1349080-487.patch"
"https://www.drupal.org/project/drupal/issues/1349080": "https://www.drupal.org/files/issues/2021-04-02/1349080-487.patch",
"drupallink conflict with anchorlink": "patches/drupallink.patch"
},
"drupal/ds": {
"https://www.drupal.org/project/ds/issues/2939322": "https://www.drupal.org/files/issues/2020-01-07/ds-content_entity-2939322-11.patch"
Expand Down
Loading

0 comments on commit 892c5a3

Please sign in to comment.