From 01ba16152085956497c006a30c86739c920f86a6 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sat, 14 Nov 2020 15:04:28 -0800
Subject: [PATCH] chore: update vercel token (#1892)

---
 .travis.yml   | 97 ++++++++++++++++++++++++++-------------------------
 bin/deploy.sh |  6 ++--
 2 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 98287380..f2209eb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,73 +1,74 @@
 language: node_js
 node_js:
-  - "10"
+- '10'
 dist: bionic
 group: dev
 sudo: false
 services:
-  - redis-server
-  - postgresql
+- redis-server
+- postgresql
 addons:
   chrome: stable
-  postgresql: "10"
+  postgresql: '10'
   apt:
     packages:
-      - autoconf
-      - bison
-      - build-essential
-      - ffmpeg
-      - file
-      - g++
-      - gcc
-      - imagemagick
-      - libffi-dev
-      - libgdbm5
-      - libicu-dev
-      - libidn11-dev
-      - libncurses5-dev
-      - libpq-dev
-      - libprotobuf-dev
-      - libreadline6-dev
-      - libssl-dev
-      - libxml2-dev
-      - libxslt1-dev
-      - libyaml-dev
-      - pkg-config
-      - postgresql-client-10
-      - postgresql-contrib-10
-      - protobuf-compiler
-      - redis-server
-      - redis-tools
-      - zlib1g-dev
-      - fonts-noto-color-emoji # required for emoji-picker-element + Chrome on Linux
+    - autoconf
+    - bison
+    - build-essential
+    - ffmpeg
+    - file
+    - g++
+    - gcc
+    - imagemagick
+    - libffi-dev
+    - libgdbm5
+    - libicu-dev
+    - libidn11-dev
+    - libncurses5-dev
+    - libpq-dev
+    - libprotobuf-dev
+    - libreadline6-dev
+    - libssl-dev
+    - libxml2-dev
+    - libxslt1-dev
+    - libyaml-dev
+    - pkg-config
+    - postgresql-client-10
+    - postgresql-contrib-10
+    - protobuf-compiler
+    - redis-server
+    - redis-tools
+    - zlib1g-dev
+    - fonts-noto-color-emoji
 before_install:
-  - psql -d template1 -U postgres -c "CREATE USER pinafore WITH PASSWORD 'pinafore' CREATEDB;"
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s
-  - export PATH="$HOME/.yarn/bin:$PATH"
-  - ./bin/setup-mastodon-in-travis.sh
+- psql -d template1 -U postgres -c "CREATE USER pinafore WITH PASSWORD 'pinafore'
+  CREATEDB;"
+- curl -o- -L https://yarnpkg.com/install.sh | bash -s
+- export PATH="$HOME/.yarn/bin:$PATH"
+- "./bin/setup-mastodon-in-travis.sh"
 before_script:
-  - yarn run lint
+- yarn run lint
 after_script:
-  - rm -f /home/travis/.rvm/gems/ruby-*/bin/posix-spawn-benchmark # file seems generated every time, breaks travis cache
+- rm -f /home/travis/.rvm/gems/ruby-*/bin/posix-spawn-benchmark
 script: travis_retry yarn run $COMMAND
 env:
   global:
-    - ESM_DISABLE_CACHE=1 # this cache causes travis to rebuild its cache every single time
-    - TERSER_DISABLE_CACHE=1 # ditto
-    - secure: "jyccYPBJQOHN6oX9VkeBSxKoWPACVn0rlNj8priGsrfWHcroqlPeVVWV2SXPBkwIFIgdjnVAA2q71mGrPJIstZERAaEKlq92+CPcpTDJp2vobHjrOvRtHd2rqrlU388c5CIjQXM1KA9MYenUOs/hmhbgUPrM8w2KsQGstSITGIhzySKzwreuz80tA0GC0fJ7jL3sCzlsBtWbL6WMAJdel4b+w3GiYdz5i7L6ZH0PzBapbMelr4QBKnTVo3oAE91Riis6lGmI4BUDpkFpslDUqtdPmgp7x/6VuF06dojinCCp/waPDPZRuPimFiqIVTn0lsyJRrP6t9MMixEatMvZrsHZd6XqXCP5P0bWeVEtwtnGZjHDPjSzjf+PigqwN6XQvVsTJBWXZX/qO/PpSKsRLwhynyfrKLQ54gDx+tEKfB3eNgKT4eWRLIZkk+IfTGasOsk92FLBrEHC89Xf+yLBsO/VBL6AZEFU6sS0Qk8Nv53/v8OelbcLFlWN5ws134MeJywSPtmbp8YkkSER+4auAmKNJr8JRu5A0MYz5hAM+kaIszkPv0uayDu7X+ygTe3Y+op/AOFULAX1mgGfsqcW4hYZyhJH21sduf0bxPNuJB0OnuAP05/HFoaU9rq/D/FYVylQs8O9R/NbWomi6bE6LmMQrVVyU5xu7Fo3DMyKBnw="
+  - ESM_DISABLE_CACHE=1
+  - TERSER_DISABLE_CACHE=1
+  - secure: kLsuDI1c2/g72Ek2dQZCxpKiEwkSNzB73zddeHyQ/BPNis0FKz172ul28Oeq1eb+tfg51nWq43NBCQ5PtHAjF+O7DbHR1+shj0dyQgMk86aZDVQTp4o5dX3hWyM04apc9hVUVqrCsCP3bHztcdyBu6Lb2QC2dlz8tfYxytcd0T1sQYd08Z5F3jf3rCASccAZ1XS+w3a3yQoD/uu9nsQCIgGpDRGNAt6mPGw4zk8ZmpswA6XPTsfaNZFhln72yQWVCOl+7WD8S2qiBGEXONaVz4/LB/1uo9+i2iPIMhOON91oi0SSacxfYAVsV0wh4L2IEhkbLBvPYI4lelV39U0asTEHBcQmay73KQr8K4aYK7NnK7NK56W/vlJXd6c2Qd0NtUmY5yTGPBJQHtGCDSXIHijXHlmA+NGwJfoDUL7QDNAoC0StR8uSPnAQ4NdfheBSf6l7kKOo5HZwjK4JTWfTvr549TMJnFr9fYNJii9W/MyajLed0wF5nPJ50VyIXX9BAMa7n8KSQ1YV0W9Kp88LHAfASUGjo2P5IddgC3CaM/WAoMWOW5D3vWCWhIQzSmJLz66vUqi3oaiglw+/Q77nrDDE+2zkQGCl6Ehof27TFJRMu2QnT6El3upsRfnMgV3MdO3Kd2Pq0iFSXqPZQIAyba1LAQcveh/OPWmKWjzGkew=
 matrix:
   include:
-    - env: BROWSER=chrome:headless COMMAND=test-browser-suite0
-    - env: BROWSER=chrome:headless COMMAND=test-browser-suite1
-    - env: COMMAND=test-unit
-    - env: COMMAND=deploy-all-travis
+  - env: BROWSER=chrome:headless COMMAND=test-browser-suite0
+  - env: BROWSER=chrome:headless COMMAND=test-browser-suite1
+  - env: COMMAND=test-unit
+  - env: COMMAND=deploy-all-travis
   allow_failures:
-    - env: COMMAND=deploy-all-travis
+  - env: COMMAND=deploy-all-travis
 branches:
   only:
-    - master
+  - master
 cache:
   yarn: true
   bundler: true
   directories:
-    - /home/travis/.rvm/
+  - "/home/travis/.rvm/"
diff --git a/bin/deploy.sh b/bin/deploy.sh
index 028e0e84..339724c1 100755
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@ -15,10 +15,10 @@ else
   rm -f static/robots.txt
 fi
 
-# if in travis, use the $NOW_TOKEN
+# if in travis, use the $VERCEL_TOKEN
 DEPLOY_COMMAND="vercel --scope nolanlawson"
-if [[ ! -z "$NOW_TOKEN" ]]; then
-  DEPLOY_COMMAND="$DEPLOY_COMMAND --token $NOW_TOKEN"
+if [[ ! -z "$VERCEL_TOKEN" ]]; then
+  DEPLOY_COMMAND="$DEPLOY_COMMAND --token $VERCEL_TOKEN"
 fi
 
 # launch