Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tech 35 pantheon install #210

Merged
merged 7 commits into from
Jan 19, 2023
Merged

Tech 35 pantheon install #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b25233
Prefix ddev config file location.
agentrickard Jan 13, 2023
a190f6f
Update to pear/http_request2 v2.5
agentrickard Jan 13, 2023
5adf0fe
test with the minimum-stability-dev branch of the skeleton
byrond Jan 14, 2023
5e098ea
remove config_ignore until there is a stable release that supports dr…
byrond Jan 16, 2023
37072f3
revert pear/http_request2 update until we can test it
byrond Jan 16, 2023
035f000
revert change of drupal skeleton version to test with
byrond Jan 16, 2023
67aff19
copy settings.ddev.php to old drupal root if it doesn't exist
byrond Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion targets/drupal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ Or, you can specify the export file directly:
<composer command="require" composer="${composer.composer}">
<arg value="drupal/admin_toolbar" />
<arg value="drupal/config_split" />
<arg value="drupal/config_ignore" />
<arg value="drupal/devel" />
<arg value="drupal/workbench" />
<arg value="drupal/workbench_tabs" />
Expand Down
12 changes: 11 additions & 1 deletion targets/install.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,16 @@
<!-- The one that's available is the location we're moving from. -->
<available file="${build.dir}/web/core" type="dir" property="drupal.root.old" value="web" />
<available file="${build.dir}/docroot/core" type="dir" property="drupal.root.old" value="docroot" />
<available file="${build.dir}/${drupal.root.old}/sites/default/settings.ddev.php" type="file" property="ddev_settings_exists" value="true" />

<!-- Copy settings.ddev.php if it doesn't exist in the old drupal root. -->
<if>
<not><equals arg1="${ddev_settings_exists}" arg2="1" /></not>
<then>
<echo msg="Copying settings.ddev.php to old drupal root." />
<exec command="cp ${drupal.root}/sites/default/settings.ddev.php ${drupal.root.old}/sites/default" dir="${build.dir}" checkreturn="true" logoutput="true" />
</then>
</if>

<echo msg="Moving the ${drupal.root.old}/ directory to ${drupal.root}/" />
<exec command="rm -rf ${drupal.root}" dir="${build.dir}" />
Expand Down Expand Up @@ -169,7 +179,7 @@
<!-- Target: setup-templates -->
<target name="setup-templates" depends="set-site">
<!-- Set the project name in the ddev config. -->
<replaceregexp match="name: .*" replace="name: ${projectname}" file=".ddev/config.yaml" />
<replaceregexp match="name: .*" replace="name: ${projectname}" file="${application.startdir}/.ddev/config.yaml" />

<!-- Copy the build file template.

Expand Down