lando master into here

.circleci/config.yml

@@ -1,4 +1,4 @@
-version: 2
+version: 2.1
 jobs:
   build:
     machine:
@@ -7,24 +7,6 @@ jobs:
     parallelism: 10
     steps:
       - checkout
-      - run:
-          name: Assess needs or bail
-          command: |
-            # Extract commit range (or single commit)
-            COMMIT_RANGE=$(echo "${CIRCLE_COMPARE_URL}" | cut -d/ -f7)
-            # Fix single commit, unfortunately we don't always get a commit range from Circle CI
-            if [[ $COMMIT_RANGE != *"..."* ]]; then
-              COMMIT_RANGE="${COMMIT_RANGE}...${COMMIT_RANGE}"
-            fi
-            # Print some helpful things
-            echo "Operating on commit range: $COMMIT_RANGE"
-            # Check if we need to run tests and bail if we don't
-            LANDO_CHANGED_FILES=$(git diff --name-only $COMMIT_RANGE | cat)
-            echo "The following files have changed: $LANDO_CHANGED_FILES"
-            LANDO_NEEDS_TESTS=$(echo $LANDO_CHANGED_FILES | grep -e .circleci -e bin/ -e lib/ -e plugins/ -e integrations/ -e examples/ -e tests/ &>/dev/null && echo true || echo false)
-            if [[ "$LANDO_NEEDS_TESTS" == "false" ]]; then
-              circleci-agent step halt
-            fi
       - restore_cache:
           keys:
             - yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
@@ -50,6 +32,8 @@ jobs:
             /tmp/hyperdrive -y --name "Lando System" --email [email protected]
             # @TODO: anyway hyperdrive can assert dominance here?
             sudo ln -sf /usr/bin/nodejs /opt/circleci/.nvm/versions/node/v6.1.0/bin/node
+            # We need to not enforce ssh for github because this breaks some tests
+            git config --global --unset url.ssh://[email protected]
       - run:
           name: Install node modules
           command: yarn

.circleci/lando.yml

@@ -6,12 +6,12 @@ mode: cli
 dockerSupportedVersions:
   compose:
     min: "1.23.0"
-    max: "1.27.4"
+    max: "1.29.0"
     link:
       linux: https://docs.docker.com/compose/install/#install-compose-on-linux-systems
   desktop:
     min: "2.1.0.0"
-    max: "3.0.1"
+    max: "3.3.99"
     link:
       darwin: https://docs.docker.com/docker-for-mac/release-notes/
       win32: https://docs.docker.com/docker-for-windows/release-notes/

.platform/.platform.docs.yaml

@@ -12,7 +12,7 @@ build:
   flavor: none
 
 # The size of the persistent disk of the application (in MB).
-disk: 5000
+disk: 4000
 
 # The configuration of app when it is exposed to the web.
 web:

.platform/.platform.metrics.yaml

@@ -1,7 +1,7 @@
 name: metrics
 source:
   root: "/"
-type: nodejs:14
+type: nodejs:12
 
 dependencies:
   nodejs:
@@ -26,7 +26,7 @@ mounts:
     source: local
     source_path: run
 
-disk: 5000
+disk: 6000
 
 hooks:
   build: |
@@ -49,3 +49,8 @@ crons:
       if [ "$PLATFORM_BRANCH" = master ]; then
         /app/.platformsh/bin/platform redeploy --yes --no-wait
       fi
+  flushlogs:
+    # Flush the PM2 logs once a month
+    spec: '0 1 1 * *'
+    cmd: |
+      PM2_HOME=/app/run pm2 flush

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js: 12
-dist: xenial
+dist: bionic
 cache:
   yarn: true
   directories:
@@ -194,10 +194,10 @@ jobs:
         - if [ ! -z "$TRAVIS_TAG" ]; then cp -rf dist/lando.deb release/lando-$TRAVIS_TAG.deb; fi
         - if [ ! -z "$TRAVIS_TAG" ]; then cp -rf dist/lando.deb release/lando-stable.deb; fi
         # pacman
