Merge branch 'master' into schema-update/1600997012179

Author: smashwilson

.github/workflows/ci.yml

@@ -15,14 +15,17 @@ jobs:
     env:
       DISPLAY: ":99"
       ATOM_GITHUB_BABEL_ENV: coverage
+      ATOM_CHANNEL: beta
+      ATOM: /tmp/atom/usr/bin/atom-beta
+      APM: /tmp/atom/usr/share/atom-beta/resources/app/apm/bin/apm
       MOCHA_TIMEOUT: 60000
       UNTIL_TIMEOUT: 30000
     steps:
     - uses: actions/checkout@v1
     - name: install Atom
       shell: bash
       run: |
-        curl -s -L https://atom.io/download/deb?channel=nightly \
+        curl -s -L https://atom.io/download/deb?channel=${ATOM_CHANNEL} \
           -H 'Accept: application/octet-stream' \
           -o /tmp/atom-amd64.deb
         /sbin/start-stop-daemon --start --quiet \
@@ -35,10 +38,10 @@ jobs:
         dpkg-deb -x /tmp/atom-amd64.deb /tmp/atom
     - name: install dependencies
       shell: bash
-      run: /tmp/atom/usr/share/atom-nightly/resources/app/apm/bin/apm ci
+      run: ${APM} ci
     - name: run tests
       shell: bash
-      run: /tmp/atom/usr/bin/atom-nightly --test test/
+      run: ${ATOM} --test test/
     - name: report code coverage
       shell: bash
       env:
@@ -59,25 +62,26 @@ jobs:
     runs-on: macos-10.14
     env:
       ATOM_GITHUB_BABEL_ENV: coverage
+      ATOM_CHANNEL: beta
+      ATOM: /tmp/atom/Atom\ Beta.app/Contents/Resources/app/atom.sh
+      APM: /tmp/atom/Atom\ Beta.app/Contents/Resources/app/apm/bin/apm
       MOCHA_TIMEOUT: 60000
       UNTIL_TIMEOUT: 30000
     steps:
     - uses: actions/checkout@v1
     - name: install Atom
       shell: bash
       run: |
-        curl -s -L https://atom.io/download/mac?channel=nightly \
+        curl -s -L https://atom.io/download/mac?channel=${ATOM_CHANNEL} \
           -H 'Accept: application/octet-stream' \
           -o /tmp/atom.zip
         sudo unzip -q /tmp/atom.zip -d /tmp/atom
     - name: install dependencies
       shell: bash
-      run: |
-        '/tmp/atom/Atom Nightly.app/Contents/Resources/app/apm/bin/apm' ci
+      run: sh -c "${APM} ci"
     - name: run tests
       shell: bash
-      run: |
-        '/tmp/atom/Atom Nightly.app/Contents/Resources/app/atom.sh' --test test/
+      run: sh -c "${ATOM} --test test/"
     - name: report code coverage
       shell: bash
       env:
@@ -98,12 +102,15 @@ jobs:
     runs-on: ubuntu-18.04
     env:
       DISPLAY: ":99"
+      ATOM_CHANNEL: beta
+      ATOM: /tmp/atom/usr/bin/atom-beta
+      APM: /tmp/atom/usr/share/atom-beta/resources/app/apm/bin/apm
     steps:
     - uses: actions/checkout@v1
     - name: install Atom
       shell: bash
       run: |
-        curl -s -L https://atom.io/download/deb?channel=nightly \
+        curl -s -L https://atom.io/download/deb?channel=${ATOM_CHANNEL} \
           -H 'Accept: application/octet-stream' \
           -o /tmp/atom-amd64.deb
         /sbin/start-stop-daemon --start --quiet \
@@ -116,7 +123,7 @@ jobs:
         dpkg-deb -x /tmp/atom-amd64.deb /tmp/atom
     - name: install dependencies
       shell: bash
-      run: /tmp/atom/usr/share/atom-nightly/resources/app/apm/bin/apm ci
+      run: ${APM} ci
     - name: lint
       shell: bash
       run: npm run lint
@@ -126,14 +133,17 @@ jobs:
     runs-on: ubuntu-18.04
     env:
       DISPLAY: ":99"
+      ATOM_CHANNEL: beta
+      ATOM: /tmp/atom/usr/bin/atom-beta
+      APM: /tmp/atom/usr/share/atom-beta/resources/app/apm/bin/apm
       ATOM_GITHUB_BABEL_ENV: coverage
       ATOM_GITHUB_TEST_SUITE: snapshot
     steps:
     - uses: actions/checkout@v1
     - name: install Atom
       shell: bash
       run: |
-        curl -s -L https://atom.io/download/deb?channel=nightly \
+        curl -s -L https://atom.io/download/deb?channel=${ATOM_CHANNEL} \
           -H 'Accept: application/octet-stream' \
           -o /tmp/atom-amd64.deb
         /sbin/start-stop-daemon --start --quiet \
@@ -146,7 +156,7 @@ jobs:
         dpkg-deb -x /tmp/atom-amd64.deb /tmp/atom
     - name: install dependencies
       shell: bash
-      run: /tmp/atom/usr/share/atom-nightly/resources/app/apm/bin/apm ci
+      run: ${APM} ci
     - name: run snapshot tests
       shell: bash
-      run: /tmp/atom/usr/bin/atom-nightly --test test/
+      run: ${ATOM} --test test/