From e0a7a2ffdd77909c198f7f91e9f4b60bc1ed77e0 Mon Sep 17 00:00:00 2001
From: Ruy Adorno <ruyadorno@hotmail.com>
Date: Thu, 9 Jan 2020 12:02:13 -0500
Subject: [PATCH] chore: ci cleanup

- Moved windows builds to travis-only since they're currently failing
on GHA and it's not code-related
- Added setup on GHA config to only run coverage once in ubuntu target
---
 .github/workflows/ci.yml | 11 +++++++++--
 .travis.yml              | 34 ++--------------------------------
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb2511c044919..563633ba7e189 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,8 +7,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [8.x, 10.x, 12.x]
-        os: [ubuntu-latest, windows-latest]
+        node-version: [6.x, 8.x, 10.x, 12.x]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 
@@ -28,6 +28,13 @@ jobs:
 
       # Run the tests
     - name: Run Tap tests
+      run: node . run tap -- "test/tap/*.js" -t600 -Rclassic -c
+      env:
+        DEPLOY_VERSION: testing
+
+      # Run coverage check
+    - name: Run coverage report
+      if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12.x'
       run: node . run tap -- "test/tap/*.js" -t600 -Rclassic -c
       env:
         DEPLOY_VERSION: testing
diff --git a/.travis.yml b/.travis.yml
index 151be8440adb1..cec3aac226b1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,46 +2,16 @@
 language: node_js
 
 os:
-  - linux
+  - windows
 
 node_js:
   - 12
   - 10
   - 8
+  - 6
 
 env: "DEPLOY_VERSION=testing"
 
-# having top-level `env:` adds a phantom build
-# https://github.com/travis-ci/travis-ci/issues/4681
-#env: DEPLOY_VERSION=testing
-matrix:
-  include:
-    # Run the sudotest, but only on Linux
-    - node_js: "12"
-      # DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js
-      # only gather coverage info for LTS
-      env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
-      script:
-        # run the sudo tests, with coverage enabled
-        - "sudo PATH=$PATH $(which node) . run tap -- \"test/tap/*.js\" --coverage  --timeout 600"
-
-    # also run standard and license checking
-    - node_js: "10"
-      script:
-        - "npx standard"
-        - "node . run licenses"
-
-    # separate out node 6 so we can turn off caching, because that
-    # always breaks for some reason.
-    - node_js: "6"
-      cache: false
-      env: "DEPLOY_VERSION=testing"
-
-    # only run one test on Windows, because it's hella slow
-    - node_js: "12"
-      os: "windows"
-      env: "DEPLOY_VERSION=testing"
-
 notifications:
     slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8