-        - cp -rf dist/lando.pacman release/lando-latest-dev.pacman
-        - cp -rf dist/lando.pacman release/lando-$TRAVIS_COMMIT-dev.pacman
-        - if [ ! -z "$TRAVIS_TAG" ]; then cp -rf dist/lando.pacman release/lando-$TRAVIS_TAG.pacman; fi
-        - if [ ! -z "$TRAVIS_TAG" ]; then cp -rf dist/lando.pacman release/lando-stable.pacman; fi
+        # - cp -rf dist/lando.pacman release/lando-latest-dev.pacman
+        # - cp -rf dist/lando.pacman release/lando-$TRAVIS_COMMIT-dev.pacman
+        # - if [ ! -z "$TRAVIS_TAG" ]; then cp -rf dist/lando.pacman release/lando-$TRAVIS_TAG.pacman; fi
+        # - if [ ! -z "$TRAVIS_TAG" ]; then cp -rf dist/lando.pacman release/lando-stable.pacman; fi
         # rpm
         - cp -rf dist/lando.rpm release/lando-latest-dev.rpm
         - cp -rf dist/lando.rpm release/lando-$TRAVIS_COMMIT-dev.rpm
@@ -221,7 +221,7 @@ jobs:
             secure: UXDea6KLTOOiUaUfhYqE7stUY74VE2gOdi3No5NscD0Lg3xB/EMf1wzpVe2nuTpjn1CbDBsGXXHqRRpy2IZj6qp21D39+Wygznv9PpSGPgTAB2ZHRYhpux1Qf/HxD8R/NhvISNMXukNLyd66OyiJlz5RWoLWQvLIiJgT1Uczc3Sj8iOJOmYaxQZku/3/q/LmjKKHVJ9vq7ail4l4SoNmLqh6sdDt9utJtavWHMa0hN5kF+CwoV5Vk/z2RFzYNInGwlJggwV7Y/Kf3TmOQv0CiKgxdEQqR8LfTDGIvkxFwpPSf7JnQYnsZWcOWW08oousN7tjc1L1ow2dzPnT2zRYNyx73FwkjWtZ7SLQCkU95pq6FgSy31+w6iWU6Rvwd9mgdX4sfxgdwxLwiF38Rki5TxXtMRGWW1qYRYvnCcc7gpPUPFv0PzsQYZiFSGxMF3uKdKxmKzYd+tfCMvE5YhfkDtCM+LeJBlSL5hZspMUezXEFtiKSv7fDmBKtGGFUsEruNqMphKEbH1kY1UT9SXUu+uxWN40ciJTXfQXJAGMSh34WkZFAgEP/r61+SZDlpuyYPQ8l8fOOcX2uaJYD0LJBSERVmVAX00SNxWSVdTTGibadRXWWuJ4gd4PGCXUhSJI9r1QLfMLyZtt5P3i9SUL2X4cO9isKysBjOq/5DZXjqq0=
           file:
             - release/lando-$TRAVIS_TAG.deb
-            - release/lando-$TRAVIS_TAG.pacman
+            # - release/lando-$TRAVIS_TAG.pacman
             - release/lando-$TRAVIS_TAG.rpm
           skip_cleanup: true
           on:

config.yml

@@ -6,12 +6,12 @@ mode: cli
 dockerSupportedVersions:
   compose:
     min: "1.23.0"
-    max: "1.27.4"
+    max: "1.29.0"
     link:
       linux: https://docs.docker.com/compose/install/#install-compose-on-linux-systems
   desktop:
     min: "2.1.0.0"
-    max: "3.0.1"
+    max: "3.3.99"
     link:
       darwin: https://docs.docker.com/docker-for-mac/release-notes/
       win32: https://docs.docker.com/docker-for-windows/release-notes/

contributors.yml

@@ -191,3 +191,10 @@
   title: Contributor
   pic: 'https://www.gravatar.com/avatar/b497056d7679e425fdb3d6f7fca7d05b'
   id: a42fa56eb47d917eeb086338cdc37efb635bef51
+- name: Xaq Rothman
+  location: 'Washington, D.C.'
+  github: xaqrox
+  twitter: xaqrox
+  title: Contributor
+  pic: 'https://www.gravatar.com/avatar/c335f31e62b453f747f39a84240b3bbd'
+  id: 443e9ca6ae16555ec9d336447aaac3a944eebf5b