diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml new file mode 100644 index 00000000..55e65b05 --- /dev/null +++ b/.buildkite/pipeline.yaml @@ -0,0 +1,26 @@ +steps: + - label: ":eslint: Lint" + command: + - "yarn install" + - "yarn lint" + plugins: + - docker#v3.0.1: + image: "node:10" + + - label: ":karma: Tests" + command: + # Install chrome + - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -" + - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'" + - "apt-get update" + - "apt-get install -y google-chrome-stable" + # Run tests + - "./scripts/fetch-develop.deps.sh --depth 1" + - "yarn install" + - "yarn test" + env: + CHROME_BIN: "/usr/bin/google-chrome-stable" + plugins: + - docker#v3.0.1: + image: "node:10" + propagate-environment: true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0047d752..00000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -# we need trusty for the chrome addon -dist: trusty - -# we don't need sudo, so can run in a container, which makes startup much -# quicker. -# -# unfortunately we do temporarily require sudo as a workaround for -# https://github.com/travis-ci/travis-ci/issues/8836 -sudo: required - -language: node_js -node_js: - # make sure we work with a range of node versions. - # - # Current status of node versions: https://github.com/nodejs/LTS/ - # Our minimum supported version is Node 10. - - 10 - - 11 -addons: - chrome: stable -before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0 - - export PATH=$HOME/.yarn/bin:$PATH -install: - # clone the deps with depth 1: we know we will only ever need that one - # commit. - - scripts/fetch-develop.deps.sh --depth 1 && yarn install -script: - - CHROME_BIN='/usr/bin/google-chrome-stable' yarn test - - yarn lint diff --git a/karma.conf.js b/karma.conf.js index 4cb9a729..610541a5 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -138,10 +138,10 @@ module.exports = function (config) { ], customLaunchers: { - 'ChromeHeadless': { + 'VectorChromeHeadless': { base: 'Chrome', flags: [ - // '--no-sandbox', + '--no-sandbox', // See https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md '--headless', '--disable-gpu', diff --git a/package.json b/package.json index e2af18b5..0083244c 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "lintall": "eslint src/ test/", "clean": "rimraf lib webapp electron_app/dist", "prepare": "yarn clean && yarn build:compile", - "test": "karma start --single-run=true --autoWatch=false --browsers ChromeHeadless", + "test": "karma start --single-run=true --autoWatch=false --browsers VectorChromeHeadless", "test-multi": "karma start" }, "dependencies": { @@ -117,7 +117,7 @@ "html-webpack-plugin": "^3.2.0", "json-loader": "^0.5.3", "karma": "^3.1.2", - "karma-chrome-launcher": "^0.2.3", + "karma-chrome-launcher": "^2.2.0", "karma-cli": "^1.0.1", "karma-junit-reporter": "^2.0.0", "karma-logcapture-reporter": "0.0.1", diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh index 7fbb76f4..d824be95 100755 --- a/scripts/fetch-develop.deps.sh +++ b/scripts/fetch-develop.deps.sh @@ -40,9 +40,9 @@ function dodep() { # Try the PR author's branch in case it exists on the deps as well. # Try the target branch of the push or PR. # Use the default branch as the last resort. - if [[ "$TRAVIS" == true ]]; then - clone $org $repo $TRAVIS_PULL_REQUEST_BRANCH || - clone $org $repo $TRAVIS_BRANCH || + if [[ "$BUILDKITE" == true ]]; then + clone $org $repo $BUILDKITE_BRANCH || + clone $org $repo $BUILDKITE_PULL_REQUEST_BASE_BRANCH || clone $org $repo $defbranch || return $? else diff --git a/yarn.lock b/yarn.lock index 55e137cf..d77298aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5336,10 +5336,10 @@ jsx-ast-utils@^2.0.1: dependencies: array-includes "^3.0.3" -karma-chrome-launcher@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz#4c6d700d163a9d34c618efd87918be49e7a4a8c9" - integrity sha1-TG1wDRY6nTTGGO/YeRi+SeekqMk= +karma-chrome-launcher@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf" + integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w== dependencies: fs-access "^1.0.0" which "^1.2.1"