Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 139a381

Browse files
committed
chore: update CircleCI NodeJS image and build-tools orb
- set user.name and user.email git config for rebase
1 parent 47897e6 commit 139a381

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

.circleci/config.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# To validate changes, use an online parser, eg. http://yaml-online-parser.appspot.com/
88

99
# Find the latest version here: https://github.com/CircleCI-Public/circleci-dockerfiles/tree/master/node/images
10-
var_1: &docker_image circleci/node:14.15.1-browsers
10+
var_1: &docker_image circleci/node:14.16.1-browsers
1111
var_2: &cache_key angularjs-material-{{ checksum "package-lock.json" }}
1212

1313
# Settings common to each job
@@ -60,7 +60,7 @@ var_9: &publish_branches_filter
6060
version: 2.1
6161

6262
orbs:
63-
build-tools: circleci/build-tools@2.7.0
63+
build-tools: circleci/build-tools@2.9.0
6464

6565
commands:
6666
# Command for checking out the source code from GitHub. This also ensures that the source code
@@ -69,6 +69,12 @@ commands:
6969
description: Checkout and verify clean merge with master
7070
steps:
7171
- checkout
72+
- run:
73+
name: Set git user.name and user.email for rebase.
74+
# User is required for rebase.
75+
command: |
76+
git config user.name "angular-ci"
77+
git config user.email "angular-ci"
7278
- build-tools/merge-with-parent:
7379
parent: master
7480

0 commit comments

Comments
 (0)