Merge remote-tracking branch 'origin/develop' for release 0.2.3

CHANGELOG.md

@@ -3,6 +3,17 @@
 ## UNRELEASED [x.y.z](https://github.com/davidalger/warden/tree/x.y.z) (yyyy-mm-dd)
 [All Commits](https://github.com/davidalger/warden/compare/0.2.2..develop)
 
+## Version [0.2.3](https://github.com/davidalger/warden/tree/0.2.3) (2020-02-14)
+[All Commits](https://github.com/davidalger/warden/compare/0.2.2..0.2.3)
+
+**Bug Fixes:**
+
+* Fixed mutagen version check (issue [#95](https://github.com/davidalger/warden/issues/95)); ([#94](https://github.com/davidalger/warden/pull/94) by [blakesaunders](https://github.com/blakesaunders))
+
+**Enhancements:**
+
+* Added `explicit_defaults_for_timestamp=on` to `db` settings on `magento2` environment allowing `setup:db:status` to report clean (2.3.4 and later) (issue [#89](https://github.com/davidalger/warden/issues/89))
+
 ## Version [0.2.2](https://github.com/davidalger/warden/tree/0.2.2) (2020-02-09)
 [All Commits](https://github.com/davidalger/warden/compare/0.2.1..0.2.2)
 

commands/sync.cmd

@@ -25,9 +25,9 @@ fi
 ## verify mutagen version constraint
 MUTAGEN_VERSION=$(mutagen version 2>/dev/null) || true
 if ! { \
-     (( $(echo ${MUTAGEN_VERSION:-0} | cut -d. -f1) >= 0 )) \
-  && (( $(echo ${MUTAGEN_VERSION:-0} | cut -d. -f2) >= 10 )) \
-  && (( $(echo ${MUTAGEN_VERSION:-0} | cut -d. -f3) >= 3 )); }
+     (( $(echo ${MUTAGEN_VERSION:-0} | cut -d. -f1) >= 1 )) \
+  || (( $(echo ${MUTAGEN_VERSION:-0} | cut -d. -f1) == 0 && $(echo ${MUTAGEN_VERSION:-0} | cut -d. -f2) >= 11 )) \
+  || (( $(echo ${MUTAGEN_VERSION:-0} | cut -d. -f1) == 0 && $(echo ${MUTAGEN_VERSION:-0} | cut -d. -f2) == 10 && $(echo ${MUTAGEN_VERSION:-0} | cut -d. -f3) >= 3 )); }
 then
   >&2 printf "\e[01;31mMutagen version 0.10.3 or greater is required (version ${MUTAGEN_VERSION} is installed).\033[0m"
   >&2 printf "\n\nPlease update Mutagen:\n\n  brew upgrade havoc-io/mutagen/mutagen\n\n"

environments/magento2.base.yml

@@ -84,6 +84,7 @@ services:
     command:
       - mysqld
       - --max_allowed_packet=1024M
+      - --explicit_defaults_for_timestamp=on
     volumes:
       - dbdata:/var/lib/mysql
     networks:

version

@@ -1 +1 @@
-0.2.2
+0.2.3