Skip to content

Commit 02cfde7

Browse files
authored
Merge branch 'main' into prerender-gql-input-objects
2 parents 9185eb3 + d46428d commit 02cfde7

File tree

2,640 files changed

+60330
-4131
lines changed

Some content is hidden

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

2,640 files changed

+60330
-4131
lines changed

.github/allowed-actions.js

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ module.exports = [
2020
"cschleiden/actions-linter@0ff16d6ac5103cca6c92e6cbc922b646baaea5be",
2121
"dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911",
2222
"docker://chinthakagodawita/autoupdate-action:v1",
23-
"fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289",
2423
"github/codeql-action/analyze@v1",
2524
"github/codeql-action/init@v1",
2625
"juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8",

.github/workflows/browser-test.yml

+4-22
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,26 @@ on:
1212
pull_request:
1313

1414
jobs:
15-
see_if_should_skip:
16-
continue-on-error: true
17-
runs-on: ubuntu-latest
18-
# Map a step output to a job output
19-
outputs:
20-
should_skip: ${{ steps.skip_check.outputs.should_skip }}
21-
steps:
22-
- id: skip_check
23-
uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289
24-
with:
25-
cancel_others: 'false'
26-
github_token: ${{ github.token }}
27-
paths: '[".github/workflows/browser-test.yml","assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
2815
build:
29-
needs: see_if_should_skip
3016
runs-on: ubuntu-latest
3117
steps:
3218
# Each of these ifs needs to be repeated at each step to make sure the required check still runs
3319
# Even if if doesn't do anything
34-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
35-
name: Checkout
20+
- name: Checkout
3621
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
3722

38-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
39-
name: Setup Node
23+
- name: Setup Node
4024
uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e
4125
with:
4226
node-version: 14.x
4327

44-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
45-
name: Install
28+
- name: Install
4629
uses: rachmari/puppeteer-container@6d56d6e132a3df76cf60bc290a4282f7fbaed05e
4730
timeout-minutes: 5
4831
with:
4932
args: npm ci
5033

51-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
52-
name: Test
34+
- name: Test
5335
timeout-minutes: 10
5436
uses: rachmari/puppeteer-container@6d56d6e132a3df76cf60bc290a4282f7fbaed05e
5537
with:

.github/workflows/close-external-repo-sync-prs.yml

-65
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
check-team-membership:
1818
runs-on: ubuntu-latest
1919
continue-on-error: true
20-
if: github.repository == 'github/docs'
20+
if: github.repository == 'github/docs' && github.actor != 'docs-bot'
2121
steps:
2222
- id: membership_check
2323
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9

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

+5-32
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,26 @@ on:
1212
pull_request:
1313

1414
jobs:
15-
see_if_should_skip:
16-
continue-on-error: true
17-
runs-on: ubuntu-latest
18-
# Map a step output to a job output
19-
outputs:
20-
should_skip: ${{ steps.skip_check.outputs.should_skip }}
21-
steps:
22-
- id: skip_check
23-
uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289
24-
with:
25-
cancel_others: 'false'
26-
github_token: ${{ github.token }}
27-
paths: '[".github/workflows/link-check-dotcom.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
2815
build:
29-
needs: see_if_should_skip
3016
runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
3117
steps:
3218
# Each of these ifs needs to be repeated at each step to make sure the required check still runs
3319
# Even if if doesn't do anything
34-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
35-
name: Checkout
20+
- name: Checkout
3621
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
3722

38-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
39-
name: Setup node
23+
- name: Setup node
4024
uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e
4125
with:
4226
node-version: 14.x
4327

44-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
45-
name: Install
28+
- name: Install
4629
run: npm ci
4730

48-
## TODO
49-
# - if: ${{ github.repository == 'github/docs-internal' && needs.see_if_should_skip.outputs.should_skip != 'true' }}
50-
# name: Clone early access
51-
# run: npm run heroku-postbuild
52-
# env:
53-
# DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
54-
# GIT_BRANCH: ${{ github.head_ref || github.ref }}
55-
56-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
57-
name: Build
31+
- name: Build
5832
run: npm run build
5933

60-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
61-
name: 'Link check: Dotcom'
34+
- name: 'Link check: Dotcom'
6235
env:
6336
DOCS_VERSION: 'dotcom'
6437
run: npm run link-check

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

+5-32
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,26 @@ on:
1212
pull_request:
1313

1414
jobs:
15-
see_if_should_skip:
16-
continue-on-error: true
17-
runs-on: ubuntu-latest
18-
# Map a step output to a job output
19-
outputs:
20-
should_skip: ${{ steps.skip_check.outputs.should_skip }}
21-
steps:
22-
- id: skip_check
23-
uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289
24-
with:
25-
cancel_others: 'false'
26-
github_token: ${{ github.token }}
27-
paths: '[".github/workflows/link-check-ghae.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
2815
build:
29-
needs: see_if_should_skip
3016
runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
3117
steps:
3218
# Each of these ifs needs to be repeated at each step to make sure the required check still runs
3319
# Even if if doesn't do anything
34-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
35-
name: Checkout
20+
- name: Checkout
3621
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
3722

38-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
39-
name: Setup node
23+
- name: Setup node
4024
uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e
4125
with:
4226
node-version: 14.x
4327

44-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
45-
name: Install
28+
- name: Install
4629
run: npm ci
4730

48-
## TODO
49-
# - if: ${{ github.repository == 'github/docs-internal' && needs.see_if_should_skip.outputs.should_skip != 'true' }}
50-
# name: Clone early access
51-
# run: npm run heroku-postbuild
52-
# env:
53-
# DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
54-
# GIT_BRANCH: ${{ github.head_ref || github.ref }}
55-
56-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
57-
name: Build
31+
- name: Build
5832
run: npm run build
5933

60-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
61-
name: 'Link check: GitHub AE'
34+
- name: 'Link check: GitHub AE'
6235
env:
6336
DOCS_VERSION: 'github-ae'
6437
run: npm run link-check

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

+5-32
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,26 @@ on:
1212
pull_request:
1313

1414
jobs:
15-
see_if_should_skip:
16-
continue-on-error: true
17-
runs-on: ubuntu-latest
18-
# Map a step output to a job output
19-
outputs:
20-
should_skip: ${{ steps.skip_check.outputs.should_skip }}
21-
steps:
22-
- id: skip_check
23-
uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289
24-
with:
25-
cancel_others: 'false'
26-
github_token: ${{ github.token }}
27-
paths: '[".github/workflows/link-check-ghes.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
2815
build:
29-
needs: see_if_should_skip
3016
runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
3117
steps:
3218
# Each of these ifs needs to be repeated at each step to make sure the required check still runs
3319
# Even if if doesn't do anything
34-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
35-
name: Checkout
20+
- name: Checkout
3621
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
3722

38-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
39-
name: Setup node
23+
- name: Setup node
4024
uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e
4125
with:
4226
node-version: 14.x
4327

44-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
45-
name: Install
28+
- name: Install
4629
run: npm ci
4730

48-
## TODO
49-
# - if: ${{ github.repository == 'github/docs-internal' && needs.see_if_should_skip.outputs.should_skip != 'true' }}
50-
# name: Clone early access
51-
# run: npm run heroku-postbuild
52-
# env:
53-
# DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
54-
# GIT_BRANCH: ${{ github.head_ref || github.ref }}
55-
56-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
57-
name: Build
31+
- name: Build
5832
run: npm run build
5933

60-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
61-
name: 'Link check: Enterprise Server'
34+
- name: 'Link check: Enterprise Server'
6235
env:
6336
DOCS_VERSION: 'enterprise-server'
6437
run: npm run link-check
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Move Reopened Issues to Triage
2+
3+
# **What it does**: Moves issues that are reopened from the Done column to the Triage column.
4+
# **Why we have it**: To prevent having to do this manually.
5+
# **Who does it impact**: Open-source.
6+
7+
on:
8+
issues:
9+
types:
10+
- reopened
11+
12+
jobs:
13+
move-reopened-issue-to-triage:
14+
if: github.repository == 'github/docs'
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
18+
with:
19+
github-token: ${{ github.token }}
20+
script: |
21+
const issueNumber = context.issue.number;
22+
const doneColumnId = 11167427;
23+
const triageColumnId = 11007039;
24+
25+
try {
26+
const cards = await github.projects.listCards({
27+
column_id: doneColumnId
28+
});
29+
30+
for (const card of cards) {
31+
if (card.content_url.endsWith(`/${issueNumber}`)) {
32+
await github.projects.moveCard({
33+
card_id: card.id,
34+
position: 'position',
35+
column_id: triageColumnId
36+
});
37+
}
38+
}
39+
} catch(e) {
40+
console.log(error);
41+
}

0 commit comments

Comments
 (0)