Merge branch 'main' into patch-3 · m2web/docs@f0c9deb · GitHub
Skip to content

Commit f0c9deb

Browse files
mikesurowiecmikesurowiec
authored
Merge branch 'main' into patch-3
2 parents a44f103 + b9acf54 commit f0c9deb

74 files changed

Lines changed: 152 additions & 149 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/staging-deploy-pr.yml‎

Lines changed: 2 additions & 1 deletion

‎.github/workflows/staging-undeploy-pr.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
permissions:
1313
contents: read
1414
deployments: write
15+
pull-requests: write
1516

1617
# This prevents one Undeploy workflow run from interrupting another
1718
concurrency:
@@ -42,6 +43,7 @@ jobs:
4243
echo 'Cancelling other deployment runs (if any)...'
4344
4445
undeploy:
46+
needs: cancel-jobs-before-undeploy
4547
if: ${{ github.repository == 'github/docs-internal' || github.repository == 'github/docs' }}
4648
runs-on: ubuntu-latest
4749
timeout-minutes: 5
@@ -50,9 +52,9 @@ jobs:
5052
- name: Add a label to the PR to block deployment during undeployment
5153
env:
5254
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53-
PR_NUMBER: ${{ github.event.pull_request.number }}
55+
PR_URL: ${{ github.event.pull_request.html_url }}
5456
run: |
55-
gh pr edit $PR_NUMBER --add-label "automated-block-deploy"
57+
gh pr edit "$PR_URL" --add-label "automated-block-deploy"
5658
5759
- name: Check out repo's default branch
5860
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -119,9 +121,9 @@ jobs:
119121
name: Remove the label from the PR to unblock deployment
120122
env:
121123
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122-
PR_NUMBER: ${{ github.event.pull_request.number }}
124+
PR_URL: ${{ github.event.pull_request.html_url }}
123125
run: |
124-
gh pr edit $PR_NUMBER --remove-label "automated-block-deploy"
126+
gh pr edit "$PR_URL" --remove-label "automated-block-deploy"
125127
126128
- name: Send Slack notification if workflow failed
127129
uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd

‎lib/search/indexes/github-docs-2.22-cn-records.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7fddf4c7faf6c930bf0e378a1ffcc9bfef95449c1d863b7143091bf1c960cd41
3-
size 525387
2+
oid sha256:cbb2d80d35e5e85dfa53a3833fec3f1ca8bf3ef878169f5e396bb185c757a2d7
3+
size 525507

‎lib/search/indexes/github-docs-2.22-cn.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:6cdba924672d13a96e72c94d0b655f2da4f5db0d43a0ea2fa1405f6b42ccc19a
3-
size 868817
2+
oid sha256:a9f36dd4cecb6f5adb3664aba8b2cf9998ad5e7c135303ab74aeb3ed47e37fba
3+
size 868782

‎lib/search/indexes/github-docs-2.22-de-records.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f8031aa7987254c33af030664ead0eb1c3e50fc6fcff27a5ca4f292ba67cbb50
3-
size 479354
2+
oid sha256:0e4989aa501e78a09769a574be8cd3350f7635c8ec335967b3019d7718fc10e2
3+
size 479365

‎lib/search/indexes/github-docs-2.22-de.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b99f605bc49ee1b3a25628af635843f16e7977a73e52390bc313acd016c7bde5
3-
size 2127018
2+
oid sha256:3fa235aa73771f6bbb01e7e5a2fb54e1c1e8fbcd30c3f96b5bd04767727d902c
3+
size 2127939

‎lib/search/indexes/github-docs-2.22-en-records.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1af5ed92b5d28760746f716ae1cb30744cc31fa11e4fbac972165224d7569c00
3-
size 433209
2+
oid sha256:222bce107edf6d1ae5c710c45d7f940b6b030cec155c56092ab2043879e7dca5
3+
size 433344

‎lib/search/indexes/github-docs-2.22-en.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:0f74a2f4c99b8b8c12d08e13664063fb5127ed5eafee4172d24339a4420e4ea4
3-
size 1691908
2+
oid sha256:6f4609be9fd8ca8cbefec201010f5ecbb3a5b4d2a85d72c68b5cc892a44dd8a4
3+
size 1692349

‎lib/search/indexes/github-docs-2.22-es-records.json.br‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:684ae2ed9ff94f290a37483b01392248ecad74c82a2cdb0a3d310248a81b003e
3-
size 194966
2+
oid sha256:d08fd927b6a9565cb760d941e31af2ced02569a13d086d15c862fd78264dd450
3+
size 195205

‎lib/search/indexes/github-docs-2.22-es.json.br‎

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)