Skip to content

Commit

Permalink
Merge branch 'main' into 0--support-storybook
Browse files Browse the repository at this point in the history
  • Loading branch information
deviantintegral authored Jul 26, 2024
2 parents 8af5c14 + ad02cda commit d8a1323
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 48 deletions.
78 changes: 39 additions & 39 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion metapackages/sass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"gulp-sass-glob": "^1.1.0",
"gulp-sourcemaps": "^3.0.0",
"modern-normalize": "^2.0.0",
"postcss": "^8.4.39",
"postcss": "^8.4.40",
"sass": "^1.77.8",
"yargs": "^17.7.2"
},
Expand Down
10 changes: 7 additions & 3 deletions tasks/drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@ tasks:
- echo "🚮 Dropping existing database"
- ./vendor/bin/drush {{ .site }} sql:drop --yes
- echo "📰 Importing database"
- ./vendor/bin/drush {{ .site }} sql:query --file=$DB_DIR/db.sql.gz
- gunzip -k $DB_DIR/db.sql.gz
- ./vendor/bin/drush {{ .site }} sql:query --file=$DB_DIR/db.sql
- defer: rm -f $DB_DIR/db.sql
export-db:
desc: "Exports a database fetched with a *:fetch-db command"
env:
DB_DIR: '{{default "/var/www/html/files/db" .DB_DIR}}'
cmds:
- echo "➡ Exporting database"
- ./vendor/bin/drush {{.site }} sql:dump --result-file=$DB_DIR/db.sql.gz
- ./vendor/bin/drush {{.site }} sql:dump --gzip --result-file=$DB_DIR/db.sql
update:
desc: Run Drupal update tasks after deploying new code
cmds:
Expand All @@ -67,7 +68,10 @@ tasks:
- ./vendor/bin/drush {{.site}} --yes cache:rebuild
- ./vendor/bin/drush {{.site}} --yes deploy:hook
- |
if [[ $(./vendor/bin/drush {{.site}} config:status --format=json --state=Different) != '[]' ]]; then
# drush config:status --format=json is outputting notices in Pantheon even with the json format,
# so we need to tail the last line.
config_status_output=$(./vendor/bin/drush {{.site}} config:status --format=json --state=Different | tail -n1)
if [[ $config_status_output != '[]' ]]; then
echo "Config export does not match database."
./vendor/bin/drush {{.site}} config:status
exit 1;
Expand Down
Loading

0 comments on commit d8a1323

Please sign in to comment.