Skip to content

Commit 9ab7161

Browse files
authored
Merge branch 'main' into revert-16952-revert-16947-optimize-sitetree
2 parents 1cf2a16 + 1f15ea4 commit 9ab7161

41 files changed

Lines changed: 236 additions & 169 deletions

Some content is hidden

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

.github/allowed-actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = [
2525
'pascalgn/automerge-action@c9bd182',
2626
'peter-evans/create-issue-from-file@a04ce672e3acedb1f8e416b46716ddfd09905326',
2727
'peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd',
28-
'peter-evans/create-pull-request@938e6aea6f8dbdaced2064e948cb806c77fe87b8',
28+
'peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43',
2929
'rachmari/actions-add-new-issue-to-column@1a459ef92308ba7c9c9dc2fcdd72f232495574a9',
3030
'rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e',
3131
'repo-sync/github-sync@3832fe8e2be32372e1b3970bbae8e7079edeec88',

.github/workflows/remove-unused-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Remove script results file
3434
run: rm -rf ./results.md
3535
- name: Create pull request
36-
uses: peter-evans/create-pull-request@938e6aea6f8dbdaced2064e948cb806c77fe87b8
36+
uses: peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43
3737
with:
3838
# need to use a token with repo and workflow scopes for this step
3939
token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}

.github/workflows/repo-sync-stalls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
const timeDelta = Date.now() - Date.parse(pr.created_at);
4141
const minutesOpen = timeDelta / 1000 / 60;
4242
43-
if (minutesOpen > 30) {
43+
if (minutesOpen > 180) {
4444
core.setFailed('Repo sync appears to be stalled')
4545
}
4646
})

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ env:
99
FREEZE: ${{ secrets.FREEZE }}
1010

1111
on:
12+
workflow_dispatch:
1213
schedule:
1314
- cron: '20 16 * * *' # run every day at 16:20 UTC / 8:20 PST
1415

@@ -36,15 +37,15 @@ jobs:
3637
- name: Run updater scripts
3738
env:
3839
# need to use a token from a user with access to github/github for this step
39-
GITHUB_TOKEN: ${{ secrets.ZEKE_PAT_WITH_REPO_AND_WORKFLOW_SCOPE_FOR_REPO_SYNC }}
40+
GITHUB_TOKEN: ${{ secrets.RACHMARI_REPO_WORKFLOW }}
4041
run: |
4142
script/graphql/update-files.js
4243
- name: Create pull request
4344
id: create-pull-request
44-
uses: peter-evans/create-pull-request@938e6aea6f8dbdaced2064e948cb806c77fe87b8
45+
uses: peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43
4546
with:
4647
# need to use a token with repo and workflow scopes for this step
47-
token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
48+
token: ${{ secrets.GITHUB_TOKEN }}
4849
commit-message: 'Action ran graphql script"update-files"'
4950
title: GraphQL schema update
5051
body:

Gemfile.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ GEM
1010

1111
PLATFORMS
1212
ruby
13+
x86_64-linux
1314

1415
DEPENDENCIES
1516
graphql (= 1.10.6)
1617
graphql-schema_comparator (~> 1.0.0)
1718

1819
BUNDLED WITH
19-
2.1.4
20+
2.2.1

app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "docs.github.com",
33
"env": {
44
"NODE_ENV": "production",
5-
"NPM_CONFIG_PRODUCTION": "true"
5+
"NPM_CONFIG_PRODUCTION": "true",
6+
"ENABLED_LANGUAGES": "en, de"
67
},
78
"buildpacks": [
89
{ "url": "https://github.com/DataDog/heroku-buildpack-datadog.git#1.21" },

content/actions/creating-actions/metadata-syntax-for-github-actions.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ runs:
117117
{% endraw %}
118118

119119
#### `outputs.<output_id>.value`
120+
120121
**Required** The value that the output parameter will be mapped to. You can set this to a `string` or an expression with context. For example, you can use the `steps` context to set the `value` of an output to the output value of a step.
121122

122123
For more information on how to use context and expression syntax, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)".
@@ -205,7 +206,7 @@ For example, this `cleanup.js` will only run on Linux-based runners:
205206

206207
**Required** The run steps that you plan to run in this action.
207208

208-
##### `runs.steps.run`
209+
##### `runs.steps[*].run`
209210

