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 25d6bb90f9..352c977876 100644 --- a/aio/aio-builds-setup/docs/misc--integrate-with-ci.md +++ b/aio/aio-builds-setup/docs/misc--integrate-with-ci.md @@ -3,10 +3,9 @@ TODO (gkalpak): Add docs. Mention: - Travis' JWT addon (+ limitations). - Relevant files: `.travis.yml` + Relevant files: `.travis.yml`, `scripts/ci/env.sh` - Testing on CI. - Relevant files: `ci/test-aio.sh`, `aio/aio-builds-setup/scripts/test.sh` -- Preverifying on CI. - Relevant files: `ci/deploy.sh`, `aio/aio-builds-setup/scripts/travis-preverify-pr.sh` + Relevant files: `scripts/ci/test-aio.sh`, `aio/aio-builds-setup/scripts/test.sh` - Deploying from CI. - Relevant files: `ci/deploy.sh`, `aio/scripts/deploy-preview.sh` + Relevant files: `scripts/ci/deploy.sh`, `aio/scripts/deploy-preview.sh`, + `aio/scripts/deploy-to-firebase.sh` diff --git a/aio/aio-builds-setup/docs/overview--scripts-and-commands.md b/aio/aio-builds-setup/docs/overview--scripts-and-commands.md index 72d8062d81..4260fe3b96 100644 --- a/aio/aio-builds-setup/docs/overview--scripts-and-commands.md +++ b/aio/aio-builds-setup/docs/overview--scripts-and-commands.md @@ -16,13 +16,6 @@ available: Can be used for running the tests for `/dockerbuild/scripts-js/`. This is useful for CI integration. See [here](misc--integrate-with-ci.md) for more info. -- `travis-preverify-pr.sh`: - Can be used for "pre-verifying" a PR before uploading the artifacts to the server. It checks - whether the author of the PR is a member of one of the specified GitHub teams (therefore allowed - to upload build artifacts) or the PR has the specified "trusted PR" label (meaning it has been - manually verified by a trusted member). This is useful for CI integration. - See [here](misc--integrate-with-ci.md) for more info. - - `update-preview-server.sh`: Can be used for updating the docker container (and image) based on the latest changes checked out from a git repository. See [here](vm-setup--update-docker-container.md) for more info. diff --git a/aio/aio-builds-setup/scripts/travis-preverify-pr.sh b/aio/aio-builds-setup/scripts/travis-preverify-pr.sh deleted file mode 100755 index 9cfbfeff37..0000000000 --- a/aio/aio-builds-setup/scripts/travis-preverify-pr.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -set -eux -o pipefail - -# Set up env -source "`dirname $0`/_env.sh" - -# Build `scripts-js/` -( - cd "$SCRIPTS_JS_DIR" - yarn install - yarn build -) - -# Preverify PR -AIO_GITHUB_ORGANIZATION="angular" \ -AIO_GITHUB_TEAM_SLUGS="angular-core,aio-contributors" \ -AIO_GITHUB_TOKEN=$(echo ${GITHUB_TEAM_MEMBERSHIP_CHECK_KEY} | rev) \ -AIO_REPO_SLUG=$TRAVIS_REPO_SLUG \ -AIO_TRUSTED_PR_LABEL="aio: preview" \ -AIO_PREVERIFY_PR=$TRAVIS_PULL_REQUEST \ -node "$SCRIPTS_JS_DIR/dist/lib/upload-server/index-preverify-pr" - -# Exit codes: -# - 0: The PR can be automatically trusted (i.e. author belongs to trusted team or PR has the "trusted PR" label). -# - 1: An error occurred. -# - 2: The PR cannot be automatically trusted. diff --git a/scripts/ci/env.sh b/scripts/ci/env.sh index 6aa401a9b3..5d9b2fba96 100755 --- a/scripts/ci/env.sh +++ b/scripts/ci/env.sh @@ -84,9 +84,6 @@ if [[ ${TRAVIS:-} ]]; then # WARNING: NGBUILDS_IO_KEY should NOT be printed export NGBUILDS_IO_KEY=${NGBUILDS_IO_KEY:-$SAUCE_ACCESS_KEY} - # Personal token generated by mary-poppins, with only `read_org` permission - export GITHUB_TEAM_MEMBERSHIP_CHECK_KEY=35fc4093c1f29a2ddaf60cce5d57065454180bf6 - # Used by karma and karma-chrome-launcher # In order to have a meaningful SauceLabs badge on the repo page, # the angular2-ci account is used only when pushing commits to master;