Skip to content

Commit dbed54c

Browse files
committed
chore(*): clean up package.json and CircleCI config
This is a follow-up to angular#16915, cleaning up `package.json` and `.circleci/config.yml` and making release scripts executable.
1 parent 3c75a89 commit dbed54c

File tree

7 files changed

+13
-430
lines changed

7 files changed

+13
-430
lines changed

.circleci/config.yml

+6-63
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Configuration file for https://circleci.com/gh/angular/angular
1+
# Configuration file for https://circleci.com/gh/angular/angular.js
22

33
# Note: YAML anchors allow an object to be re-used, reducing duplication.
44
# The ampersand declares an alias for an object, then later the `<<: *name`
@@ -12,55 +12,24 @@
1212
# https://circleci.com/docs/2.0/reusing-config/#getting-started-with-config-reuse
1313
version: 2.1
1414

15-
# Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
16-
# `build-ivy-npm-packages`.
17-
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
18-
# https://circleci.com/blog/deep-diving-into-circleci-workspaces/
19-
var_workspace_location: &workspace_location ~/
20-
21-
# Filter to run a job on builds for pull requests only.
22-
var_only_on_pull_requests: &only_on_pull_requests
23-
filters:
24-
branches:
25-
only:
26-
- /pull\/\d+/
27-
28-
# Filter to skip a job on builds for pull requests.
29-
var_skip_on_pull_requests: &skip_on_pull_requests
30-
filters:
31-
branches:
32-
ignore:
33-
- /pull\/\d+/
34-
35-
# Filter to run a job on builds for the master branch only.
36-
var_only_on_master: &only_on_master
37-
filters:
38-
branches:
39-
only:
40-
- master
41-
4215
# Executor Definitions
4316
# https://circleci.com/docs/2.0/reusing-config/#authoring-reusable-executors
4417
# **NOTE 1**: Pin to exact images using an ID (SHA). See https://circleci.com/docs/2.0/circleci-images/#using-a-docker-image-id-to-pin-an-image-to-a-fixed-version.
4518
# (Using the tag in not necessary when pinning by ID, but include it anyway for documentation purposes.)
46-
# **NOTE 2**: If you change the version of the docker images, also change the `cache_key` suffix.
47-
# **NOTE 3**: If you change the version of the `*-browsers` docker image, make sure the
48-
# `--versions.chrome` arg in `integration/bazel-schematics/test.sh` specifies a
49-
# ChromeDriver version that is compatible with the Chrome version in the image.
5019
executors:
5120
default-executor:
5221
parameters:
5322
resource_class:
5423
type: string
5524
default: medium
5625
docker:
57-
- image: circleci/node:12.16.3
26+
- image: circleci/node:12.16.3@sha256:8fe514dae7585bbee1c64bf5a6cd4dcdf393316b5c87565b47e31014872c8860
5827
resource_class: << parameters.resource_class >>
5928
working_directory: ~/ng
6029
cloud-sdk:
6130
description: The docker container to use when running gcp-gcs commands
6231
docker:
63-
- image: google/cloud-sdk:alpine
32+
- image: google/cloud-sdk:alpine@sha256:7d0cae28cb282b76f2d9babe278c63c910d54f0cceca7a65fdf6806e2b43882e
6433

6534

6635
# Command Definitions
@@ -72,31 +41,6 @@ commands:
7241
- attach_workspace:
7342
at: *workspace_location
7443

