Skip to content

Commit 794bdd4

Browse files
authored
Merge branch 'main' into patch-1
2 parents a7e8ee7 + 8beda3e commit 794bdd4

File tree

682 files changed

+81885
-43790
lines changed

Some content is hidden

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

682 files changed

+81885
-43790
lines changed

.github/workflows/post-status-updates-to-slack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ jobs:
1919
id: notify
2020
with:
2121
slack-channel: 'C01EEKVR0Q7'
22-
slack-bot-user-oauth-access-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
22+
slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_TOKEN }}
2323
slack-text: \n><${{ github.event.comment.html_url}}|*${{github.event.issue.title}}*>\nstatus update posted by ${{github.event.comment.user.login}}\n\n${{ steps.trimmed.outputs.value }}

.github/workflows/repo-freeze-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Fail if repo merges are paused
25-
if: ${{ env.FREEZE == 'true' && github.ref != 'refs/heads/repo-sync' }}
25+
if: ${{ env.FREEZE == 'true' && github.head_ref != 'repo-sync' }}
2626
run: |
2727
echo 'Merges into the "main" branch on this repo are currently paused!'
2828
exit 1

.github/workflows/triage-pull-requests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
triage_pulls:
10-
if: github.repository == 'github/docs'
10+
if: github.repository != 'github/docs-internal'
1111
runs-on: ubuntu-latest
1212

1313
steps:

.github/workflows/update-graphql-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
If CI does not pass or other problems arise, contact #docs-engineering on slack."
5757
labels: automerge,autoupdate
5858
branch: graphql-schema-update
59-
- if: ${{ failure() }}
59+
- if: ${{ failure() && env.FREEZE != 'true'}}
6060
name: Delete remote branch (if previous steps failed)
6161
uses: dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911
6262
with:
61.4 KB
35.9 KB
42.3 KB
69.7 KB
60.9 KB
55.1 KB

0 commit comments

Comments
 (0)