cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci(aio): build aio-builds-setup scripts before pre-verifying PR

Browse Source 
(Coincidentally), this wasn't an issue before fdfeaaf1f, because
pre-verification was run after `test.sh`, during which `aio-builds-setup` was
built.
Now that `deploy-staging.sh` is being run before `test.sh`, we need to build
the `aio-builds-setup` scripts first.
This commit is contained in:
Georgios Kalpakas
2017-05-12 11:08:45 +03:00
committed by Igor Minar
parent bcefc61da4
commit 3065fc6cca
9 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/ci/install-chromium.sh
View File

@ -82,4 +82,3 @@ fi
if [[ "$CHROMIUM_VERSION" != "$LATEST_CHROMIUM_VERSION" ]]; then
echo "New version of Chromium available. Update install-chromium.sh with build number: ${LATEST_CHROMIUM_VERSION}"
fi

7
scripts/ci/install.sh
View File

@ -65,6 +65,13 @@ if [[ ${CI_MODE} == "js" || ${CI_MODE} == "e2e" || ${CI_MODE} == "e2e_2" || ${CI
travisFoldStart "install-chromium"
(
${thisDir}/install-chromium.sh
# Start xvfb for local Chrome used for testing
if [[ ${TRAVIS} ]]; then
travisFoldStart "install-chromium.xvfb-start"
sh -e /etc/init.d/xvfb start
travisFoldEnd "install-chromium.xvfb-start"
fi
)
travisFoldEnd "install-chromium"
fi

7
scripts/ci/test-aio-e2e.sh
View File

@ -11,13 +11,6 @@ source ${thisDir}/_travis-fold.sh
(
cd ${PROJECT_ROOT}/aio
# Start xvfb for local Chrome used for testing
if [[ ${TRAVIS} ]]; then
travisFoldStart "test.aio.xvfb-start"
sh -e /etc/init.d/xvfb start
travisFoldEnd "test.aio.xvfb-start"
fi
# Run example e2e tests
travisFoldStart "test.aio.example-e2e"
yarn example-e2e -- --setup

8
scripts/ci/test-aio.sh
View File

@ -18,14 +18,6 @@ source ${thisDir}/_travis-fold.sh
travisFoldEnd "test.aio.lint"
# Start xvfb for local Chrome used for testing
if [[ ${TRAVIS} ]]; then
travisFoldStart "test.aio.xvfb-start"
sh -e /etc/init.d/xvfb start
travisFoldEnd "test.aio.xvfb-start"
fi
# Run unit tests
travisFoldStart "test.aio.unit"
yarn test -- --single-run

7
scripts/ci/test-e2e-2.sh
View File

@ -14,13 +14,6 @@ travisFoldStart "test.e2e.buildPackages"
travisFoldEnd "test.e2e.buildPackages"
if [[ ${TRAVIS:-} ]]; then
travisFoldStart "test.e2e.xvfb-start"
sh -e /etc/init.d/xvfb start
travisFoldEnd "test.e2e.xvfb-start"
fi
travisFoldStart "test.e2e.integration"
./integration/run_tests.sh
travisFoldEnd "test.e2e.integration"

6
scripts/ci/test-e2e.sh
View File

@ -14,12 +14,6 @@ travisFoldStart "test.e2e.buildPackages"
travisFoldEnd "test.e2e.buildPackages"
if [[ ${TRAVIS:-} ]]; then
travisFoldStart "test.e2e.xvfb-start"
sh -e /etc/init.d/xvfb start
travisFoldEnd "test.e2e.xvfb-start"
fi
travisFoldStart "test.e2e.publicApi"
$(npm bin)/gulp public-api:enforce
travisFoldEnd "test.e2e.publicApi"

7
scripts/ci/test-js.sh
View File

@ -35,13 +35,6 @@ travisFoldStart "test.unit.rebuildHack"
travisFoldStart "test.unit.rebuildHack"
if [[ ${TRAVIS} ]]; then
travisFoldStart "test.unit.xvfb-start"
sh -e /etc/init.d/xvfb start
travisFoldEnd "test.unit.xvfb-start"
fi
travisFoldStart "test.unit.localChrome"
$(npm bin)/karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS}
travisFoldEnd "test.unit.localChrome"