Skip to content

Commit 5ea10fc

Browse files
authored
Merge branch 'main' into fix-css-class
2 parents b44d498 + 3a019df commit 5ea10fc

File tree

5,993 files changed

+45111
-8771
lines changed

Some content is hidden

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

5,993 files changed

+45111
-8771
lines changed

.github/allowed-actions.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@
44
// can be added it this list.
55

66
module.exports = [
7-
'actions/cache@70655ec8323daeeaa7ef06d7c56e1b9191396cbe',
8-
'actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16',
9-
'actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675',
10-
'actions/github-script@5d03ada4b0a753e9460b312e61cc4f8fdeacf163',
11-
'actions/github-script@6e5ee1dc1cb3740e5e5e76ad668e3f526edbfe45',
12-
'actions/github-script@44b873bc975058192f5279ebe7579496381f575d',
13-
'actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9',
14-
'actions/labeler@5f867a63be70efff62b767459b009290364495eb',
15-
'actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d',
16-
'actions/setup-ruby@5f29a1cd8dfebf420691c4c9a0e832e2fae5a526',
17-
'actions/stale@44f9eae0adddf72dbf3eedfacc999f70afcec1a8',
7+
'actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16', //actions/cache@v2.1.2
8+
'actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675', //actions/checkout@v2.3.3
9+
'actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9', //actions/script@v3.0.0
10+
'actions/labeler@5f867a63be70efff62b767459b009290364495eb', //actions/labeler@v2.2.0
11+
'actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d', //actions/setup-node@v1.4.4
12+
'actions/setup-ruby@5f29a1cd8dfebf420691c4c9a0e832e2fae5a526', //actions/setup-ruby@v1.1.2
13+
'actions/stale@44f9eae0adddf72dbf3eedfacc999f70afcec1a8', //actions/stale@v3.0.12
1814
'crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688',
1915
'dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911',
2016
'docker://chinthakagodawita/autoupdate-action:v1',

.github/workflows/dry-run-sync-algolia-search-indices.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
node-version: 14.x
1717
- name: cache node modules
18-
uses: actions/cache@70655ec8323daeeaa7ef06d7c56e1b9191396cbe
18+
uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
1919
with:
2020
path: ~/.npm
2121
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Check if the event originated from a team member
14-
uses: actions/github-script@44b873bc975058192f5279ebe7579496381f575d
14+
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
1515
id: set-result
1616
with:
1717
github-token: ${{secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES}}
@@ -53,12 +53,12 @@ jobs:
5353

5454
first-responder-remove-pr:
5555
name: Remove PR from FR project board
56-
if: github.repository == 'github/docs-internal' && (github.event.label.name == 'docs-content-fr' && github.event.action == 'unlabeled') || github.event.action == 'closed'
56+
if: github.repository == 'github/docs-internal' && ((github.event.label.name == 'docs-content-fr' && github.event.action == 'unlabeled') || github.event.action == 'closed')
5757
runs-on: ubuntu-latest
5858

5959
steps:
6060
- name: Remove card from project
61-
uses: actions/github-script@44b873bc975058192f5279ebe7579496381f575d
61+
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
6262
with:
6363
github-token: ${{secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES}}
6464
result-encoding: string

.github/workflows/send-eng-issues-to-backlog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Add issues with engineering label to project board
1414
if: contains(github.event.issue.labels.*.name, 'engineering') || contains(github.event.issue.labels.*.name, 'design') || contains(github.event.issue.labels.*.name, 'Design')
15-
uses: actions/github-script@44b873bc975058192f5279ebe7579496381f575d
15+
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
1616
with:
1717
github-token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }}
1818
script: |

.github/workflows/start-new-engineering-pr-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
DRAFT_COLUMN_ID: 10095775
1313
REGULAR_COLUMN_ID: 10095779
1414
steps:
15-
- uses: actions/github-script@44b873bc975058192f5279ebe7579496381f575d
15+
- uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
1616
continue-on-error: true
1717
with:
1818
github-token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }}

.github/workflows/sync-algolia-search-indices.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
node-version: 14.x
2020
- name: cache node modules
21-
uses: actions/cache@70655ec8323daeeaa7ef06d7c56e1b9191396cbe
21+
uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
2222
with:
2323
path: ~/.npm
2424
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/test-translations.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,5 @@ jobs:
7777

7878
- name: Run tests
7979
run: npx jest tests/${{ matrix.test-group }}/
80+
env:
81+
NODE_OPTIONS: "--max_old_space_size=4096"

