diff --git a/.travis.yml b/.travis.yml index 55a0a5227b..8a05373587 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,16 +39,10 @@ env: # - CI_MODE=browserstack_required - CI_MODE=saucelabs_optional - CI_MODE=browserstack_optional - - CI_MODE=aio_tools_test - - CI_MODE=aio - - CI_MODE=aio_local - - CI_MODE=aio_e2e AIO_SHARD=0 - - CI_MODE=aio_e2e AIO_SHARD=1 matrix: fast_finish: true allow_failures: - - env: "CI_MODE=aio_local" - env: "CI_MODE=saucelabs_optional" - env: "CI_MODE=browserstack_optional" diff --git a/aio/aio-builds-setup/docs/misc--integrate-with-ci.md b/aio/aio-builds-setup/docs/misc--integrate-with-ci.md index 8b98924d55..5a7d92c2f4 100644 --- a/aio/aio-builds-setup/docs/misc--integrate-with-ci.md +++ b/aio/aio-builds-setup/docs/misc--integrate-with-ci.md @@ -3,7 +3,7 @@ TODO (gkalpak): Add docs. Mention: - Testing on CI. - Relevant files: `scripts/ci/test-aio.sh`, `aio/aio-builds-setup/scripts/test.sh` + Relevant files: `aio/aio-builds-setup/scripts/test.sh` - Deploying from CI. Relevant files: `.circleci/config.yml`, `scripts/ci/deploy.sh`, `aio/scripts/build-artifacts.sh`, `aio/scripts/deploy-to-firebase.sh` diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 706967d3a2..5e59873204 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -15,32 +15,7 @@ if [[ ${TRAVIS_TEST_RESULT=0} == 1 ]]; then fi # No build needed for bazel or aio docs tests -if [[ ${CI_MODE:-} == "bazel" || ${CI_MODE:-} == "docs_test" ]]; then - exit 0; -fi - -# Build the Angular packages -if [[ ${CI_MODE:-} == "aio_local" || ${CI_MODE:-} == "aio_e2e" || ${CI_MODE:-} == "aio_tools_test" ]]; then - travisFoldStart "build.packages.$CI_MODE" - ( - ./build.sh --examples=false - ) - travisFoldEnd "build.packages.$CI_MODE" - - # Exit if no further build required - if [[ ${CI_MODE:-} == "aio_e2e" || ${CI_MODE:-} == "aio_tools_test" ]]; then - exit 0; - fi -fi - -# Build angular.io, then exit (no further build required) -if [[ ${CI_MODE:-} == "aio" || ${CI_MODE:-} == "aio_local" ]]; then - travisFoldStart "build.aio" - ( - cd "`dirname $0`/../../aio" - yarn $([[ ${CI_MODE} == "aio" ]] && echo "build" || echo "build-local") - ) - travisFoldEnd "build.aio" +if [[ ${CI_MODE:-} == "bazel" ]]; then exit 0; fi diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index f39801f544..ce5b9171b6 100755 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -47,29 +47,11 @@ travisFoldStart "bower-install" travisFoldEnd "bower-install" -if [[ ${TRAVIS} && - ${CI_MODE} == "aio" || - ${CI_MODE} == "aio_local" || - ${CI_MODE} == "aio_e2e" || - ${CI_MODE} == "aio_tools_test" -]]; then - # angular.io: Install all yarn dependencies according to angular.io/yarn.lock - travisFoldStart "yarn-install.aio" - ( - cd ${PROJECT_ROOT}/aio - yarn install --frozen-lockfile --non-interactive - ) - travisFoldEnd "yarn-install.aio" -fi - # Install Chromium if [[ ${TRAVIS} && ${CI_MODE} == "js" || ${CI_MODE} == "e2e" || - ${CI_MODE} == "e2e_2" || - ${CI_MODE} == "aio" || - ${CI_MODE} == "aio_local" || - ${CI_MODE} == "aio_e2e" + ${CI_MODE} == "e2e_2" ]]; then travisFoldStart "install-chromium" ( diff --git a/scripts/ci/test-aio-e2e.sh b/scripts/ci/test-aio-e2e.sh deleted file mode 100755 index 8d7a42bc46..0000000000 --- a/scripts/ci/test-aio-e2e.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set -u -e -o pipefail - -# Setup environment -readonly thisDir=$(cd $(dirname $0); pwd) -source ${thisDir}/_travis-fold.sh - - -# run in subshell to avoid polluting cwd -( - cd ${PROJECT_ROOT}/aio - - # Run example e2e tests - travisFoldStart "test.aio.example-e2e" - yarn example-e2e --setup --local --shard=${AIO_SHARD}/2 - travisFoldEnd "test.aio.example-e2e" -) diff --git a/scripts/ci/test-aio-local.sh b/scripts/ci/test-aio-local.sh deleted file mode 100755 index f275ebca72..0000000000 --- a/scripts/ci/test-aio-local.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -set -u -e -o pipefail - -# Setup environment -readonly thisDir=$(cd $(dirname $0); pwd) -source ${thisDir}/_travis-fold.sh - - -# run in subshell to avoid polluting cwd -( - cd ${PROJECT_ROOT}/aio - - - # Run PWA-score tests - # (Run before unit and e2e tests, which destroy the `dist/` directory.) - travisFoldStart "test.aio.pwaScore" - yarn test-pwa-score-localhost $CI_AIO_MIN_PWA_SCORE - travisFoldEnd "test.aio.pwaScore" - - # Run unit tests - travisFoldStart "test.aio.unit" - yarn test --watch=false - travisFoldEnd "test.aio.unit" - - # Run e2e tests - travisFoldStart "test.aio.e2e" - yarn e2e - travisFoldEnd "test.aio.e2e" -) diff --git a/scripts/ci/test-aio-tools.sh b/scripts/ci/test-aio-tools.sh deleted file mode 100755 index 9555ea47d9..0000000000 --- a/scripts/ci/test-aio-tools.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -u -e -o pipefail - -# Setup environment -readonly thisDir=$(cd $(dirname $0); pwd) -source ${thisDir}/_travis-fold.sh - - -travisFoldStart "test.docs" - ( - cd ${PROJECT_ROOT}/aio - yarn setup - yarn tools-test - ) -travisFoldEnd "test.docs" diff --git a/scripts/ci/test-aio.sh b/scripts/ci/test-aio.sh deleted file mode 100755 index 1c557050b9..0000000000 --- a/scripts/ci/test-aio.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env bash - -set -u -e -o pipefail - -# Setup environment -readonly thisDir=$(cd $(dirname $0); pwd) -source ${thisDir}/_travis-fold.sh - - -# run in subshell to avoid polluting cwd -( - cd ${PROJECT_ROOT}/aio - - - # Lint the code - travisFoldStart "test.aio.lint" - yarn lint - travisFoldEnd "test.aio.lint" - - - # Run PWA-score tests - # (Run before unit and e2e tests, which destroy the `dist/` directory.) - travisFoldStart "test.aio.pwaScore" - yarn test-pwa-score-localhost $CI_AIO_MIN_PWA_SCORE - travisFoldEnd "test.aio.pwaScore" - - # Check the bundle sizes. - # (Run before unit and e2e tests, which destroy the `dist/` directory.) - travisFoldStart "test.aio.payload-size" - yarn payload-size - travisFoldEnd "test.aio.payload-size" - - # Run unit tests - travisFoldStart "test.aio.unit" - yarn test --watch=false - travisFoldEnd "test.aio.unit" - - # Run e2e tests - travisFoldStart "test.aio.e2e" - yarn e2e - travisFoldEnd "test.aio.e2e" - - # Run unit tests for Firebase redirects - travisFoldStart "test.aio.redirects" - yarn redirects-test - travisFoldEnd "test.aio.redirects" - - # Run unit tests for aio/aio-builds-setup - travisFoldStart "test.aio.aio-builds-setup" - ./aio-builds-setup/scripts/test.sh - travisFoldEnd "test.aio.aio-builds-setup" -) diff --git a/scripts/ci/test.sh b/scripts/ci/test.sh index 6b201de23b..2286dbed66 100755 --- a/scripts/ci/test.sh +++ b/scripts/ci/test.sh @@ -34,16 +34,4 @@ case ${CI_MODE} in browserstack_optional) ${thisDir}/test-browserstack.sh ;; - aio_tools_test) - ${thisDir}/test-aio-tools.sh - ;; - aio) - ${thisDir}/test-aio.sh - ;; - aio_local) - ${thisDir}/test-aio-local.sh - ;; - aio_e2e) - ${thisDir}/test-aio-e2e.sh - ;; esac