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.

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

Justafish/issue 204 acquia integration v3 #740

Draft
wants to merge 142 commits into
base: justafish/issue-204-acquia-integration
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
7d1b9fd
ISSUE-204: fix ddev applying composer configuration for tests
beto-aveiga Nov 25, 2024
2ce6b25
Merge branch 'main' of github.com:Lullabot/drainpipe into justafish/i…
beto-aveiga Nov 25, 2024
5afd7e9
ISSUE-204: moving action to clone acquia env to the scaffold
beto-aveiga Nov 25, 2024
210c3d8
ISSUE-204: typo [skip ci]
beto-aveiga Nov 25, 2024
dab6840
ISSUE-204: typo [skip ci]
beto-aveiga Nov 25, 2024
40759e7
To trigger CI workflows
beto-aveiga Nov 25, 2024
523ad93
ISSUE-204: debug
beto-aveiga Nov 25, 2024
74a006d
ISSUE-204: more debugging
beto-aveiga Nov 25, 2024
61a9d1f
ISSUE-204: fix typo
beto-aveiga Nov 25, 2024
6e316d5
ISSUE-204: typo
beto-aveiga Nov 25, 2024
3d05d6f
ISSUE-204: fix defining composer settings for acquia actions
beto-aveiga Nov 25, 2024
4f9d9ec
ISSUE-204: remove debug [skip ci]
beto-aveiga Nov 25, 2024
c8d5c90
ISSUE-204: adding acquia tasks
beto-aveiga Nov 25, 2024
59e1caa
ISSUE-204: different syntax for yq, not -y flag needed
beto-aveiga Nov 25, 2024
46503cf
ISSUE-204: using Taskfile after drainpipe installation with composer
beto-aveiga Nov 25, 2024
6651bf9
ISSUE-204: fix path
beto-aveiga Nov 25, 2024
26fc77d
ISSUE-204: fix path
beto-aveiga Nov 25, 2024
49d8f59
ISSUE-204: debugging
beto-aveiga Nov 25, 2024
ca58ff8
ISSUE-204: debugging
beto-aveiga Nov 25, 2024
724f44d
ISSUE-204: more debugging
beto-aveiga Nov 25, 2024
276c215
ISSUE-204: more debugging
beto-aveiga Nov 25, 2024
00fd90c
ISSUE-204: more debugging
beto-aveiga Nov 25, 2024
deca1fa
ISSUE-204: more debugging
beto-aveiga Nov 26, 2024
6671490
ISSUE-204: more debugging
beto-aveiga Nov 26, 2024
11d16c4
ISSUE-204: more debugging
beto-aveiga Nov 26, 2024
cd4287b
ISSUE-204: move to scaffold
beto-aveiga Nov 26, 2024
73c85a0
ISSUE-204: move to scaffold
beto-aveiga Nov 26, 2024
b044007
ISSUE-204: restore action
beto-aveiga Nov 26, 2024
79b5676
ISSUE-204: fix paths
beto-aveiga Nov 26, 2024
9010513
ISSUE-204: to avoid spending github minutes running other workflows […
beto-aveiga Nov 26, 2024
e2a53fa
ISSUE-204: debugging
beto-aveiga Nov 26, 2024
364b60a
ISSUE-204: fix paths
beto-aveiga Nov 26, 2024
7d8ecde
ISSUE-204: debug
beto-aveiga Nov 26, 2024
5cbdcc5
ISSUE-204: debug
beto-aveiga Nov 26, 2024
79abadf
ISSUE-204: debug [skip ci]
beto-aveiga Nov 26, 2024
01ec60b
To trigger CI workflows
beto-aveiga Nov 26, 2024
7766169
ISSUE-204: fix paths
beto-aveiga Nov 26, 2024
3fd9213
ISSUE-204: fix typo for debugging
beto-aveiga Nov 26, 2024
26f68d6
ISSUE-204: typo
beto-aveiga Nov 26, 2024
b03a3b0
ISSUE-204: restoting content
beto-aveiga Nov 26, 2024
44e7d18
ISSUE-204: debugging, remove deployment create
beto-aveiga Nov 26, 2024
4783436
ISSUE-204: debugging, restore deployment create
beto-aveiga Nov 26, 2024
3a63464
ISSUE-204: debug
beto-aveiga Nov 26, 2024
0985509
ISSUE-204: adding shell
beto-aveiga Nov 26, 2024
de0ef8d
ISSUE-204: debug
beto-aveiga Nov 26, 2024
c8a4cfe
ISSUE-204: debug
beto-aveiga Nov 26, 2024
a2f9039
ISSUE-204: using different path
beto-aveiga Nov 26, 2024
e68187d
ISSUE-204: fail faster [skip ci]
beto-aveiga Nov 26, 2024
5ae8cde
ISSUE-204: using different path
beto-aveiga Nov 26, 2024
180312c
ISSUE-204: restore TestAcquia
beto-aveiga Nov 26, 2024
a4caef2
ISSUE-204: different path format
beto-aveiga Nov 26, 2024
a7b2c90
ISSUE-204: debug site aliases
beto-aveiga Nov 26, 2024
16b6bb6
ISSUE-204: debug site aliases
beto-aveiga Nov 26, 2024
1933384
ISSUE-204: use an available alias
beto-aveiga Nov 26, 2024
6131840
ISSUE-204: restore workflows
beto-aveiga Nov 26, 2024
1e250cf
ISSUE-204: try to avoid Host key verification failed (next I will try…
beto-aveiga Dec 9, 2024
a85d17c
ISSUE-204: try to avoid Host key verification failed, inside DDEV
beto-aveiga Dec 9, 2024
f52104d
To trigger CI workflows
beto-aveiga Dec 10, 2024
73ae0a3
ISSUE-204: remove the protocol
beto-aveiga Dec 10, 2024
bc09240
ISSUE-204: more time for connection, more options for key types
beto-aveiga Dec 10, 2024
a86826e
ISSUE-204: avoid checking the host when connecting to clone environem…
beto-aveiga Dec 10, 2024
8a0261a
ISSUE-204: use stg instead of prod for clonning, and use d10 instead …
beto-aveiga Dec 20, 2024
cd9df9a
Merge branch 'main' of github.com:Lullabot/drainpipe into justafish/i…
beto-aveiga Dec 20, 2024
9f15eda
ISSUE-204: fix typo, test instead of stg
beto-aveiga Dec 20, 2024
d77c9bc
ISSUE-204: debug
beto-aveiga Dec 20, 2024
346b291
ISSUE-204: use ddev if possible
beto-aveiga Dec 20, 2024
ef53ece
ISSUE-204: avoid spending minutes on different workflows [skip ci]
beto-aveiga Dec 20, 2024
83146b7
ISSUE-204: use ddev for drush stuff
beto-aveiga Dec 20, 2024
1850108
ISSUE-204: check drush version
beto-aveiga Dec 20, 2024
b88cf70
ISSUE-204: set drush version]
beto-aveiga Dec 20, 2024
41fd63d
ISSUE-204: avoid drush9 for remote drush commands
beto-aveiga Dec 20, 2024
ef70f8c
ISSUE-204: executing in ddev's context
beto-aveiga Dec 20, 2024
50c7d2e
ISSUE-204: get aliases file, debug
beto-aveiga Dec 20, 2024
b0380bf
ISSUE-204: get aliases file, debug
beto-aveiga Dec 20, 2024
e57630b
ISSUE-204: get aliases file, debug
beto-aveiga Dec 20, 2024
1976cb8
ISSUE-204: setting the path for drush aliases file
beto-aveiga Dec 20, 2024
e61f5fa
ISSUE-204: remove gpt allucinations/suggestions :P
beto-aveiga Dec 20, 2024
52ac1da
ISSUE-204: try drainpipe_exec (that executes drush commands inside dd…
beto-aveiga Dec 20, 2024
9b01e30
ISSUE-204: avoid simple command to know what is next
beto-aveiga Dec 20, 2024
e2739f4
ISSUE-204: fixed drush path for remote drush
beto-aveiga Dec 20, 2024
d23eeee
ISSUE-204: debug
beto-aveiga Dec 20, 2024
0cbd7ee
ISSUE-204: more debugging]
beto-aveiga Dec 20, 2024
d9809fe
ISSUE-204: more debugging
beto-aveiga Dec 20, 2024
fb9d389
ISSUE-204: more debugging
beto-aveiga Dec 20, 2024
f85496d
ISSUE-204: more debugging
beto-aveiga Dec 20, 2024
9810225
ISSUE-204: more debugging
beto-aveiga Dec 20, 2024
a07d6f4
ISSUE-204: more debugging
beto-aveiga Dec 20, 2024
360d04c
ISSUE-204: more debugging
beto-aveiga Dec 20, 2024
8ec891d
ISSUE-204: more debugging
beto-aveiga Dec 20, 2024
a90f629
ISSUE-204: fix path
beto-aveiga Dec 20, 2024
8628314
ISSUE-204: debug
beto-aveiga Dec 20, 2024
9d23eea
ISSUE-204: debug
beto-aveiga Dec 20, 2024
12da1c9
ISSUE-204: restore action
beto-aveiga Dec 21, 2024
fb42863
ISSUE-204: fix path
beto-aveiga Dec 23, 2024
84ed7c1
ISSUE-204: debug api-key
beto-aveiga Dec 23, 2024
f7cac73
ISSUE-204: debug api key
beto-aveiga Dec 23, 2024
f04829a
ISSUE-204: api key and secret for updates action
beto-aveiga Dec 23, 2024
61f9c8f
ISSUE-204: avoid using drush9
beto-aveiga Dec 23, 2024
32b693e
ISSUE-204: restore action commands
beto-aveiga Dec 23, 2024
e1fb8d2
ISSUE-204: debug
beto-aveiga Dec 23, 2024
6886342
ISSUE-204: debug origin of 'We strive to give you the best...' in env…
beto-aveiga Dec 23, 2024
7180d0e
ISSUE-204: typo
beto-aveiga Dec 23, 2024
d046f22
ISSUE-204: avoid questions from acli like 'Would you like to share an…
beto-aveiga Dec 23, 2024
63ea490
ISSUE-204: settings file already created | change label for step
beto-aveiga Jan 7, 2025
b58e41a
ISSUE-204: acquia needs docroot instead of web [skip ci]
beto-aveiga Jan 7, 2025
0afdbbb
ISSUE-204: ensure acquia and ddev settings work after deployment
beto-aveiga Jan 7, 2025
2fabc34
ISSUE-204: typo
beto-aveiga Jan 7, 2025
a22a276
ISSUE-204: improve the removal/restotr of DDEV config code
beto-aveiga Jan 7, 2025
782ca7f
ISSUE-204: debug
beto-aveiga Jan 7, 2025
42854ae
ISSUE-204: fixing ddev settings
beto-aveiga Jan 7, 2025
bbd3020
ISSUE-204: apparently not needed :shrug:
beto-aveiga Jan 7, 2025
f367874
ISSUE-204: debug last lines
beto-aveiga Jan 7, 2025
a6c33a3
ISSUE-204: debug last 50 lines... insert acquia recommended settings …
beto-aveiga Jan 7, 2025
224272d
ISSUE-204: fix typo]
beto-aveiga Jan 7, 2025
6129c3f
ISSUE-204: create .htaccess for configuration folder
beto-aveiga Jan 27, 2025
a81cad1
ISSUE-204: removing uneeded commands
beto-aveiga Jan 27, 2025
1dfa946
ISSUE-204: debug
beto-aveiga Jan 27, 2025
bcf88ad
ISSUE-204: fixing potential path mismatch
beto-aveiga Jan 27, 2025
734fc73
ISSUE-204: debug
beto-aveiga Jan 27, 2025
ee8fdfc
ISSUE-204: debug
beto-aveiga Jan 27, 2025
31393a9
ISSUE-204: avoid drainpipe_exec not found
beto-aveiga Jan 27, 2025
ab5444f
ISSUE-204: restoring site maintenance commands
beto-aveiga Jan 27, 2025
cb8e1ab
ISSUE-204: debug
beto-aveiga Jan 28, 2025
76810df
ISSUE-204: debug
beto-aveiga Jan 28, 2025
0f77522
ISSUE-204: debug
beto-aveiga Jan 28, 2025
10209c7
ISSUE-204: avoid changing aliases file, test
beto-aveiga Jan 28, 2025
b124f5f
ISSUE-204: use drainpipe_exec
beto-aveiga Jan 28, 2025
a3aa033
ISSUE-204: debug
beto-aveiga Jan 28, 2025
98572c7
ISSUE-204: specify root https://docs.acquia.com/acquia-cloud-platform…
beto-aveiga Jan 28, 2025
a6ccff8
ISSUE-204: potential better way of avoiding drush, remove *.paths
beto-aveiga Jan 28, 2025
a19b94e
ISSUE-204: fix typo
beto-aveiga Jan 28, 2025
65594c1
ISSUE-204: fix typo
beto-aveiga Jan 28, 2025
5ce6c01
ISSUE-204: remove debugging commands
beto-aveiga Jan 28, 2025
c484cfd
ISSUE-204: final changes
beto-aveiga Jan 28, 2025
380e636
ISSUE-204: site UUID consistent
beto-aveiga Jan 28, 2025
9bc9978
ISSUE-204: restore [skip ci]
beto-aveiga Jan 28, 2025
4ce0ba1
ISSUE-204: debug
beto-aveiga Jan 28, 2025
0d2e13d
ISSUE-204: run site-install if required, then update drupal
beto-aveiga Jan 28, 2025
8df5073
ISSUE-204: fix typo
beto-aveiga Jan 28, 2025
9a0dd7f
ISSUE-204: wait for the code switch to end
beto-aveiga Feb 3, 2025
e24b4a7
to run workflows
beto-aveiga Feb 3, 2025
cb3df9b
Merge branch 'justafish/issue-204-acquia-integration' of github.com:L…
beto-aveiga Feb 3, 2025
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
79 changes: 0 additions & 79 deletions .github/workflows/DrainpipeDev.yml

