From 618b2b1ae67645e9676a770a8e30f9ab8acb5965 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 17:42:05 -0600 Subject: [PATCH 01/11] Add basic BuildKite :pipeline: --- .buildkite/pipeline.yaml | 33 ++++++++++++++++++++++ scripts/{travis => ci}/build.sh | 2 +- scripts/{travis => ci}/end-to-end-tests.sh | 4 +-- scripts/{travis => ci}/install-deps.sh | 0 scripts/{travis => ci}/riot-unit-tests.sh | 4 +-- scripts/{travis => ci}/unit-tests.sh | 4 +-- 6 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 .buildkite/pipeline.yaml rename scripts/{travis => ci}/build.sh (82%) mode change 100755 => 100644 rename scripts/{travis => ci}/end-to-end-tests.sh (84%) mode change 100755 => 100644 rename scripts/{travis => ci}/install-deps.sh (100%) mode change 100755 => 100644 rename scripts/{travis => ci}/riot-unit-tests.sh (65%) mode change 100755 => 100644 rename scripts/{travis => ci}/unit-tests.sh (64%) mode change 100755 => 100644 diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml new file mode 100644 index 0000000000..36eb1c631d --- /dev/null +++ b/.buildkite/pipeline.yaml @@ -0,0 +1,33 @@ +steps: + - label: ":eslint: Lint" + command: + - "./scripts/ci/install-deps.sh" + - "yarn lintwithexclusions" + plugins: + - docker#v3.0.1: + image: "node:10" + + - label: ":chrome: End-to-End Tests" + command: + - "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: + - "./scripts/ci/install-deps.sh" + - "./scripts/ci/unit-tests.sh" + plugins: + - docker#v3.0.1: + image: "node:10" + + - label: "🔧 Riot Tests" + command: + - "./scripts/ci/install-deps.sh" + - "./scripts/ci/riot-unit-tests.sh" + plugins: + - docker#v3.0.1: + image: "node:10" diff --git a/scripts/travis/build.sh b/scripts/ci/build.sh old mode 100755 new mode 100644 similarity index 82% rename from scripts/travis/build.sh rename to scripts/ci/build.sh index 862a3feaa9..0b1fa23093 --- a/scripts/travis/build.sh +++ b/scripts/ci/build.sh @@ -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. diff --git a/scripts/travis/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh old mode 100755 new mode 100644 similarity index 84% rename from scripts/travis/end-to-end-tests.sh rename to scripts/ci/end-to-end-tests.sh index 0c728be509..d0b1a30ce2 --- a/scripts/travis/end-to-end-tests.sh +++ b/scripts/ci/end-to-end-tests.sh @@ -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 diff --git a/scripts/travis/install-deps.sh b/scripts/ci/install-deps.sh old mode 100755 new mode 100644 similarity index 100% rename from scripts/travis/install-deps.sh rename to scripts/ci/install-deps.sh diff --git a/scripts/travis/riot-unit-tests.sh b/scripts/ci/riot-unit-tests.sh old mode 100755 new mode 100644 similarity index 65% rename from scripts/travis/riot-unit-tests.sh rename to scripts/ci/riot-unit-tests.sh index ca53dc9268..215af13030 --- a/scripts/travis/riot-unit-tests.sh +++ b/scripts/ci/riot-unit-tests.sh @@ -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 diff --git a/scripts/travis/unit-tests.sh b/scripts/ci/unit-tests.sh old mode 100755 new mode 100644 similarity index 64% rename from scripts/travis/unit-tests.sh rename to scripts/ci/unit-tests.sh index fe3e383c0a..77232fc0f8 --- a/scripts/travis/unit-tests.sh +++ b/scripts/ci/unit-tests.sh @@ -1,10 +1,10 @@ #!/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. set -ev -scripts/travis/build.sh +scripts/ci/build.sh CHROME_BIN='/usr/bin/google-chrome-stable' yarn test From fd23be9945e5d8136247521b648625c06386b5b3 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 17:42:15 -0600 Subject: [PATCH 02/11] Remove Travis (CI) --- .travis.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ebf36658d5..0000000000 --- a/.travis.yml +++ /dev/null @@ -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 From 378bf68b431cd65a82ae5674446a6de22f9c4a0b Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 17:44:32 -0600 Subject: [PATCH 03/11] Force the scripts to be executable in BuildKite --- .buildkite/pipeline.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 36eb1c631d..b8e79efa8a 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -1,6 +1,9 @@ steps: - label: ":eslint: Lint" command: + # TODO: Remove hacky chmod for BuildKite + - "chmod +x ./scripts/ci/*.sh" + - "chmod +x ./scripts/*" - "./scripts/ci/install-deps.sh" - "yarn lintwithexclusions" plugins: @@ -9,6 +12,9 @@ steps: - label: ":chrome: 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" @@ -18,6 +24,9 @@ steps: - label: ":karma: Tests" command: + # TODO: Remove hacky chmod for BuildKite + - "chmod +x ./scripts/ci/*.sh" + - "chmod +x ./scripts/*" - "./scripts/ci/install-deps.sh" - "./scripts/ci/unit-tests.sh" plugins: @@ -26,6 +35,9 @@ steps: - label: "🔧 Riot Tests" command: + # 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" plugins: From 311c81fca02bec8e7e31638c522a847a0af889d9 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 17:56:53 -0600 Subject: [PATCH 04/11] Disable end-to-end tests for now --- .buildkite/pipeline.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index b8e79efa8a..f36112f8ac 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -10,17 +10,17 @@ steps: - docker#v3.0.1: image: "node:10" - - label: ":chrome: 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: ":chrome: 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: From c63c6fce70d6d8f22ccb15d63c620d5941d085c0 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 18:33:45 -0600 Subject: [PATCH 05/11] Linter doesn't need downstream projects --- .buildkite/pipeline.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index f36112f8ac..a4aaf72b16 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -1,10 +1,7 @@ steps: - label: ":eslint: Lint" command: - # TODO: Remove hacky chmod for BuildKite - - "chmod +x ./scripts/ci/*.sh" - - "chmod +x ./scripts/*" - - "./scripts/ci/install-deps.sh" + - "yarn install" - "yarn lintwithexclusions" plugins: - docker#v3.0.1: From bdc94f38475500a41c40521826f311e1e1409936 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 22:11:45 -0600 Subject: [PATCH 06/11] Fix Chrome for Karma --- .buildkite/pipeline.yaml | 16 ++++++++++++++++ karma.conf.js | 3 ++- package.json | 4 ++-- yarn.lock | 8 ++++---- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index a4aaf72b16..229e1ac2cb 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -21,22 +21,38 @@ steps: - 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" - 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" diff --git a/karma.conf.js b/karma.conf.js index 5e7fe76d56..b687be78fa 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -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', diff --git a/package.json b/package.json index 0fa4a829de..f1fb365a65 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index d1da66b82b..36fa22ae44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" From cab5f7aba47d57517427e20ed9f8b58bfb8c015c Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 Mar 2019 22:22:36 -0600 Subject: [PATCH 07/11] Use the right branch for fetching dependencies --- .buildkite/pipeline.yaml | 2 ++ scripts/fetchdep.sh | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 229e1ac2cb..3f66d3fa88 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -37,6 +37,7 @@ steps: plugins: - docker#v3.0.1: image: "node:10" + propagate-environment: true - label: "🔧 Riot Tests" command: @@ -56,3 +57,4 @@ steps: plugins: - docker#v3.0.1: image: "node:10" + propagate-environment: true diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh index 95fc4b0603..c00f0ff0f2 100755 --- a/scripts/fetchdep.sh +++ b/scripts/fetchdep.sh @@ -17,10 +17,8 @@ clone() { fi } -# Try the PR author's branch in case it exists on the deps as well. -clone $TRAVIS_PULL_REQUEST_BRANCH # Try the target branch of the push or PR. -clone $TRAVIS_BRANCH +clone $BUILDKITE_BRANCH # Try the current branch from Jenkins. clone `"echo $GIT_BRANCH" | sed -e 's/^origin\///'` # Use the default branch as the last resort. From d8a559074b0c8db5e13b24332289c2dc11af0067 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 15 Mar 2019 10:33:39 -0600 Subject: [PATCH 08/11] Better emoji is the most important part of CI --- .buildkite/pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 3f66d3fa88..04b047436b 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -7,7 +7,7 @@ steps: - docker#v3.0.1: image: "node:10" -# - label: ":chrome: End-to-End Tests" +# - label: ":chains: End-to-End Tests" # command: # # TODO: Remove hacky chmod for BuildKite # - "chmod +x ./scripts/ci/*.sh" From 5b68a70da1e9fa9edcdaf10ad58b32bc536026c7 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 15 Mar 2019 10:33:55 -0600 Subject: [PATCH 09/11] Remove uneeded CHROME_BIN env setter --- scripts/ci/unit-tests.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci/unit-tests.sh b/scripts/ci/unit-tests.sh index 77232fc0f8..4a5995a2e3 100644 --- a/scripts/ci/unit-tests.sh +++ b/scripts/ci/unit-tests.sh @@ -7,4 +7,3 @@ set -ev scripts/ci/build.sh -CHROME_BIN='/usr/bin/google-chrome-stable' yarn test From 365c8e9fdc34f872cd84e00a46e040cca4ff7ebc Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 15 Mar 2019 10:34:30 -0600 Subject: [PATCH 10/11] Fetch downstream dependencies from as many places as possible Gives the build the best possible chance at passing --- scripts/fetchdep.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh index c00f0ff0f2..b9ca6a32dd 100755 --- a/scripts/fetchdep.sh +++ b/scripts/fetchdep.sh @@ -19,6 +19,8 @@ clone() { # Try the target branch of the push or PR. clone $BUILDKITE_BRANCH +# Try the PR author's branch in case it exists on the deps as well. +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. From 6d7703dcb622a9640f71f13d9027599b74d7864c Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 15 Mar 2019 11:19:05 -0600 Subject: [PATCH 11/11] Re-introduce `yarn test` and fix comments --- scripts/ci/unit-tests.sh | 1 + scripts/fetchdep.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/ci/unit-tests.sh b/scripts/ci/unit-tests.sh index 4a5995a2e3..5b86190963 100644 --- a/scripts/ci/unit-tests.sh +++ b/scripts/ci/unit-tests.sh @@ -7,3 +7,4 @@ set -ev scripts/ci/build.sh +yarn test diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh index b9ca6a32dd..6fb50e7cea 100755 --- a/scripts/fetchdep.sh +++ b/scripts/fetchdep.sh @@ -17,9 +17,10 @@ clone() { fi } -# Try the target branch of the push or PR. -clone $BUILDKITE_BRANCH + # Try the PR author's branch in case it exists on the deps as well. +clone $BUILDKITE_BRANCH +# Try the target branch of the push or PR. clone $BUILDKITE_PULL_REQUEST_BASE_BRANCH # Try the current branch from Jenkins. clone `"echo $GIT_BRANCH" | sed -e 's/^origin\///'`