.github/workflows/test-windows.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ jobs:
4747

4848
- name: Run tests
4949
run: npx jest tests/${{ matrix.test-group }}/
50+
env:
51+
NODE_OPTIONS: "--max_old_space_size=4096"

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ jobs:
116116
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
117117
name: Run tests
118118
run: npx jest tests/${{ matrix.test-group }}/
119+
env:
120+
NODE_OPTIONS: "--max_old_space_size=4096"
119121

120122
- name: Send Slack notification if workflow fails
121123
uses: rtCamp/action-slack-notify@e17352feaf9aee300bf0ebc1dfbf467d80438815

.github/workflows/translations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
branch: translations
2525
- if: ${{ steps.pr.outputs.number }}
2626
name: Check if already labeled
27-
uses: actions/github-script@5d03ada4b0a753e9460b312e61cc4f8fdeacf163
27+
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
2828
id: has-label
2929
with:
3030
script: |
@@ -44,7 +44,7 @@ jobs:
4444
number: ${{ steps.pr.outputs.number }}
4545
- if: ${{ !steps.has-label.outputs.result }}
4646
name: Add automerge label
47-
uses: actions/github-script@5d03ada4b0a753e9460b312e61cc4f8fdeacf163
47+
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
4848
with:
4949
github-token: ${{ secrets.GITHUB_TOKEN }}
5050
script: |

.github/workflows/triage-issue-comments.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Check if the event originated from a team member
13-
uses: actions/github-script@6e5ee1dc1cb3740e5e5e76ad668e3f526edbfe45
13+
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
1414
id: is-internal-contributor
1515
with:
1616
github-token: ${{secrets.GITHUB_TOKEN}}

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ When you're done making changes and you'd like to propose them for review, use t
4545
### Your PR is merged!
4646
Congratulations! The whole GitHub community thanks you. :sparkles:
4747

