Skip to content

Commit

Permalink
chore: ci cleanup
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
ruyadorno committed Jan 9, 2020
1 parent 3f009fb commit e0a7a2f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 34 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -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
Expand Down
34 changes: 2 additions & 32 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit e0a7a2f

Please # to comment.