ci: upgrade to node 8 and Bazel 0.8 (#20807)
Closes #19648 PR Close #20807
This commit is contained in:
parent
7cabaa0ae7
commit
6790e02a13
@ -11,7 +11,7 @@
|
|||||||
anchor_1: &job_defaults
|
anchor_1: &job_defaults
|
||||||
working_directory: ~/ng
|
working_directory: ~/ng
|
||||||
docker:
|
docker:
|
||||||
- image: angular/ngcontainer:0.0.2
|
- image: angular/ngcontainer:0.0.6
|
||||||
|
|
||||||
# After checkout, rebase on top of master.
|
# After checkout, rebase on top of master.
|
||||||
# Similar to travis behavior, but not quite the same.
|
# Similar to travis behavior, but not quite the same.
|
||||||
@ -39,7 +39,7 @@ jobs:
|
|||||||
<<: *post_checkout
|
<<: *post_checkout
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
key: angular-{{ .Branch }}-{{ checksum "yarn.lock" }}
|
key: angular-{{ .Branch }}-{{ checksum "yarn.lock" }}
|
||||||
|
- run: bazel info release
|
||||||
- run: bazel run @yarn//:yarn
|
- run: bazel run @yarn//:yarn
|
||||||
- run: bazel build packages/...
|
- run: bazel build packages/...
|
||||||
- run: bazel test @angular//...
|
- run: bazel test @angular//...
|
||||||
|
@ -2,7 +2,7 @@ language: node_js
|
|||||||
sudo: false
|
sudo: false
|
||||||
dist: trusty
|
dist: trusty
|
||||||
node_js:
|
node_js:
|
||||||
- '6.9.5'
|
- '8.9.1'
|
||||||
|
|
||||||
addons:
|
addons:
|
||||||
# firefox: "38.0"
|
# firefox: "38.0"
|
||||||
|
@ -59,7 +59,7 @@
|
|||||||
"~~update-webdriver": "webdriver-manager update --standalone false --gecko false"
|
"~~update-webdriver": "webdriver-manager update --standalone false --gecko false"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.5 <7.0.0",
|
"node": ">=8.9.1 <9.0.0",
|
||||||
"yarn": ">=1.0.2 <2.0.0"
|
"yarn": ">=1.0.2 <2.0.0"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
|
@ -22,7 +22,7 @@ local_repository(
|
|||||||
git_repository(
|
git_repository(
|
||||||
name = "io_bazel_rules_sass",
|
name = "io_bazel_rules_sass",
|
||||||
remote = "https://github.com/bazelbuild/rules_sass.git",
|
remote = "https://github.com/bazelbuild/rules_sass.git",
|
||||||
tag = "0.0.2",
|
tag = "0.0.3",
|
||||||
)
|
)
|
||||||
|
|
||||||
load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
|
load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
|
||||||
|
@ -20,6 +20,6 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"postinstall": "ngc -p angular.tsconfig.json",
|
"postinstall": "ngc -p angular.tsconfig.json",
|
||||||
"test": "bazel build ..."
|
"test": "bazel build ... --noshow_progress"
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -8,8 +8,7 @@
|
|||||||
"bugs": "https://github.com/angular/angular/issues",
|
"bugs": "https://github.com/angular/angular/issues",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.5 <7.0.0",
|
"node": ">=8.9.1 <9.0.0",
|
||||||
"npm": ">=3.10.7 <4.0.0",
|
|
||||||
"yarn": ">=1.0.2 <2.0.0"
|
"yarn": ">=1.0.2 <2.0.0"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
|
@ -163,7 +163,7 @@ describe('ngc transformer command-line', () => {
|
|||||||
const exitCode = main(['-p', 'not-exist'], errorSpy);
|
const exitCode = main(['-p', 'not-exist'], errorSpy);
|
||||||
expect(errorSpy).toHaveBeenCalledTimes(1);
|
expect(errorSpy).toHaveBeenCalledTimes(1);
|
||||||
expect(errorSpy.calls.mostRecent().args[0]).toContain('no such file or directory');
|
expect(errorSpy.calls.mostRecent().args[0]).toContain('no such file or directory');
|
||||||
expect(errorSpy.calls.mostRecent().args[0]).toContain('at Error (native)');
|
expect(errorSpy.calls.mostRecent().args[0]).toContain('at Object.fs.lstatSync');
|
||||||
expect(exitCode).toEqual(2);
|
expect(exitCode).toEqual(2);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -34,10 +34,10 @@ fi
|
|||||||
# CUSTOM GLOBALS #
|
# CUSTOM GLOBALS #
|
||||||
#######################
|
#######################
|
||||||
|
|
||||||
setEnvVar NODE_VERSION 6.9.5
|
setEnvVar NODE_VERSION 8.9.1
|
||||||
setEnvVar YARN_VERSION 1.0.2
|
setEnvVar YARN_VERSION 1.0.2
|
||||||
setEnvVar CHROMIUM_VERSION 499098 # Chrome 62 linux stable, see https://www.chromium.org/developers/calendar
|
setEnvVar CHROMIUM_VERSION 499098 # Chrome 62 linux stable, see https://www.chromium.org/developers/calendar
|
||||||
setEnvVar BAZEL_VERSION 0.5.4
|
setEnvVar BAZEL_VERSION 0.8.1
|
||||||
setEnvVar SAUCE_CONNECT_VERSION 4.4.9
|
setEnvVar SAUCE_CONNECT_VERSION 4.4.9
|
||||||
setEnvVar ANGULAR_CLI_VERSION 1.5.0-rc.2
|
setEnvVar ANGULAR_CLI_VERSION 1.5.0-rc.2
|
||||||
setEnvVar PROJECT_ROOT $(cd ${thisDir}/../..; pwd)
|
setEnvVar PROJECT_ROOT $(cd ${thisDir}/../..; pwd)
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
set -u -e -o pipefail
|
set -u -e -o pipefail
|
||||||
|
|
||||||
|
# npm 5 symlinks from local file installations rather than copying files, but
|
||||||
# These ones can be `npm link`ed for fast development
|
# webpack will not follow the symlinks.
|
||||||
LINKABLE_PKGS=(
|
# We prefer to emulate how a user will install angular, so we `npm pack` the
|
||||||
$(pwd)/dist/packages-dist/{common,forms,core,compiler,compiler-cli,platform-{browser,server},platform-browser-dynamic,router,http,animations}
|
# packages, then install them from the resulting .tgz files later.
|
||||||
)
|
ANGULAR_PKGS=$(npm pack dist/packages-dist/{common,forms,core,compiler,compiler-cli,platform-{browser,server},platform-browser-dynamic,router,http,animations} | awk "{ printf \"$PWD/\"; print }")
|
||||||
|
|
||||||
TYPESCRIPT_2_4=typescript@2.4.x
|
TYPESCRIPT_2_4=typescript@2.4.x
|
||||||
PKGS=(
|
PKGS=(
|
||||||
@ -34,8 +34,7 @@ cp -v package.json $TMP
|
|||||||
cd $TMP
|
cd $TMP
|
||||||
set -ex -o pipefail
|
set -ex -o pipefail
|
||||||
npm install ${PKGS[*]} $TYPESCRIPT_2_4
|
npm install ${PKGS[*]} $TYPESCRIPT_2_4
|
||||||
# TODO(alexeagle): allow this to be npm link instead
|
npm install ${ANGULAR_PKGS[*]}
|
||||||
npm install ${LINKABLE_PKGS[*]}
|
|
||||||
|
|
||||||
./node_modules/.bin/tsc --version
|
./node_modules/.bin/tsc --version
|
||||||
# Compile the compiler-cli third_party simulation.
|
# Compile the compiler-cli third_party simulation.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user