210211
**Required** The command you want to run. This can be inline or a script in your action repository:
211212
```yaml
@@ -228,23 +229,23 @@ runs:
228229

229230
For more information, see "[`github context`](/actions/reference/context-and-expression-syntax-for-github-actions#github-context)".
230231

231-
##### `runs.steps.shell`
232+
##### `runs.steps[*].shell`
232233

233234
**Required** The shell where you want to run the command. You can use any of the shells listed [here](/actions/reference/workflow-syntax-for-github-actions#using-a-specific-shell).
234235

235-
##### `runs.steps.name`
236+
##### `runs.steps[*].name`
236237

237238
**Optional** The name of the composite run step.
238239

239-
##### `runs.steps.id`
240+
##### `runs.steps[*].id`
240241

241242
**Optional** A unique identifier for the step. You can use the `id` to reference the step in contexts. For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)".
242243

243-
##### `runs.steps.env`
244+
##### `runs.steps[*].env`
244245

245246
**Optional** Sets a `map` of environment variables for only that step. If you want to modify the environment variable stored in the workflow, use {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}`echo "{name}={value}" >> $GITHUB_ENV`{% else %}`echo "::set-env name={name}::{value}"`{% endif %} in a composite run step.
246247

247-
##### `runs.steps.working-directory`
248+
##### `runs.steps[*].working-directory`
248249

249250
**Optional** Specifies the working directory where the command is run.
250251

content/actions/guides/building-and-testing-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ steps:
195195

196196
To authenticate to your private registry, you'll need to store your npm authentication token as a secret. For example, create a repository secret called `NPM_TOKEN`. For more information, see "[Creating and using encrypted secrets](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)."
197197

198-
In the example below, the secret `NPM_TOKEN` stores the npm authentication token. The `setup-node` action configures the *.npmrc* file to read the npm authentication token from the `NODE_AUTH_TOKEN` environment variable. When using the `setup-node` action to create an *.npmrc* file, you must set the `NPM_AUTH_TOKEN` environment variable with the secret that contains your npm authentication token.
198+
In the example below, the secret `NPM_TOKEN` stores the npm authentication token. The `setup-node` action configures the *.npmrc* file to read the npm authentication token from the `NODE_AUTH_TOKEN` environment variable. When using the `setup-node` action to create an *.npmrc* file, you must set the `NODE_AUTH_TOKEN` environment variable with the secret that contains your npm authentication token.
199199

200200
Before installing dependencies, use the `setup-node` action to create the *.npmrc* file. The action has two input parameters. The `node-version` parameter sets the Node.js version, and the `registry-url` parameter sets the default registry. If your package registry uses scopes, you must use the `scope` parameter. For more information, see [`npm-scope`](https://docs.npmjs.com/misc/scope).
201201

content/actions/index.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,15 @@ featuredLinks:
2525
- /actions/reference/workflow-commands-for-github-actions
2626
- /actions/reference/environment-variables
2727
changelog:
28+
- title: Workflow visualization
29+
date: '2020-12-08'
30+
href: https://github.blog/changelog/2020-12-08-github-actions-workflow-visualization/
2831
- title: Removing set-env and add-path commands on November 16
2932
date: '2020-11-09'
3033
href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
3134
- title: Ubuntu-latest workflows will use Ubuntu-20.04
3235
date: '2020-10-29'
3336
href: https://github.blog/changelog/2020-10-29-github-actions-ubuntu-latest-workflows-will-use-ubuntu-20-04
34-
- title: MacOS Big Sur Preview
35-
date: '2020-10-29'
36-
href: https://github.blog/changelog/2020-10-29-github-actions-macos-big-sur-preview
37-
- title: Self-Hosted Runner Group Access Changes
38-
date: '2020-10-16'
39-
href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/
4037

4138
product_video: https://www.youtube-nocookie.com/embed/cP0I9w2coGU
4239

content/actions/learn-github-actions/finding-and-customizing-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ steps:
7979
8080
#### Using branches
8181
82-
Referring to a specific branch means that the action will always use include the latest updates on the target branch, but can create problems if those updates include breaking changes. This example targets a branch named `@main`:
82+
Referring to a specific branch means that the action will always use the latest updates on the target branch, but can create problems if those updates include breaking changes. This example targets a branch named `@main`:
8383

8484
```yaml
8585
steps:

0 commit comments

Comments
 (0)