patch(travis-on-success): use Travis build stages instead of run once hack

Author: jrolfs

.travis.yml

@@ -1,23 +1,25 @@
-sudo: false
 language: node_js
-cache:
-  directories:
-    - node_modules
-notifications:
-  email: false
+
 node_js:
   - '8'
   - '10'
   - '12'
+
+sudo: false
+notifications:
+  email: false
+cache:
+  directories:
+    - node_modules
+
 script: npm run validate
-before_install:
-  # See: https://github.com/semantic-release/semantic-release/blob/master/docs/03-recipes/git-auth-ssh-keys.md
-  - openssl aes-256-cbc -K $encrypted_c1ac1ba52366_key -iv $encrypted_c1ac1ba52366_iv -in github-deploy-key.enc -out /tmp/github-deploy-key -d
-  - chmod 600 /tmp/github-deploy-key
-  - echo 'echo ${SSH_PASSPHRASE}' > /tmp/askpass && chmod +x /tmp/askpass
-  - eval "$(ssh-agent -s)"
-  - DISPLAY=":0.0" SSH_ASKPASS="/tmp/askpass" setsid ssh-add /tmp/github-deploy-key < /dev/null
-after_success: node src travis-after-success
-branches:
-  only:
-    - master
+
+jobs:
+  include:
+    - stage: release
+      node_js: lts/*
+      deploy:
+        provider: script
+        skip_cleanup: true
+        script:
+          - 'node src travis-after-success'

src/scripts/__tests__/__snapshots__/travis-after-success.js.snap

@@ -1,30 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`travis-after-success calls concurrently with both scripts when on travis 1`] = `npx travis-deploy-once@5`;
+exports[`travis-after-success calls concurrently with both scripts when on travis 1`] = `concurrently --prefix [{name}] --names codecov,release --prefix-colors bgBlue.bold.reset,bgGreen.bold.reset "echo installing codecov && npx -p codecov@3 -c 'echo running codecov && codecov'" "echo installing semantic-release && npx -p semantic-release@15 -c 'echo running semantic-release && semantic-release'"`;
 
-exports[`travis-after-success calls concurrently with both scripts when on travis 2`] = `concurrently --prefix [{name}] --names codecov,release --prefix-colors bgBlue.bold.reset,bgGreen.bold.reset "echo installing codecov && npx -p codecov@3 -c 'echo running codecov && codecov'" "echo installing semantic-release && npx -p semantic-release@15 -c 'echo running semantic-release && semantic-release'"`;
+exports[`travis-after-success does not do autorelease script when running on travis but in a pull request 1`] = `concurrently --prefix [{name}] --names codecov --prefix-colors bgBlue.bold.reset "echo installing codecov && npx -p codecov@3 -c 'echo running codecov && codecov'"`;
 
-exports[`travis-after-success does not do autorelease script when running on travis but in a pull request 1`] = `npx travis-deploy-once@5`;
+exports[`travis-after-success does not do the autorelease script when the version is different 1`] = `concurrently --prefix [{name}] --names codecov --prefix-colors bgBlue.bold.reset "echo installing codecov && npx -p codecov@3 -c 'echo running codecov && codecov'"`;
 
-exports[`travis-after-success does not do autorelease script when running on travis but in a pull request 2`] = `concurrently --prefix [{name}] --names codecov --prefix-colors bgBlue.bold.reset "echo installing codecov && npx -p codecov@3 -c 'echo running codecov && codecov'"`;
+exports[`travis-after-success does not do the codecov script when opted out 1`] = `concurrently --prefix [{name}] --names release --prefix-colors bgBlue.bold.reset "echo installing semantic-release && npx -p semantic-release@15 -c 'echo running semantic-release && semantic-release'"`;
 
-exports[`travis-after-success does not do the autorelease script when the version is different 1`] = `npx travis-deploy-once@5`;
-
-exports[`travis-after-success does not do the autorelease script when the version is different 2`] = `concurrently --prefix [{name}] --names codecov --prefix-colors bgBlue.bold.reset "echo installing codecov && npx -p codecov@3 -c 'echo running codecov && codecov'"`;
-
-exports[`travis-after-success does not do the codecov script when opted out 1`] = `npx travis-deploy-once@5`;
-
-exports[`travis-after-success does not do the codecov script when opted out 2`] = `concurrently --prefix [{name}] --names release --prefix-colors bgBlue.bold.reset "echo installing semantic-release && npx -p semantic-release@15 -c 'echo running semantic-release && semantic-release'"`;
-
-exports[`travis-after-success does not do the codecov script when there is no coverage directory 1`] = `npx travis-deploy-once@5`;
-
-exports[`travis-after-success does not do the codecov script when there is no coverage directory 2`] = `concurrently --prefix [{name}] --names release --prefix-colors bgBlue.bold.reset "echo installing semantic-release && npx -p semantic-release@15 -c 'echo running semantic-release && semantic-release'"`;
+exports[`travis-after-success does not do the codecov script when there is no coverage directory 1`] = `concurrently --prefix [{name}] --names release --prefix-colors bgBlue.bold.reset "echo installing semantic-release && npx -p semantic-release@15 -c 'echo running semantic-release && semantic-release'"`;
 
 exports[`travis-after-success does not run either script when no coverage dir and not the right version 1`] = `
 Array [
-  Array [
-    installing and running travis-deploy-once,
-  ],
   Array [
     No need to autorelease or report coverage. Skipping travis-after-success script...,
   ],

src/scripts/__tests__/travis-after-success.js

@@ -40,12 +40,10 @@ cases(
     if (runsNothing) {
       expect(console.log.mock.calls).toMatchSnapshot()
     } else {
-      expect(crossSpawnSyncMock).toHaveBeenCalledTimes(2)
-      const [firstCall, secondCall] = crossSpawnSyncMock.mock.calls
-      const [scriptOne, calledArgsOne] = firstCall
-      expect([scriptOne, ...calledArgsOne].join(' ')).toMatchSnapshot()
-      const [scriptTwo, calledArgsTwo] = secondCall
-      expect([scriptTwo, ...calledArgsTwo].join(' ')).toMatchSnapshot()
+      expect(crossSpawnSyncMock).toHaveBeenCalledTimes(1)
+      const [call] = crossSpawnSyncMock.mock.calls
+      const [script, calledArgs] = call
+      expect([script, ...calledArgs].join(' ')).toMatchSnapshot()
     }
 
     // afterEach

src/scripts/travis-after-success.js

@@ -1,4 +1,5 @@
 const spawn = require('cross-spawn')
+
 const {
   resolveBin,
   getConcurrentlyArgs,
@@ -7,51 +8,34 @@ const {
   parseEnv,
 } = require('../utils')
 
-console.log('installing and running travis-deploy-once')
-const deployOnceResults = spawn.sync('npx', ['travis-deploy-once@5'], {
-  stdio: 'inherit',
-})
-if (deployOnceResults.status === 0) {
-  runAfterSuccessScripts()
-} else {
-  console.log(
-    'travis-deploy-once exited with a non-zero exit code',
-    deployOnceResults.status,
-  )
-  process.exit(deployOnceResults.status)
-}
-
-// eslint-disable-next-line complexity
-function runAfterSuccessScripts() {
-  const autorelease =
-    pkg.version === '0.0.0-semantically-released' &&
-    parseEnv('TRAVIS', false) &&
-    process.env.TRAVIS_BRANCH === 'master' &&
-    !parseEnv('TRAVIS_PULL_REQUEST', false)
+const autorelease =
+  pkg.version === '0.0.0-semantically-released' &&
+  parseEnv('TRAVIS', false) &&
+  process.env.TRAVIS_BRANCH === 'master' &&
+  !parseEnv('TRAVIS_PULL_REQUEST', false)
 
-  const reportCoverage = hasFile('coverage') && !parseEnv('SKIP_CODECOV', false)
+const reportCoverage = hasFile('coverage') && !parseEnv('SKIP_CODECOV', false)
 
-  if (!autorelease && !reportCoverage) {
-    console.log(
-      'No need to autorelease or report coverage. Skipping travis-after-success script...',
-    )
-  } else {
-    const result = spawn.sync(
-      resolveBin('concurrently'),
-      getConcurrentlyArgs(
-        {
-          codecov: reportCoverage
-            ? `echo installing codecov && npx -p codecov@3 -c 'echo running codecov && codecov'`
-            : null,
-          release: autorelease
-            ? `echo installing semantic-release && npx -p semantic-release@15 -c 'echo running semantic-release && semantic-release'`
-            : null,
-        },
-        {killOthers: false},
-      ),
-      {stdio: 'inherit'},
-    )
+if (!autorelease && !reportCoverage) {
+  console.log(
+    'No need to autorelease or report coverage. Skipping travis-after-success script...',
+  )
+} else {
+  const result = spawn.sync(
+    resolveBin('concurrently'),
+    getConcurrentlyArgs(
+      {
+        codecov: reportCoverage
+          ? `echo installing codecov && npx -p codecov@3 -c 'echo running codecov && codecov'`
+          : null,
+        release: autorelease
+          ? `echo installing semantic-release && npx -p semantic-release@15 -c 'echo running semantic-release && semantic-release'`
+          : null,
+      },
+      {killOthers: false},
+    ),
+    {stdio: 'inherit'},
+  )
 
-    process.exit(result.status)
-  }
+  process.exit(result.status)
 }