75-
# Install shared libs used by Chrome.
76-
install_chrome_libs:
77-
description: Install shared Chrome libs
78-
steps:
79-
- run:
80-
name: Install shared Chrome libs
81-
command: |
82-
sudo apt-get update
83-
# Install GTK+ graphical user interface (libgtk-3-0), advanced linux sound architecture (libasound2)
84-
# and network security service libraries (libnss3) & X11 Screen Saver extension library (libssx1)
85-
# which are dependendies of chrome & needed for karma & protractor headless chrome tests.
86-
# This is a very small install which takes around 7s in comparing to using the full
87-
# circleci/node:x.x.x-browsers image.
88-
sudo apt-get -y install libgtk-3-0 libasound2 libnss3 libxss1
89-
90-
install_java:
91-
description: Install java
92-
steps:
93-
- run:
94-
name: Install java
95-
command: |
96-
sudo apt-get update
97-
# Install java runtime
98-
sudo apt-get install default-jre
99-
10044
# Initializes the CI environment by setting up common environment variables.
10145
init_environment:
10246
description: Initializing environment (setting up variables)
@@ -117,7 +61,6 @@ commands:
11761
echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==' >> ~/.ssh/known_hosts
11862
git config --global url."ssh://[email protected]".insteadOf "https://github.com" || true
11963
git config --global gc.auto 0 || true
120-
- install_java
12164
12265
init_saucelabs_environment:
12366
description: Sets up a domain that resolves to the local host.
@@ -195,7 +138,7 @@ jobs:
195138
- run:
196139
name: Running Yarn install
197140
command: yarn install --frozen-lockfile --non-interactive
198-
# Yarn's requests sometimes take more than 10mins to complete.
141+
# Yarn's requests sometimes take more than 45mins to complete.
199142
no_output_timeout: 45m
200143
- run: yarn grunt package
201144
# Persist any changes at this point to be reused by further jobs.
@@ -210,8 +153,8 @@ jobs:
210153
steps:
211154
- custom_attach_workspace
212155
- init_environment
213-
- run: yarn -s grunt ci-checks
214-
- run: yarn commitplease "${CI_COMMIT_RANGE/.../..}"
156+
- run: yarn grunt ci-checks
157+
- run: yarn commitplease "$CI_COMMIT_RANGE"
215158
- run: yarn grunt validate-angular-files
216159

217160
unit-test:

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Before you submit your pull request consider the following guidelines:
125125
* Follow our [Coding Rules][developers.rules].
126126
* If the changes affect public APIs, change or add relevant [documentation][developers.documentation].
127127
* Run the AngularJS [unit][developers.tests-unit] and [E2E test][developers.tests-e2e] suites, and ensure that all tests
128-
pass. It is generally sufficient to run the tests only on Chrome, as our continous integration test will
128+
pass. It is generally sufficient to run the tests only on Chrome, as our continuous integration test will
129129
run the tests on additional browsers.
130130
* Run `yarn grunt eslint` to check that you have followed the automatically enforced coding rules
131131
* Commit your changes using a descriptive commit message that follows our
@@ -153,7 +153,7 @@ Before you submit your pull request consider the following guidelines:
153153
* In GitHub, send a pull request to `angular.js:master`. This will trigger the check of the
154154
[Contributor License Agreement](#cla) and the continuous integration tests.
155155

156-
* If you find that the continous integration tests have failed, look into the logs to find out
156+
* If you find that the continuous integration tests have failed, look into the logs to find out
157157
if your changes caused test failures, the commit message was malformed etc. If you find that the
158158
tests failed or times out for unrelated reasons, you can ping a team member so that the build can be
159159
restarted.

DEVELOPERS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ if it is enclosed in &lt;pre&gt;...&lt;/pre&gt; tags and the code lines themselv
428428
It is possible to embed examples in the documentation along with appropriate e2e tests. These
429429
examples and scenarios will be converted to runnable code within the documentation. So it is
430430
important that they work correctly. To ensure this, all these e2e scenarios are run as part of the
431-
continous integration tests.
431+
continuous integration tests.
432432

433433
If you are adding an example with an e2e test, you should [run the test locally](#e2e-tests) first
434434
to ensure it passes. You can change `it(...)` to `fit(...)` to run only your test,

package.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"dgeni-packages": "^0.26.5",
3636
"eslint-plugin-promise": "^3.6.0",
3737
"event-stream": "~3.1.0",
38+
"firebase-tools": "^8.3.0",
3839
"glob": "^6.0.1",
3940
"google-code-prettify": "1.0.1",
4041
"grunt": "^1.0.1",
@@ -99,11 +100,7 @@
99100
"sorted-object": "^1.0.0",
100101
"stringmap": "^0.2.2"
101102
},
102-
"dependencies": {
103-
"firebase": "^7.14.4",
104-
"firebase-tools": "^8.3.0",
105-
"node-glob": "^1.2.0"
106-
},
103+
"dependencies": {},
107104
"resolutions": {
108105
"//1": "`[email protected]` does not work with Node.js 10.x on Windows 10",
109106
"//2": "(E.g. see https://github.com/gulpjs/gulp/issues/2162 and https://github.com/nodejs/node/issues/25132.)",

scripts/release/release.sh

100644100755
File mode changed.

scripts/release/undo-release.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)