From b02e5140b9d1ba7de2b2d4a7d70f103434711b8a Mon Sep 17 00:00:00 2001
From: rschamp <rschamp@media.mit.edu>
Date: Mon, 23 Sep 2019 13:50:59 -0400
Subject: [PATCH 1/2] Trim some unused config from the Travis config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We no longer use the “smoke” branch, nor do we push to master in order to deploy to S3. So remove these from the Travis config so it’s clearer what we actually use.
---
 .travis.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 38af9f8b2..fcb059dce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ env:
   - NODE_OPTIONS=--max-old-space-size=7250
   - NPM_TAG=latest
   - RELEASE_VERSION="0.1.0-prerelease.$(date +'%Y%m%d%H%M%S')"
-  - SMOKE_URL=https://llk.github.io/scratch-gui/$TRAVIS_PULL_REQUEST_BRANCH
 cache:
   directories:
   - node_modules
@@ -26,7 +25,6 @@ install:
 before_script: greenkeeper-lockfile-update
 script:
 - npm test
-- if [ "$TRAVIS_EVENT_TYPE" == "pull_request" ] && [ "$TRAVIS_BRANCH" == "master" ]; then  npm run test:smoke; fi
 after_script: greenkeeper-lockfile-upload
 before_deploy:
 - >
@@ -44,7 +42,6 @@ deploy:
     branch:
     - master
     - develop
-    - smoke
     - hotfix/*
     condition: $TRAVIS_EVENT_TYPE != cron
   skip_cleanup: true
@@ -56,22 +53,9 @@ deploy:
     branch:
     - master
     - develop
-    - smoke
     condition: $TRAVIS_EVENT_TYPE != cron
   skip_cleanup: true
   script: if npm info scratch-gui | grep -q $RELEASE_VERSION; then git tag $RELEASE_VERSION && git push https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git $RELEASE_VERSION; fi
-- provider: s3
-  on:
-    branch:
-    - master
-    - $PREVIEW_BRANCH
-    condition: $TRAVIS_EVENT_TYPE != cron
-  access_key_id: $AWS_ACCESS_KEY_ID
-  secret_access_key: $AWS_SECRET_ACCESS_KEY
-  bucket: $AWS_BUCKET_NAME
-  acl: public_read
-  skip_cleanup: true
-  local_dir: build
 - provider: script
   on:
     all_branches: true
@@ -85,5 +69,3 @@ deploy:
     condition: $TRAVIS_EVENT_TYPE == cron
   skip_cleanup: true
   script: npm run i18n:src && npm run i18n:push
-after_deploy:
-- 'curl -X POST -H "Fastly-Key: $FASTLY_TOKEN" -H "Accept: application/json" https://api.fastly.com/service/$FASTLY_SERVICE_ID/purge_all'

From 47271e7af59d2b89ce84d16de3acd2a5d0743a0e Mon Sep 17 00:00:00 2001
From: rschamp <rschamp@media.mit.edu>
Date: Mon, 23 Sep 2019 15:34:14 -0400
Subject: [PATCH 2/2] Remove greenkeeper-lockfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to https://blog.greenkeeper.io/announcing-native-lockfile-support-85381a37a0d0 it’s unnecessary since Sept 2018?!

Also remove the update step, it hasn’t been necessary since we began pinning the scratch-* packages.
---
 .travis.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fcb059dce..c927568c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,17 +15,10 @@ env:
 cache:
   directories:
   - node_modules
-before_install:
-# package-lock.json was introduced in npm@5
-- '[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest' # skipped when using node 9
-- npm install -g greenkeeper-lockfile
 install:
 - npm --production=false install
-- npm --production=false update
-before_script: greenkeeper-lockfile-update
 script:
 - npm test
-after_script: greenkeeper-lockfile-upload
 before_deploy:
 - >
   if [ -z "$BEFORE_DEPLOY_RAN" ]; then