From c8bdb0a28b80893bf1ad2f7615cad15bcce6e372 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 12 Oct 2018 10:09:13 +0300 Subject: [PATCH 1/3] Nuke AppVeyor and use Travis for both Linux and Windows tests. --- .appveyor.yml | 29 ----------------------------- .travis.yml | 23 +++++++++++++++++------ README.md | 3 +-- 3 files changed, 18 insertions(+), 37 deletions(-) delete mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index b83485878..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: "{build}" - -clone_depth: 5 - -environment: - matrix: - - platform: "x64" - -init: - # Enable symlinks in git; note that this requires to clone - # the repo with admin rights, which AppVeyor does by default - - git config --global core.symlinks true - -install: - - ps: Install-Product node "10" $env:platform - - npm ci - -build: off - -before_test: - - curl --silent https://v4.ifconfig.co/ - - node -v - - npm -v - -test_script: - - npm run all - -cache: - - '%APPDATA%\npm-cache\ -> .appveyor.yml,package.json,package-lock.json' diff --git a/.travis.yml b/.travis.yml index 5d0b45e19..38c793cd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,26 +3,37 @@ git: language: node_js +os: + - linux + - windows + node_js: - "10" +env: + global: + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then NPM_CACHE_FOLDER=$APPDATA/npm-cache; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then NPM_CACHE_FOLDER=$HOME/.npm; fi + install: - npm ci before_script: - curl --silent https://v4.ifconfig.co/ + - npm config get cache script: - - npm run all-with-coverage + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm run all-with-coverage; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then npm run test; fi after_success: - - npm run coveralls + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm run coveralls; fi + +cache: + directories: + - "$NPM_CACHE_FOLDER" notifications: email: - joshua@mervine.net - bootstrap@maxcdn.com - -cache: - directories: - - "$HOME/.npm" diff --git a/README.md b/README.md index 4bf41f96c..d305841b4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # BootstrapCDN -[![Linux Build Status](https://img.shields.io/travis/MaxCDN/bootstrapcdn/develop.svg?label=Linux%20build&style=flat-square)](https://travis-ci.org/MaxCDN/bootstrapcdn) -[![Windows Build status](https://img.shields.io/appveyor/ci/jdorfman/bootstrapcdn/develop.svg?label=Windows%20build&style=flat-square)](https://ci.appveyor.com/project/jdorfman/bootstrapcdn) +[![Build Status](https://img.shields.io/travis/MaxCDN/bootstrapcdn/develop.svg?label=Build%20Status&style=flat-square)](https://travis-ci.org/MaxCDN/bootstrapcdn) [![Coverage Status](https://img.shields.io/coveralls/github/MaxCDN/bootstrapcdn.svg?style=flat-square)](https://coveralls.io/github/MaxCDN/bootstrapcdn) [![dependencies Status](https://img.shields.io/david/MaxCDN/bootstrapcdn.svg?style=flat-square)](https://david-dm.org/MaxCDN/bootstrapcdn) [![devDependencies Status](https://img.shields.io/david/dev/MaxCDN/bootstrapcdn.svg?style=flat-square)](https://david-dm.org/MaxCDN/bootstrapcdn?type=dev) From cca35ff698db2efcf9b8cf3f159c67b9b5054d0f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 24 Nov 2018 13:39:34 +0200 Subject: [PATCH 2/3] Testing Windows cache folder location --- .travis.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38c793cd0..6fb4845d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,24 +3,18 @@ git: language: node_js -os: - - linux - - windows - node_js: - "10" -env: - global: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then NPM_CACHE_FOLDER=$APPDATA/npm-cache; fi - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then NPM_CACHE_FOLDER=$HOME/.npm; fi +os: + - linux + - windows -install: - - npm ci +before_install: + - npm config set cache "$HOME/.npm" before_script: - curl --silent https://v4.ifconfig.co/ - - npm config get cache script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm run all-with-coverage; fi @@ -31,7 +25,7 @@ after_success: cache: directories: - - "$NPM_CACHE_FOLDER" + - "$HOME/.npm" notifications: email: From 6799be597bc3f14bd45e5944e9623e1e26fefa8b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 24 Nov 2018 19:02:16 +0200 Subject: [PATCH 3/3] Update .travis.yml --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fb4845d6..27267f7f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,6 @@ os: - linux - windows -before_install: - - npm config set cache "$HOME/.npm" - before_script: - curl --silent https://v4.ifconfig.co/