Skip to content

Commit 44a3bcd

Browse files
authored
Merge branch 'main' into update_docs_to_match_issue_template_checkbox_impl
2 parents ae61b99 + 0f5787b commit 44a3bcd

File tree

477 files changed

+4722
-3757
lines changed

Some content is hidden

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

477 files changed

+4722
-3757
lines changed

.dockerignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.git/
2+
node_modules/
3+
.github/
4+
.vscode/
5+
docs/
6+
script/

.github/workflows/automerge-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
6969
# Because we get far too much spam ;_;
7070
- name: Lock conversations
71-
uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
71+
uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
7272
env:
7373
PR_NUMBER: ${{ github.event.pull_request.number }}
7474
with:

.github/workflows/check-for-spammy-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.repository == 'github/docs'
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
20+
- uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
2121
with:
2222
github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
2323
script: |

.github/workflows/confirm-internal-staff-work-in-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
if: github.repository == 'github/docs' && github.actor != 'docs-bot'
2424
steps:
2525
- id: membership_check
26-
uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
26+
uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
2727
env:
2828
TEAM_CONTENT_REPO: ${{ secrets.TEAM_CONTENT_REPO }}
2929
with:

.github/workflows/copy-api-issue-to-internal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: (github.event.label.name == 'rest-description' || github.event.label.name == 'graphql-description') && github.repository == 'github/docs'
2020
steps:
2121
- name: Check if this run was triggered by a member of the docs team
22-
uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
22+
uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
2323
id: triggered-by-member
2424
with:
2525
github-token: ${{secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES}}

.github/workflows/first-responder-docs-content.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Check if the event originated from a team member
27-
uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
27+
uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
2828
id: set-result
2929
with:
3030
github-token: ${{secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES}}
@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: Remove card from project
74-
uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
74+
uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
7575
with:
7676
github-token: ${{secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES}}
7777
result-encoding: string

.github/workflows/hubber-contribution-help.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- id: membership_check
24-
uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
24+
uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
2525
with:
2626
github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
2727
script: |

.github/workflows/link-check-dotcom.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/link-check-ghae.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/link-check-ghec.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.github/workflows/link-check-ghes.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Build and Push Main Docker Cache
2+
3+
# **What it does**: Builds and pushes the `main` Docker cache image
4+
# **Why we have it**: It allows PRs using the registry cache to pull a pre-built image, which should speed up the build
5+
# **Who does it impact**: All contributors.
6+
7+
on:
8+
push:
9+
branches:
10+
- main
11+
12+
permissions:
13+
contents: read
14+
15+
# This allows a subsequently queued workflow run to take priority over
16+
# previously queued runs and interrupt currently executing runs
17+
concurrency:
18+
group: '${{ github.workflow }}'
19+
cancel-in-progress: true
20+
21+
jobs:
22+
build-and-push-nonprod-cache:
23+
runs-on: ubuntu-latest
24+
timeout-minutes: 15
25+
env:
26+
NONPROD_REGISTRY_USERNAME: ghdocs
27+
NONPROD_REGISTRY_NAME: ghdocs
28+
DOCKER_IMAGE_MAIN_REF: ${{ secrets.NONPROD_REGISTRY_SERVER }}/${{ github.repository }}:main
29+
30+
steps:
31+
- name: 'Az CLI login'
32+
uses: azure/login@66d2e78565ab7af265d2b627085bc34c73ce6abb
33+
with:
34+
creds: ${{ secrets.NONPROD_AZURE_CREDENTIALS }}
35+
36+
- name: 'Docker login'
37+
uses: azure/docker-login@81744f9799e7eaa418697cb168452a2882ae844a
38+
with:
39+
login-server: ${{ secrets.NONPROD_REGISTRY_SERVER }}
40+
username: ${{ env.NONPROD_REGISTRY_USERNAME }}
41+
password: ${{ secrets.NONPROD_REGISTRY_PASSWORD }}
42+
43+
- name: Set up Docker Buildx
44+
uses: docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25
45+
46+
- name: Check out repo
47+
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
48+
with:
49+
# To prevent issues with cloning early access content later
50+
persist-credentials: 'false'
51+
lfs: 'true'
52+
53+
- name: Check out LFS objects
54+
run: git lfs checkout
55+
56+
- if: ${{ github.repository == 'github/docs-internal' }}
57+
name: Clone early access
58+
env:
59+
DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
60+
GIT_BRANCH: main
61+
run: npm install dotenv && node script/early-access/clone-for-build.js
62+
63+
- name: 'Build and push image'
64+
uses: docker/build-push-action@a66e35b9cbcf4ad0ea91ffcaf7bbad63ad9e0229
65+
with:
66+
context: .
67+
push: true
68+
target: ${{ fromJSON('["production", "production_early_access"]')[github.repository == 'github/docs-internal'] }}
69+
tags: ${{ env.DOCKER_IMAGE_MAIN_REF }}
70+
cache-from: type=registry,ref=${{ env.DOCKER_IMAGE_MAIN_REF }}
71+
cache-to: type=registry,mode=max,ref=${{ env.DOCKER_IMAGE_MAIN_REF }}

.github/workflows/merged-notification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: github.repository == 'github/docs' && github.event.pull_request.merged && github.event.pull_request.base.ref == github.event.repository.default_branch && github.event.pull_request.user.login != 'Octomerger'
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
21+
- uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
2222
with:
2323
script: |
2424
github.issues.createComment({

.github/workflows/move-existing-issues-to-the-correct-repo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- id: move_to_correct_repo
18-
uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
18+
uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
1919
env:
2020
TEAM_ENGINEERING_REPO: ${{ secrets.TEAM_ENGINEERING_REPO }}
2121
TEAM_CONTENT_REPO: ${{ secrets.TEAM_CONTENT_REPO }}

.github/workflows/move-new-issues-to-correct-docs-repo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: github.repository == 'github/docs-internal'
2222
steps:
2323
- id: move_to_correct_repo
24-
uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
24+
uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
2525
env:
2626
TEAM_ENGINEERING_REPO: ${{ secrets.TEAM_ENGINEERING_REPO }}
2727
TEAM_CONTENT_REPO: ${{ secrets.TEAM_CONTENT_REPO }}

.github/workflows/move-reopened-issues-to-triage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.repository == 'github/docs'
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
20+
- uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
2121
with:
2222
script: |
2323
const issueNumber = context.issue.number;

.github/workflows/notify-when-maintainers-cannot-edit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.repository == 'github/docs'
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/github-script@e3cbab99d3a9b271e1b79fc96d103a4a5534998c
20+
- uses: actions/github-script@2b34a689ec86a68d8ab9478298f91d5401337b7d
2121
with:
2222
script: |
2323
const query = `

.github/workflows/openapi-schema-check.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ on:
2121
paths:
2222
- 'lib/rest/static/**'
2323
- 'script/rest/**/*.js'
24+
- 'script/rest/**/*.json'
2425
- 'package*.json'
26+
- 'lib/redirects/static/**/*.json'
2527

2628
permissions:
2729
contents: read

0 commit comments

Comments
 (0)