Merge remote-tracking branch 'origin/develop' into test-test

palantirnet · Jan 5, 2023 · d2983d7 · d2983d7
2 parents 6b274f9 + 520f344
commit d2983d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/defaults/install/.circleci/deploy-pantheon.example b/defaults/install/.circleci/deploy-pantheon.example
@@ -1,5 +1,6 @@
-# Example snippet for deploy job in config.yml. Add this code to deploy to Pantheon. Update PANTHEON_PUBKEY
-# with the entry from your known_hosts file for the code server.
+# Example snippet for deploy job in config.yml. Add this code to deploy to Pantheon.
+# Update PANTHEON_PUBKEY with the entry from your known_hosts file for the code server.
+# (To get the known_hosts entry, git clone the SSH URL of the Pantheon repository.)
 #
 # You will also need to add a step to the build job to persist to workspace:
 #

diff --git a/defaults/install/pantheon.yml b/defaults/install/pantheon.yml
@@ -1,5 +1,8 @@
 # Pantheon configuration file
+# @see https://pantheon.io/docs/pantheon-yml
+
 api_version: 1
 web_docroot: true
-php_version: 7.4
-drush_version: 8
+php_version: 8.1
+drush_version: 10
+build_step: false