48-
Once your PR is merged, you can be added as a contributor in the [readme](README.md#contributors-).
48+
Once your PR is merged, you will be proudly listed as a contributor in the [contributor chart](https://github.com/github/docs/graphs/contributors).
4949

5050
### Keep contributing as you use GitHub Docs
5151

content/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@ featuredLinks:
166166
- Type: `Boolean`. Default is `false`.
167167
- Optional.
168168

169+
### `changelog`
170+
171+
- Purpose: Render a list of changelog items with timestamps on product pages (ex: `layouts/product-landing.html`)
172+
- Type: `Array`, items are objects `{ href: string, title: string, date: 'YYYY-MM-DD' }`
173+
- Optional.
174+
169175
### Escaping single quotes
170176

171177
If you see two single quotes in a row (`''`) in YML frontmatter where you might expect to see one (`'`), this is the YML-preferred way to escape a single quote. From [the YAML spec](https://yaml.org/spec/history/2001-12-10.html):

content/actions/index.md

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,30 @@ shortTitle: GitHub Actions
44
intro: 'Automate, customize, and execute your software development workflows right in your repository with {% data variables.product.prodname_actions %}. You can discover, create, and share actions to perform any job you''d like, including CI/CD, and combine actions in a completely customized workflow.'
55
introLinks:
66
quickstart: /actions/quickstart
7-
learn: /actions/learn-github-actions
7+
reference: /actions/reference
88
featuredLinks:
9+
guides:
10+
- /actions/guides/setting-up-continuous-integration-using-workflow-templates
11+
- /actions/guides/about-packaging-with-github-actions
912
gettingStarted:
1013
- /actions/managing-workflow-runs
1114
- /actions/hosting-your-own-runners
12-
guide:
13-
- /actions/guides/setting-up-continuous-integration-using-workflow-templates
14-
- /actions/guides/about-packaging-with-github-actions
1515
popular:
1616
- /actions/reference/workflow-syntax-for-github-actions
1717
- /actions/reference/events-that-trigger-workflows
18+
changelog:
19+
- title: Self-Hosted Runner Group Access Changes
20+
date: '2020-10-16'
21+
href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/
22+
- title: Ability to change retention days for artifacts and logs
23+
date: '2020-10-08'
24+
href: https://github.blog/changelog/2020-10-08-github-actions-ability-to-change-retention-days-for-artifacts-and-logs
25+
- title: Deprecating set-env and add-path commands
26+
date: '2020-10-01'
27+
href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands
28+
- title: Fine-tune access to external actions
29+
date: '2020-10-01'
30+
href: https://github.blog/changelog/2020-10-01-github-actions-fine-tune-access-to-external-actions
1831
redirect_from:
1932
- /articles/automating-your-workflow-with-github-actions/
2033
- /articles/customizing-your-project-with-github-actions/
@@ -36,44 +49,8 @@ versions:
3649
<!-- {% link_with_intro /hosting-your-own-runners %} -->
3750
<!-- {% link_with_intro /reference %} -->
3851

39-
<!-- Article links -->
40-
<div class="d-lg-flex gutter my-6 py-6">
41-
<div class="col-12 col-lg-4 mb-4 mb-lg-0">
42-
<div class="featured-links-heading pb-4">
43-
<h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.guides %}</h3>
44-
</div>
45-
<ul class="list-style-none">
46-
{% for link in featuredLinks.guide %}
47-
<li>{% include featured-link %}</li>
48-
{% endfor %}
49-
</ul>
50-
</div>
51-
52-
<div class="col-12 col-lg-4 mb-4 mb-lg-0">
53-
<div class="featured-links-heading pb-4">
54-
<h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.popular_articles %}</h3>
55-
</div>
56-
<ul class="list-style-none">
57-
{% for link in featuredLinks.popular %}
58-
<li>{% include featured-link %}</li>
59-
{% endfor %}
60-
</ul>
61-
</div>
62-
63-
<div class="col-12 col-lg-4 mb-4 mb-lg-0">
64-
<div class="featured-links-heading pb-4">
65-
<h3 class="f5 text-normal text-mono underline-dashed color-gray-5">Manage workflows</h3>
66-
</div>
67-
<ul class="list-style-none">
68-
{% for link in featuredLinks.gettingStarted %}
69-
<li>{% include featured-link %}</li>
70-
{% endfor %}
71-
</ul>
72-
</div>
73-
</div>
74-
7552
<!-- Code examples -->
76-
<div class="mt-6 pt-6">
53+
<div class="my-6 pt-6">
7754
<h2 class="mb-2">More guides</h2>
7855

7956
<div class="d-flex flex-wrap gutter">

content/actions/learn-github-actions/managing-complex-workflows.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ This example action demonstrates how to reference an existing secret as an envir
2424
```yaml
2525
jobs:
2626
example-job:
27+
runs-on: ubuntu-latest
2728
steps:
2829
- name: Retrieve secret
2930
env:
3031
super_secret: ${{ secrets.SUPERSECRET }}
3132
run: |
32-
example-command "$SUPER_SECRET"
33+
example-command "$super_secret"
3334
```
3435
{% endraw %}
3536
@@ -49,6 +50,7 @@ jobs:
4950
- run: ./setup_server.sh
5051
build:
5152
needs: setup
53+
runs-on: ubuntu-latest
5254
steps:
5355
- run: ./build_server.sh
5456
test:
@@ -141,7 +143,7 @@ This example shows how a workflow can use labels to specify the required runner:
141143
```yaml
142144
jobs:
143145
example-job:
144-
runs-on: [self-hosted, linux, x64, gpu]
146+
runs-on: [self-hosted, linux, x64, gpu]
145147
```
146148

147149
For more information, see ["Using labels with self-hosted runners](/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners)."

content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -232,25 +232,22 @@ Jenkins Pipeline
232232

233233
```yaml
234234
pipeline {
235-
agent none
236-
stages {
237-
stage('Run Tests') {
238-
parallel {
239-
stage('Test On MacOS') {
240-
agent { label "macos" }
241-
tools { nodejs "node-12" }
242-
steps {
243-
dir("scripts/myapp") {
244-
sh(script: "npm install -g bats")
245-
sh(script: "bats tests")
246-
}
247-
}
235+
agent none
236+
stages {
237+
stage('Run Tests') {
238+
matrix {
239+
axes {
240+
axis {
241+
name: 'PLATFORM'
242+
values: 'macos', 'linux'
248243
}
249-
stage('Test On Linux') {
250-
agent { label "linux" }
244+
}
245+
agent { label "${PLATFORM}" }
246+
stages {
247+
stage('test') {
251248
tools { nodejs "node-12" }
252249
steps {
253-
dir("script/myapp") {
250+
dir("scripts/myapp") {
254251
sh(script: "npm install -g bats")
255252
sh(script: "bats tests")
256253
}
@@ -259,6 +256,7 @@ pipeline {
259256
}
260257
}
261258
}
259+
}
262260
}
263261
```
264262

0 commit comments

Comments
 (0)