Skip to content

Commit

Permalink
Upgrade Terminus to version 3 to support PHP 8 (#101)
Browse files Browse the repository at this point in the history
* Upgrade Terminus to version 3 to support PHP 8
  • Loading branch information
rabbitlair authored Jul 6, 2022
1 parent 7fc3afc commit d618177
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 3 deletions.
8 changes: 8 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,13 @@
"\\Lullabot\\Drainpipe\\ScaffoldInstallerPlugin",
"\\Lullabot\\Drainpipe\\BinaryInstallerPlugin"
]
},
"config": {
"allow-plugins": {
"composer/installers": true,
"drupal/core-composer-scaffold": true,
"drupal/core-project-message": true,
"lullabot/drainpipe": true
}
}
}
2 changes: 1 addition & 1 deletion scaffold/github/actions/pantheon/setup-terminus/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
- run: |
echo -e "Host *.drush.in\n StrictHostKeyChecking no\n HostkeyAlgorithms +ssh-rsa\n PubkeyAcceptedAlgorithms +ssh-rsa" >> ~/.ssh/config
mkdir ~/terminus
curl -L https://github.com/pantheon-systems/terminus/releases/download/2.6.2/terminus.phar --output ~/terminus/terminus
curl -L https://github.com/pantheon-systems/terminus/releases/download/3.0.7/terminus.phar --output ~/terminus/terminus
chmod +x ~/terminus/terminus
ln -s ~/terminus/terminus /usr/local/bin/terminus
terminus auth:login --machine-token="${{ inputs.pantheon-token }}"
Expand Down
2 changes: 1 addition & 1 deletion scaffold/gitlab/Pantheon.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- !reference [.drainpipe_setup_git, script]
- echo -e "Host *.drush.in\n StrictHostKeyChecking no\n HostkeyAlgorithms +ssh-rsa\n PubkeyAcceptedAlgorithms +ssh-rsa" >> ~/.ssh/config
- mkdir ~/terminus
- curl -L https://github.com/pantheon-systems/terminus/releases/download/2.6.2/terminus.phar --output ~/terminus/terminus
- curl -L https://github.com/pantheon-systems/terminus/releases/download/3.0.7/terminus.phar --output ~/terminus/terminus
- chmod +x ~/terminus/terminus
- ln -s ~/terminus/terminus /usr/local/bin/terminus
- terminus auth:login --machine-token="$PANTHEON_TERMINUS_TOKEN"
8 changes: 7 additions & 1 deletion tests/fixtures.drainpipe-test-build/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"composer/installers": true,
"drupal/core-composer-scaffold": true,
"drupal/core-project-message": true,
"lullabot/drainpipe": true
}
},
"extra": {
"drupal-scaffold": {
Expand Down
5 changes: 5 additions & 0 deletions tests/fixtures/drainpipe-test-project/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,10 @@
"prefer-stable": true,
"require": {
"lullabot/drainpipe": "*"
},
"config": {
"allow-plugins": {
"lullabot/drainpipe": true
}
}
}

0 comments on commit d618177

Please sign in to comment.