diff --git a/.gitignore b/.gitignore index 7df0a00b..db3155b6 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,9 @@ fusion-studio-extension/src/browser/style/index.css # integration test files cypress/videos/* cypress/screenshots/* + +# private +.notes + +# node-gyp +build/ diff --git a/.travis.yml b/.travis.yml index d515f115..a11d0933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ env: global: - ELECTRON_CACHE=$HOME/.cache/electron - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder - - YARN_GPG=no + - YARN_GPG=no jobs: include: @@ -31,9 +31,8 @@ jobs: node_js: 10 env: - IMG=existdb/existdb:latest - - API_XAR=https://github.com/evolvedbinary/fusion-studio-api/releases/download/0.1.0/fusion-studio-api-0.1.0.xar - before_install: - - python --version + - API_XAR=https://github.com/evolvedbinary/fusion-studio-api/releases/download/0.1.1/fusion-studio-api-0.1.1.xar + before_script: - docker pull $IMG - docker create --name exist-ci -p 8080:8080 $IMG - wget $API_XAR @@ -42,56 +41,48 @@ jobs: - rm *.xar - sleep 10 script: + - yarn test - yarn run cypress run --record - name: Ubuntu Xenial (16.04) / NodeJS 12 / Python 2 os: linux dist: xenial node_js: 12 - before_install: - - python --version - name: Ubuntu Focal (20.04) / NodeJS 10 / Python 3 os: linux dist: focal node_js: 10 - before_install: - - python --version - name: Ubuntu Focal (20.04) / NodeJS 12 / Python 3 os: linux dist: focal node_js: 12 - before_install: - - python --version + + - name: Ubuntu Focal (20.04) / NodeJS 14 / Python 3 + os: linux + dist: focal + node_js: 14 - name: macOS High Sierra (10.13) / NodeJS 10 / Python 2 os: osx osx_image: xcode9.3 node_js: 10 - before_install: - - python --version -# - name: macOS High Sierra (10.13) / NodeJS 12 / Python 2 -# os: osx -# osx_image: xcode9.3 -# node_js: 12 -# before_install: -# - python --version + - name: macOS High Sierra (10.13) / NodeJS 12 / Python 2 + os: osx + osx_image: xcode9.3 + node_js: 12 - name: macOS Catalina (10.15) / NodeJS 10 / Python 2 os: osx osx_image: xcode12 node_js: 10 - before_install: - - python --version -# - name: macOS Catalina (10.15) / NodeJS 12 / Python 2 -# os: osx -# osx_image: xcode12 -# node_js: 12 -# before_install: -# - python --version + - name: macOS Catalina (10.15) / NodeJS 12 / Python 2 + os: osx + osx_image: xcode12 + node_js: 12 - name: macOS Catalina (10.15) / NodeJS 10 / Python 3 os: osx @@ -102,14 +93,41 @@ jobs: before_install: - $PYTHON --version -# - name: macOS Catalina (10.15) / NodeJS 12 / Python 3 -# os: osx -# osx_image: xcode12 -# node_js: 12 -# env: -# - PYTHON=/usr/bin/python3 -# before_install: -# - $PYTHON --version + - name: macOS Catalina (10.15) / NodeJS 12 / Python 3 + os: osx + osx_image: xcode12 + node_js: 12 + env: + - PYTHON=/usr/bin/python3 + before_install: + - $PYTHON --version + + allow_failures: + - name: Ubuntu Focal (20.04) / NodeJS 14 / Python 3 + os: linux + dist: focal + node_js: 14 + + - name: macOS High Sierra (10.13) / NodeJS 12 / Python 2 + os: osx + osx_image: xcode9.3 + node_js: 12 + + - name: macOS Catalina (10.15) / NodeJS 12 / Python 2 + os: osx + osx_image: xcode12 + node_js: 12 + + - name: macOS Catalina (10.15) / NodeJS 12 / Python 3 + os: osx + osx_image: xcode12 + node_js: 12 + env: + - PYTHON=/usr/bin/python3 + + +before_install: + - python --version install: - yarn @@ -119,7 +137,7 @@ install: - yarn start & - cd .. -before_script: +script: - yarn test before_cache: diff --git a/README.md b/README.md index f601424b..9f76bc75 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ exec $SHELL ``` #### For Testing -* [cypress.js](https://www.cypress.io) v3.2.0 +* [cypress.js](https://www.cypress.io) ` >= 4.1.0`. diff --git a/package.json b/package.json index 27f36441..85f3cb51 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "node-sass": "4.14.1" }, "resolutions": { - "node-gyp": "^3.8.0", "node-gyp": "^7.0.0" }, "workspaces": [