Skip to content

Commit 1a2fb15

Browse files
committedFeb 28, 2024
Merge remote-tracking branch 'origin/foundation-2023' into release-33.x
2 parents 04822ec + aa769de commit 1a2fb15

File tree

6 files changed

+279
-201
lines changed

6 files changed

+279
-201
lines changed
 

‎.circleci/config.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,22 @@ parameters:
2929
setup: true
3030

3131
commands:
32-
shallow-clone:
33-
description: "Quick shallow checkout (if possible)"
34-
steps:
32+
setup-github:
33+
description: "Set Up Github SSH Access"
34+
steps:
3535
- run:
36-
name: git clone
3736
command: |
3837
install -d -m 700 ~/.ssh
3938
ssh-keyscan github.com >> ~/.ssh/known_hosts
4039
ssh-keyscan -p 443 ssh.github.com >> ~/.ssh/known_hosts
4140
chmod 600 ~/.ssh/known_hosts
41+
shallow-clone:
42+
description: "Quick shallow checkout (if possible)"
43+
steps:
44+
- setup-github
45+
- run:
46+
name: git clone
47+
command: |
4248
git clone --no-checkout --filter=tree:0 "${CIRCLE_REPOSITORY_URL}" .
4349
if [ -n "${CIRCLE_TAG}" ]; then
4450
git checkout --force "${CIRCLE_TAG}"

‎.circleci/main/commands/cache/cache.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
commands:
2-
shallow-clone:
3-
description: "Quick shallow checkout"
4-
steps:
2+
setup-github:
3+
description: "Set Up Github SSH Access"
4+
steps:
55
- run:
6-
name: git clone
76
command: |
87
install -d -m 700 ~/.ssh
98
ssh-keyscan github.com >> ~/.ssh/known_hosts
109
ssh-keyscan -p 443 ssh.github.com >> ~/.ssh/known_hosts
1110
chmod 600 ~/.ssh/known_hosts
11+
shallow-clone:
12+
description: "Quick shallow checkout"
13+
steps:
14+
- setup-github
15+
- run:
16+
name: git clone
17+
command: |
1218
git clone --no-checkout --filter=tree:0 "${CIRCLE_REPOSITORY_URL}" .
1319
if [ -n "${CIRCLE_TAG}" ]; then
1420
git checkout --force "${CIRCLE_TAG}"
@@ -23,6 +29,7 @@ commands:
2329
keys:
2430
- source-v4-{{ .Branch }}-{{ .Revision }}
2531
- source-v4-{{ .Branch }}-
32+
- setup-github
2633
- checkout
2734
- run:
2835
name: git config merge.renameLimit
@@ -42,6 +49,7 @@ commands:
4249
checkout-for-pushing:
4350
description: "Configure a cached checkout that can push upstream"
4451
steps:
52+
- setup-github
4553
- add_ssh_keys:
4654
fingerprints:
4755
- "66:9a:2d:a8:ad:7b:cc:7c:d2:ee:55:94:01:72:ac:2a"

0 commit comments

Comments
 (0)