Skip to content

Commit 3e7ae68

Browse files
devversionvivian-hu-zz
authored andcommitted
build: no longer use travis-ci (#14064)
1 parent 4a1c8ed commit 3e7ae68

23 files changed

+149
-391
lines changed

.circleci/config.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,23 @@ jobs:
140140

141141
- run: ./scripts/circleci/run-browserstack-tests.sh
142142

143+
# ----------------------------------------------------------------------------
144+
# Job that runs the unit tests on Saucelabs. The browsers that will be used
145+
# to run the unit tests on Saucelabs are set in: test/browser-providers.js
146+
# ----------------------------------------------------------------------------
147+
tests_saucelabs:
148+
<<: *job_defaults
149+
resource_class: xlarge
150+
environment:
151+
SAUCE_USERNAME: "angular-ci"
152+
SAUCE_ACCESS_KEY: "9b988f434ff8-fbca-8aa4-4ae3-35442987"
153+
steps:
154+
- *checkout_code
155+
- *restore_cache
156+
- *yarn_install
157+
158+
- run: ./scripts/circleci/run-saucelabs-tests.sh
159+
143160
# -----------------------------------------------------------------------------------------
144161
# Job that builds the demo-app with AOT. In order to speed up this job, the release output
145162
# from the workspace storage will be attached to this job.
@@ -268,6 +285,7 @@ workflows:
268285
jobs:
269286
- tests_local_browsers
270287
- tests_browserstack
288+
- tests_saucelabs
271289

272290
integration_tests:
273291
jobs:

.github/angular-robot.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@ merge:
5555

5656
# list of PR statuses that need to be successful
5757
requiredStatuses:
58-
# TODO(josephperrott): reenable once CI flakiness is addressed
59-
# - "continuous-integration/travis-ci/pr"
6058
- "ci/circleci: lint"
6159
- "ci/circleci: bazel_build_test"
6260
- "ci/circleci: tests_local_browsers"
6361
- "ci/circleci: tests_browserstack"
62+
- "ci/circleci: tests_saucelabs"
6463
- "ci/circleci: build_release_packages"
6564

6665
# the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable

.travis.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Material Design for Angular
22
[![npm version](https://badge.fury.io/js/%40angular%2Fmaterial.svg)](https://www.npmjs.com/package/%40angular%2Fmaterial)
3-
[![Build Status](https://travis-ci.org/angular/material2.svg?branch=master)](https://travis-ci.org/angular/material2)
3+
[![Build status](https://circleci.com/gh/angular/material2.svg?style=svg)](https://circleci.com/gh/angular/material2)
44
[![Gitter](https://badges.gitter.im/angular/material2.svg)](https://gitter.im/angular/material2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
55

66
This is the home for the Angular team's Material Design components built for and with Angular.

WORKSPACE

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_reposi
6767
check_bazel_version("0.18.0")
6868

6969
node_repositories(
70-
# For deterministic builds, specify explicit NodeJS and Yarn versions. Keep the Yarn version
71-
# in sync with the version of Travis.
70+
# For deterministic builds, specify explicit NodeJS and Yarn versions.
7271
node_version = "10.10.0",
7372
yarn_version = "1.9.4",
7473
)

scripts/browserstack/start-tunnel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tunnelReadyFile="${tunnelTmpDir}/readyfile"
1111
tunnelErrorFile="${tunnelTmpDir}/errorfile"
1212

1313
# Cleanup and create the folder structure for the tunnel connector.
14-
rm -rf ${tunnelTmpDir} ${tunnelReadyFile} ${tunnelErrorFile}
14+
rm -rf ${tunnelTmpDir}
1515
mkdir -p ${tunnelTmpDir}
1616
touch ${tunnelLogFile}
1717

scripts/ci/README.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

scripts/ci/install-yarn.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

scripts/ci/sources/mode.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

scripts/ci/sources/tunnel.sh

Lines changed: 0 additions & 47 deletions
This file was deleted.

scripts/ci/travis-deploy.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

scripts/ci/travis-install.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

scripts/ci/travis-script.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

scripts/ci/travis-testing.sh

Lines changed: 0 additions & 48 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
3+
# In case any command failed, we want to immediately exit the script with the
4+
# proper exit code.
5+
set -e
6+
7+
# Go to project directory.
8+
cd $(dirname ${0})/../..
9+
10+
# Decode access token and make it accessible for child processes.
11+
export SAUCE_ACCESS_KEY=`echo ${SAUCE_ACCESS_KEY} | rev`
12+
13+
# Start tunnel and wait for it being ready.
14+
./scripts/saucelabs/start-tunnel.sh
15+
./scripts/saucelabs/wait-tunnel.sh
16+
17+
# Setup the test platform environment variable that will be read
18+
# by the Karma configuration script.
19+
export TEST_PLATFORM="saucelabs"
20+
21+
# Run the unit tests on Saucelabs with Karma.
22+
yarn gulp ci:test
23+
24+
# Kill the Saucelabs tunnel. This is necessary in order to avoid rate-limit
25+
# errors that cause the unit tests to be flaky.
26+
./scripts/saucelabs/stop-tunnel.sh

0 commit comments

Comments
 (0)