Skip to content

Commit

Permalink
[BUGS-5651] Workaround issue with preUpdate script. (#470)
Browse files Browse the repository at this point in the history
* Run composer update twice.

* Add ssh keys step.

* Set platform.php instead of running composer twice.

* Delete not relevant comment.

* Workaround non-existing vendor folder issue to set platform.php the right way.

* Some cleanup.
  • Loading branch information
kporras07 authored Jan 25, 2023
1 parent e7305c6 commit 432c36b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ jobs:
- run:
name: Disable strict SSH host checking to prevent SSH connect issues
command: echo "StrictHostKeyChecking no" >> "$HOME/.ssh/config"
- add_ssh_keys:
fingerprints:
- "74:82:8b:ea:78:ad:23:23:68:70:b6:07:5c:2b:4b:e0"
- run:
name: Test D9 with GitHub
command: ./.circleci/test-github-repo.sh "d9"
Expand Down Expand Up @@ -160,6 +163,9 @@ jobs:
- run:
name: Disable strict SSH host checking to prevent SSH connect issues
command: echo "StrictHostKeyChecking no" >> "$HOME/.ssh/config"
- add_ssh_keys:
fingerprints:
- "74:82:8b:ea:78:ad:23:23:68:70:b6:07:5c:2b:4b:e0"
- run:
name: Test WordPress with GitHub
command: ./.circleci/test-github-repo.sh "pantheon-systems/example-wordpress-composer:dev-master" --use-ssh
Expand Down
1 change: 1 addition & 0 deletions src/Commands/BuildToolsBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ protected function createFromSourceProject($source, $target, $stability = '', $t
if ($source === '[email protected]:pantheon-upstreams/drupal-composer-managed.git' && empty($stability_flag)) {
// This is not published in packagist so it needs dev stability.
$stability_flag = '--stability dev';
$additional_commands[] = "mkdir $tmpsitedir/$target/vendor";
$additional_commands[] = "composer --working-dir=$tmpsitedir/$target require pantheon-upstreams/upstream-configuration:'*' --no-update";
$additional_commands[] = "composer --working-dir=$tmpsitedir/$target config minimum-stability dev";
$additional_commands[] = "composer --working-dir=$tmpsitedir/$target install -n";
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/ProjectCreateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ public function createProject(
// Install packages depending on the application.
if ($app === 'Drupal') {
exec("composer --working-dir=$siteDir require --no-update --dev drupal/coder drupal/drupal-extension drupal/drupal-driver");
exec("composer --working-dir=$siteDir require --no-update drush-ops/behat-drush-endpoint");
exec("composer --working-dir=$siteDir require --no-update --dev drush-ops/behat-drush-endpoint");
exec("composer --working-dir=$siteDir require --no-update pantheon-systems/quicksilver-pushback");
} elseif (strtolower($app) === 'wordpress') {
exec("composer --working-dir=$siteDir require --no-update --dev wp-coding-standards/wpcs");
Expand Down

0 comments on commit 432c36b

Please sign in to comment.