parent
a1e91b00d2
commit
4b1251106e
|
@ -36,7 +36,7 @@ var_4: &init_environment
|
||||||
# Overwrite the yarn installed in the docker container with our own version.
|
# Overwrite the yarn installed in the docker container with our own version.
|
||||||
command: |
|
command: |
|
||||||
./.circleci/env.sh
|
./.circleci/env.sh
|
||||||
ourYarn=$(realpath ./third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/bin/yarn.js)
|
ourYarn=$(realpath ./third_party/github.com/yarnpkg/yarn/releases/download/v1.17.3/bin/yarn.js)
|
||||||
sudo chmod a+x $ourYarn
|
sudo chmod a+x $ourYarn
|
||||||
sudo ln -fs $ourYarn /usr/local/bin/yarn
|
sudo ln -fs $ourYarn /usr/local/bin/yarn
|
||||||
echo "Yarn version: $(yarn --version)"
|
echo "Yarn version: $(yarn --version)"
|
||||||
|
|
|
@ -65,6 +65,9 @@ node_repositories(
|
||||||
},
|
},
|
||||||
node_version = "10.16.0",
|
node_version = "10.16.0",
|
||||||
package_json = ["//:package.json"],
|
package_json = ["//:package.json"],
|
||||||
|
yarn_repositories = {
|
||||||
|
"1.17.3": ("yarn-v1.17.3.tar.gz", "yarn-v1.17.3", "e3835194409f1b3afa1c62ca82f561f1c29d26580c9e220c36866317e043c6f3"),
|
||||||
|
},
|
||||||
# yarn 1.13.0 under Bazel has a regression on Windows that causes build errors on rebuilds:
|
# yarn 1.13.0 under Bazel has a regression on Windows that causes build errors on rebuilds:
|
||||||
# ```
|
# ```
|
||||||
# ERROR: Source forest creation failed: C:/.../fyuc5c3n/execroot/angular/external (Directory not empty)
|
# ERROR: Source forest creation failed: C:/.../fyuc5c3n/execroot/angular/external (Directory not empty)
|
||||||
|
@ -73,7 +76,7 @@ node_repositories(
|
||||||
# It possible that versions of yarn past 1.13.0 do not have this issue, however, before
|
# It possible that versions of yarn past 1.13.0 do not have this issue, however, before
|
||||||
# advancing this version we need to test manually on Windows that the above error does not
|
# advancing this version we need to test manually on Windows that the above error does not
|
||||||
# happen as the issue is not caught by CI.
|
# happen as the issue is not caught by CI.
|
||||||
yarn_version = "1.12.1",
|
yarn_version = "1.17.3",
|
||||||
)
|
)
|
||||||
|
|
||||||
yarn_install(
|
yarn_install(
|
||||||
|
|
|
@ -80,7 +80,7 @@
|
||||||
"//engines-comment": "Keep this in sync with ../package.json",
|
"//engines-comment": "Keep this in sync with ../package.json",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.9.0 <13.0.0",
|
"node": ">=10.9.0 <13.0.0",
|
||||||
"yarn": ">=1.12.1 <=1.18.0"
|
"yarn": ">=1.17.3 <=1.18.0"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.9.0 <11.0.0",
|
"node": ">=10.9.0 <11.0.0",
|
||||||
"yarn": ">=1.12.1 <=1.16.0"
|
"yarn": ">=1.17.3 <=1.18.0"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
"//engines-comment": "Keep this in sync with aio/package.json",
|
"//engines-comment": "Keep this in sync with aio/package.json",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.9.0 <13.0.0",
|
"node": ">=10.9.0 <13.0.0",
|
||||||
"yarn": ">=1.12.1 <=1.18.0"
|
"yarn": ">=1.17.3 <=1.18.0"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue