Merge pull request #2582 from Gizra/develop

Development [starting 07.06.21]

.ddev/.gitignore

@@ -16,8 +16,8 @@
 /commands/.gitattributes
 /commands/db/mysql
 /commands/host/launch
-/commands/web/live
 /commands/web/xdebug
+/commands/web/live
 /config.*.y*ml
 /db_snapshots
 /import-db

.ddev/config.local.yaml.example

@@ -5,11 +5,19 @@ hooks:
         AND mail NOT LIKE '%~%'"
     - exec: drush sqlq "UPDATE users SET mail = replace(mail, '~', '.test~') WHERE uid
         > 0 AND mail LIKE '%~%'"
-    - exec: drush en devel views_ui -y
+    - exec: drush en devel views_ui field_ui -y
+    - exec: drush fra -y
     - exec: drush uli
   post-start:
     - exec: "cd .. && chmod +x ./scripts/build && ./scripts/build"
     - exec: drush site-install -y hedley install_configure_form.update_status_module='array(FALSE,FALSE)' --locale=en --account-name="admin" --account-pass="admin" --account-mail="[email protected]" --db-url=mysql://db:db@db/db --uri="https://ihangane.ddev.site:4443"
-    - exec: drush en devel views_ui -y
+    - exec: drush en devel views_ui field_ui -y
+    - exec: drush fra -y
     - exec: composer install -d sites/default/files/composer
+    # Run migration
+    - exec: drush en -y hedley_migrate
+    - exec: drush en -y migrate migrate_ui migrate_extras
+    - exec: drush mi --group=default --user=1
+    - exec: drush mi --group=counseling --user=1
+    - exec: drush mi --group=forms --user=1
     - exec: drush uli

.ddev/config.yaml

@@ -1,7 +1,7 @@
 name: ihangane
 type: drupal7
 docroot: server/www
-php_version: "7.2"
+php_version: "7.3"
 webserver_type: nginx-fpm
 router_http_port: "8081"
 router_https_port: "4443"
@@ -15,9 +15,9 @@ composer_version: "1"
 web_environment: []
 
 
-# This config.yaml was created with ddev version v1.17.0
-# webimage: drud/ddev-webserver:v1.17.0
-# dbimage: drud/ddev-dbserver-mariadb-10.3:v1.17.0
+# This config.yaml was created with ddev version v1.17.7
+# webimage: drud/ddev-webserver:v1.17.7
+# dbimage: drud/ddev-dbserver-mariadb-10.3:v1.17.7
 # dbaimage: phpmyadmin:5
 # However we do not recommend explicitly wiring these images into the
 # config.yaml as they may break future versions of ddev.
@@ -56,6 +56,11 @@ web_environment: []
 # "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
 # as leaving xdebug enabled all the time is a big performance hit.
 
+# xhprof_enabled: false  # Set to true to enable xhprof and "ddev start" or "ddev restart"
+# Note that for most people the commands
+# "ddev xhprof" to enable xhprof and "ddev xhprof off" to disable it work better,
+# as leaving xhprof enabled all the time is a big performance hit.
+
 # webserver_type: nginx-fpm  # or apache-fpm
 
 # timezone: Europe/Berlin
@@ -158,7 +163,7 @@ web_environment: []
 # In this case the user must provide all such settings.
 
 # You can inject environment variables into the web container with:
-# web_environment: 
+# web_environment:
 # - SOMEENV=somevalue
 # - SOMEOTHERENV=someothervalue
 
@@ -168,8 +173,6 @@ web_environment: []
 # This is to enable experimentation with alternate file mounting strategies.
 # For advanced users only!
 
-# provider: default # Currently "default", "pantheon", "ddev-live"
-# 
 # Many ddev commands can be extended to run tasks before or after the
 # ddev command is executed, for example "post-start", "post-import-db",
 # "pre-composer", "post-composer"

.ddev/db-build/Dockerfile.example

@@ -3,4 +3,4 @@
 # or packages or anything else to your dbimage
 ARG BASE_IMAGE
 FROM $BASE_IMAGE
-RUN echo "Built from drud/ddev-dbserver-mariadb-10.2:v1.17.0" >/var/tmp/built-from.txt
+RUN echo "Built from drud/ddev-dbserver-mariadb-10.2:v1.17.7" >/var/tmp/built-from.txt

.travis.yml

@@ -59,7 +59,7 @@ jobs:
         - "$TRAVIS_BUILD_DIR/ci-scripts/test_server.sh"
     - stage: Deploy
       name: "Deployment to Pantheon"
-      if: branch = develop
+      if: branch = _hold_
       script:
         - "export DEPLOY=1 && $TRAVIS_BUILD_DIR/ci-scripts/install_client.sh"
         - "$TRAVIS_BUILD_DIR/ci-scripts/install_ddev.sh"

client/gulpfile.js

@@ -404,7 +404,6 @@ var precacheProd = [
   'bower_components/dropzone/dist/min/dropzone.min.*.css',
   'bower_components/dropzone/dist/min/dropzone.min.*.js',
   'bower_components/dexie/dist/dexie.min.*.js',
-  'bower_components/exif-js/exif.js',
   'bower_components/semantic/dist/themes/**/' + precacheFileGlob,
   'bower_components/semantic/dist/semantic.min.*.css'
 ];