This file was deleted.

42 changes: 0 additions & 42 deletions .github/workflows/DrainpipeDevClean.yml

This file was deleted.

55 changes: 39 additions & 16 deletions .github/workflows/TestAcquia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Create a Drupal project
run: composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd
run: |

composer create-project drupal/recommended-project:10.4.0 . \
--ignore-platform-req=ext-gd

# Acquia needs "docroot" instead of "web"
mv web docroot
ln -s docroot web

- uses: actions/checkout@v4
with:
Expand All @@ -28,38 +35,54 @@ jobs:

- name: Setup Project
run: |

ddev config --auto
ddev start
ddev composer config extra.drupal-scaffold.gitignore true
ddev composer config --json extra.drupal-scaffold.allowed-packages \[\"lullabot/drainpipe\"]
ddev composer config --no-plugins allow-plugins.composer/installers true
ddev composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
ddev composer config extra.drainpipe.acquia --json '{"settings": true, "github": []}'
ddev composer config minimum-stability dev
ddev exec --raw composer config extra.drupal-scaffold.gitignore true
ddev exec --raw composer config --json extra.drupal-scaffold.allowed-packages \[\"lullabot/drainpipe\"]
ddev exec --raw composer config --no-plugins allow-plugins.composer/installers true
ddev exec --raw composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
ddev exec --raw composer config --no-plugins allow-plugins.lullabot/drainpipe true

ddev exec --raw composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'

ddev exec --raw composer config extra.drainpipe.github --json '{"acquia": []}'
ddev exec --raw composer config minimum-stability dev
ddev composer require lullabot/drainpipe --with-all-dependencies

# Recommended settings for Acquia
ddev composer config --no-plugins allow-plugins.acquia/drupal-recommended-settings false
ddev composer require acquia/drupal-recommended-settings

# Acquia recommended settings before DDEV settings.
sed -i '/\/\/ Automatically generated include for settings managed by ddev./i require DRUPAL_ROOT . \
"/../vendor/acquia/drupal-recommended-settings/settings/acquia-recommended.settings.php";' \
docroot/sites/default/settings.php

yq -i '.includes.acquia="./vendor/lullabot/drainpipe/tasks/acquia.yml"' Taskfile.yml

- name: Install Drupal
run: |

ddev drush site:install minimal -y
echo "\$settings['config_sync_directory'] = '../config';" >> web/sites/default/settings.php

# We need a consistent site ID.
ddev drush config-set "system.site" uuid "6b7eca14-f1b5-4059-901e-cbe5ffe59998"
ddev drush config:export -y

# When config is moved to ../config, the .htaccess to avoid code
# execution is not created automatically. Running cron once creates
# the needed .htaccess file which improves security.
ddev drush cron

- name: Create .drainpipeignore
run: |
echo "/web/sites/default/files" >> .drainpipeignore
echo "/.ddev" >> .drainpipeignore
echo "settings.ddev.php" >> .drainpipeignore
echo "/drainpipe" >> .drainpipeignore

- name: Create settings.php
run: |
echo '<?php' > web/sites/default/settings.php
echo "\$settings['container_yamls'][] = __DIR__ . '/services.yml';" >> web/sites/default/settings.php
echo "include __DIR__ . \"/settings.acquia.php\";" >> web/sites/default/settings.php
echo "\$settings['config_sync_directory'] = '../config';" >> web/sites/default/settings.php

- name: Snapshot Project
env:
directory: /tmp/release
Expand Down
93 changes: 0 additions & 93 deletions .github/workflows/TestBinaryInstaller.yml

This file was deleted.

86 changes: 0 additions & 86 deletions .github/workflows/TestComposerLockDiff.yml

This file was deleted.

Loading