Merge pull request #2788 from matrix-org/travis/buildkite
Use Buildkite for CI
This commit is contained in:
commit
cd48ba6300
12 changed files with 86 additions and 62 deletions
60
.buildkite/pipeline.yaml
Normal file
60
.buildkite/pipeline.yaml
Normal file
|
@ -0,0 +1,60 @@
|
|||
steps:
|
||||
- label: ":eslint: Lint"
|
||||
command:
|
||||
- "yarn install"
|
||||
- "yarn lintwithexclusions"
|
||||
plugins:
|
||||
- docker#v3.0.1:
|
||||
image: "node:10"
|
||||
|
||||
# - label: ":chains: End-to-End Tests"
|
||||
# command:
|
||||
# # TODO: Remove hacky chmod for BuildKite
|
||||
# - "chmod +x ./scripts/ci/*.sh"
|
||||
# - "chmod +x ./scripts/*"
|
||||
# - "sudo apt-get install build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev"
|
||||
# - "./scripts/ci/install-deps.sh"
|
||||
# - "./scripts/ci/end-to-end-tests.sh"
|
||||
# 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
|
||||
# TODO: Remove hacky chmod for BuildKite
|
||||
- "chmod +x ./scripts/ci/*.sh"
|
||||
- "chmod +x ./scripts/*"
|
||||
- "./scripts/ci/install-deps.sh"
|
||||
- "./scripts/ci/unit-tests.sh"
|
||||
env:
|
||||
CHROME_BIN: "/usr/bin/google-chrome-stable"
|
||||
plugins:
|
||||
- docker#v3.0.1:
|
||||
image: "node:10"
|
||||
propagate-environment: true
|
||||
|
||||
- label: "🔧 Riot 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
|
||||
# TODO: Remove hacky chmod for BuildKite
|
||||
- "chmod +x ./scripts/ci/*.sh"
|
||||
- "chmod +x ./scripts/*"
|
||||
- "./scripts/ci/install-deps.sh"
|
||||
- "./scripts/ci/riot-unit-tests.sh"
|
||||
env:
|
||||
CHROME_BIN: "/usr/bin/google-chrome-stable"
|
||||
plugins:
|
||||
- docker#v3.0.1:
|
||||
image: "node:10"
|
||||
propagate-environment: true
|
38
.travis.yml
38
.travis.yml
|
@ -1,38 +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:
|
||||
- node # Latest stable version of nodejs.
|
||||
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:
|
||||
- ./scripts/travis/install-deps.sh
|
||||
matrix:
|
||||
include:
|
||||
- name: Linting Checks
|
||||
script:
|
||||
# run the linter, but exclude any files known to have errors or warnings.
|
||||
- yarn lintwithexclusions
|
||||
# - name: End-to-End Tests
|
||||
# if: branch = develop
|
||||
# install:
|
||||
# - sudo apt-get install build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev
|
||||
# script:
|
||||
# - ./scripts/travis/end-to-end-tests.sh
|
||||
- name: Unit Tests
|
||||
script:
|
||||
- ./scripts/travis/unit-tests.sh
|
||||
- name: Riot-web Unit Tests
|
||||
script:
|
||||
- ./scripts/travis/riot-unit-tests.sh
|
|
@ -135,9 +135,10 @@ module.exports = function (config) {
|
|||
],
|
||||
|
||||
customLaunchers: {
|
||||
'ChromeHeadless': {
|
||||
'VectorChromeHeadless': {
|
||||
base: 'Chrome',
|
||||
flags: [
|
||||
'--no-sandbox',
|
||||
// See https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
|
||||
'--headless',
|
||||
'--disable-gpu',
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
"lintwithexclusions": "eslint --max-warnings 0 --ignore-path .eslintignore.errorfiles src test",
|
||||
"clean": "rimraf lib",
|
||||
"prepare": "yarn clean && yarn build && git rev-parse HEAD > git-revision.txt",
|
||||
"test": "karma start --single-run=true --browsers ChromeHeadless",
|
||||
"test": "karma start --single-run=true --browsers VectorChromeHeadless",
|
||||
"test-multi": "karma start"
|
||||
},
|
||||
"dependencies": {
|
||||
|
@ -131,7 +131,7 @@
|
|||
"flow-parser": "^0.57.3",
|
||||
"jest-mock": "^23.2.0",
|
||||
"karma": "^4.0.1",
|
||||
"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",
|
||||
|
|
2
scripts/travis/build.sh → scripts/ci/build.sh
Executable file → Normal file
2
scripts/travis/build.sh → scripts/ci/build.sh
Executable file → Normal file
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# script which is run by the travis build (after `yarn test`).
|
||||
# script which is run by the CI build (after `yarn test`).
|
||||
#
|
||||
# clones riot-web develop and runs the tests against our version of react-sdk.
|
||||
|
4
scripts/travis/end-to-end-tests.sh → scripts/ci/end-to-end-tests.sh
Executable file → Normal file
4
scripts/travis/end-to-end-tests.sh → scripts/ci/end-to-end-tests.sh
Executable file → Normal file
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# script which is run by the travis build (after `yarn test`).
|
||||
# script which is run by the CI build (after `yarn test`).
|
||||
#
|
||||
# clones riot-web develop and runs the tests against our version of react-sdk.
|
||||
|
||||
|
@ -9,7 +9,7 @@ set -ev
|
|||
RIOT_WEB_DIR=riot-web
|
||||
REACT_SDK_DIR=`pwd`
|
||||
|
||||
scripts/travis/build.sh
|
||||
scripts/ci/build.sh
|
||||
# run end to end tests
|
||||
scripts/fetchdep.sh matrix-org matrix-react-end-to-end-tests master
|
||||
pushd matrix-react-end-to-end-tests
|
0
scripts/travis/install-deps.sh → scripts/ci/install-deps.sh
Executable file → Normal file
0
scripts/travis/install-deps.sh → scripts/ci/install-deps.sh
Executable file → Normal file
4
scripts/travis/riot-unit-tests.sh → scripts/ci/riot-unit-tests.sh
Executable file → Normal file
4
scripts/travis/riot-unit-tests.sh → scripts/ci/riot-unit-tests.sh
Executable file → Normal file
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# script which is run by the travis build (after `yarn test`).
|
||||
# script which is run by the CI build (after `yarn test`).
|
||||
#
|
||||
# clones riot-web develop and runs the tests against our version of react-sdk.
|
||||
|
||||
|
@ -8,7 +8,7 @@ set -ev
|
|||
|
||||
RIOT_WEB_DIR=riot-web
|
||||
|
||||
scripts/travis/build.sh
|
||||
scripts/ci/build.sh
|
||||
pushd "$RIOT_WEB_DIR"
|
||||
yarn test
|
||||
popd
|
10
scripts/ci/unit-tests.sh
Normal file
10
scripts/ci/unit-tests.sh
Normal file
|
@ -0,0 +1,10 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# script which is run by the CI build (after `yarn test`).
|
||||
#
|
||||
# clones riot-web develop and runs the tests against our version of react-sdk.
|
||||
|
||||
set -ev
|
||||
|
||||
scripts/ci/build.sh
|
||||
yarn test
|
|
@ -17,10 +17,11 @@ clone() {
|
|||
fi
|
||||
}
|
||||
|
||||
|
||||
# Try the PR author's branch in case it exists on the deps as well.
|
||||
clone $TRAVIS_PULL_REQUEST_BRANCH
|
||||
clone $BUILDKITE_BRANCH
|
||||
# Try the target branch of the push or PR.
|
||||
clone $TRAVIS_BRANCH
|
||||
clone $BUILDKITE_PULL_REQUEST_BASE_BRANCH
|
||||
# Try the current branch from Jenkins.
|
||||
clone `"echo $GIT_BRANCH" | sed -e 's/^origin\///'`
|
||||
# Use the default branch as the last resort.
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# script which is run by the travis build (after `yarn test`).
|
||||
#
|
||||
# clones riot-web develop and runs the tests against our version of react-sdk.
|
||||
|
||||
set -ev
|
||||
|
||||
scripts/travis/build.sh
|
||||
CHROME_BIN='/usr/bin/google-chrome-stable' yarn test
|
|
@ -4065,10 +4065,10 @@ just-extend@^4.0.2:
|
|||
resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc"
|
||||
integrity sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==
|
||||
|
||||
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"
|
||||
|
|
Loading…
Reference in a new issue