Skip to content

Commit 4555835

Browse files
authored
Merge pull request #5335 from github/repo-sync
repo sync
2 parents fa3bb7d + 278e38f commit 4555835

7 files changed

Lines changed: 19 additions & 81 deletions

File tree

.github/allowed-actions.js

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

66
module.exports = [
7-
"actions/cache@0781355a23dac32fd3bac414512f4b903437991a", //actions/cache@v2.1.3
8-
"actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f", //actions/checkout@v2.3.4
9-
"actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9", //actions/script@v3.0.0
10-
"actions/labeler@5f867a63be70efff62b767459b009290364495eb", //actions/labeler@v2.2.0
11-
"actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e", //actions/setup-node@v2.1.4
12-
"ruby/setup-ruby@fdcfbcf14ec9672f6f615cb9589a1bc5dd69d262", //ruby/setup-ruby@vv1.64.1
13-
"actions/stale@9d6f46564a515a9ea11e7762ab3957ee58ca50da", //actions/stale@v3.0.16
7+
"actions/cache@0781355a23dac32fd3bac414512f4b903437991a", // v2.1.3
8+
"actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f", // v2.3.4
9+
"actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9", // v3.0.0
10+
"actions/labeler@5f867a63be70efff62b767459b009290364495eb", // v2.2.0
11+
"actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e", // v2.1.4
12+
"ruby/setup-ruby@fdcfbcf14ec9672f6f615cb9589a1bc5dd69d262", // v1.64.1
13+
"actions/stale@9d6f46564a515a9ea11e7762ab3957ee58ca50da", // v3.0.16
1414
"alex-page/github-project-automation-plus@fdb7991b72040d611e1123d2b75ff10eda9372c9",
1515
"andymckay/labeler@22d5392de2b725cea4b284df5824125054049d84",
1616
"archive/github-actions-slack@d368c5a4ad757515a9344918f84c490b05777d94",
@@ -23,11 +23,11 @@ module.exports = [
2323
"github/codeql-action/analyze@v1",
2424
"github/codeql-action/init@v1",
2525
"juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8",
26-
"juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9",
26+
"juliangruber/find-pull-request-action@db875662766249c049b2dcd85293892d61cb0b51", // v1.5.0
2727
"juliangruber/read-file-action@e0a316da496006ffd19142f0fd594a1783f3b512",
2828
"lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8",
2929
"lee-dohm/no-response@9bb0a4b5e6a45046f00353d5de7d90fb8bd773bb",
30-
"pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07", //pascalgn/automerge@0.12.0
30+
"pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07", // v0.12.0
3131
"peter-evans/create-issue-from-file@a04ce672e3acedb1f8e416b46716ddfd09905326",
3232
"peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd",
3333
"peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43",

.github/workflows/repo-sync.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ jobs:
2727
steps:
2828
- name: Find pull request
2929
if: ${{ github.repository == 'github/docs' }}
30-
uses: juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9
30+
uses: juliangruber/find-pull-request-action@db875662766249c049b2dcd85293892d61cb0b51
3131
id: find-pull-request
3232
with:
33-
github-token: ${{ secrets.GITHUB_TOKEN }}
33+
github-token: ${{ secrets.DOCS_BOT_SPAM_VISION }}
3434
branch: repo-sync
3535
base: main
36+
state: open
3637

3738
- name: Close pull request if unwanted
3839
if: ${{ github.repository == 'github/docs' && steps.find-pull-request.outputs.number }}
3940
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
4041
with:
41-
github-token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }}
42+
github-token: ${{ secrets.DOCS_BOT_SPAM_VISION }}
4243
script: |
4344
const { owner, repo } = context.repo
4445
@@ -119,13 +120,14 @@ jobs:
119120
github_token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
120121

121122
- name: Find pull request
122-
uses: juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9
123+
uses: juliangruber/find-pull-request-action@db875662766249c049b2dcd85293892d61cb0b51
123124
id: find-pull-request
124125
with:
125126
github-token: ${{ secrets.GITHUB_TOKEN }}
126127
branch: repo-sync
127128
base: main
128129
author: Octomerger
130+
state: open
129131

130132
- name: Approve pull request
131133
if: ${{ steps.find-pull-request.outputs.number }}

.github/workflows/translations.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ jobs:
2121
echo 'The repo is currently frozen! Exiting this workflow.'
2222
exit 1 # prevents further steps from running
2323
- name: Find original Pull Request
24-
uses: juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9
24+
uses: juliangruber/find-pull-request-action@db875662766249c049b2dcd85293892d61cb0b51
2525
id: pr
2626
with:
2727
github-token: ${{ secrets.GITHUB_TOKEN }}
2828
branch: translations
2929
base: main
3030
author: octoglot
31+
state: open
3132
- if: ${{ steps.pr.outputs.number }}
3233
name: Check if already labeled
3334
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9

content/actions/reference/environments.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ For more information on syntax to reference environments in workflows, see "[Wor
7171

7272
When a workflow references an environment, the environment will appear in the repository's deployments. For more information about viewing current and previous deployments, see "[Viewing deployment history](/developers/overview/viewing-deployment-history)."
7373

74-
### Using concurrency to serialize deployments in an environment
75-
You can use concurrency so that an environment has a maximum of one deployment in progress and one deployment pending at a time. For more information, see "[Workflow syntax for GitHub Actions](/actions/reference/workflow-syntax-for-github-actions#concurrency)."
76-
7774
### Deleting an environment
7875

7976
{% data reusables.github-actions.permissions-statement-environment %}

content/actions/reference/workflow-syntax-for-github-actions.md

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -221,18 +221,6 @@ defaults:
221221
working-directory: scripts
222222
```
223223

224-
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@next" %}
225-
### `concurrency`
226-
227-
{% data reusables.actions.concurrency-beta %}
228-
229-
Concurrency ensures that only a single job or workflow using the same concurrency group will run at a time. A concurrency group can be any string or expression. The expression can only use the `github` context. For more information about expressions, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)."
230-
231-
You can also specify `concurrency` at the job level. For more information, see [`jobs.<job_id>.concurrency`](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idconcurrency).
232-
233-
{% data reusables.actions.actions-group-concurrency %}
234-
235-
{% endif %}
236224
### `jobs`
237225

238226
A workflow run is made up of one or more jobs. Jobs run in parallel by default. To run jobs sequentially, you can define dependencies on other jobs using the `jobs.<job_id>.needs` keyword.
@@ -356,14 +344,13 @@ For more information, see "[About self-hosted runners](/github/automating-your-w
356344

357345
The environment that the job references. All environment protection rules must pass before a job referencing the environment is sent to a runner. For more information, see "[Environments](/actions/reference/environments)."
358346

359-
You can provide the environment as only the environment `name`, or as an environment object with the `name` and `url`. We support [context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions) only when you provide the environment object. The URL maps to `environment_url` in the deployments API. For more information about the deployments API, see "[Deployments](/rest/reference/repos#deployments)."
347+
You can provide the environment as only the environment `name`, or as an environment object with the `name` and `url`. The URL maps to `environment_url` in the deployments API. For more information about the deployments API, see "[Deployments](/rest/reference/repos#deployments)."
360348

361349
##### Example using a single environment name
362-
{% raw %}
350+
363351
```yaml
364352
environment: staging_environment
365353
```
366-
{% endraw %}
367354

368355
##### Example using environment name and URL
369356

@@ -385,25 +372,6 @@ environment:
385372
{% endraw %}
386373
{% endif %}
387374

388-
389-
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@next" %}
390-
### `jobs.<job_id>.concurrency`
391-
392-
{% data reusables.actions.concurrency-beta %}
393-
394-
{% note %}
395-
396-
**Note:** When concurrency is specified at the job level, order is not guaranteed for jobs or runs that queue within 5 minutes of each other.
397-
398-
{% endnote %}
399-
400-
Concurrency ensures that only a single job or workflow using the same concurrency group will run at a time. A concurrency group can be any string or expression. The expression can use any context except for the `secrets` context. For more information about expressions, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)."
401-
402-
You can also specify `concurrency` at the workflow level. For more information, see [`concurrency`](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#concurrency).
403-
404-
{% data reusables.actions.actions-group-concurrency %}
405-
406-
{% endif %}
407375
### `jobs.<job_id>.outputs`
408376

409377
A `map` of outputs for a job. Job outputs are available to all downstream jobs that depend on this job. For more information on defining job dependencies, see [`jobs.<job_id>.needs`](#jobsjob_idneeds).

data/reusables/actions/actions-group-concurrency.md

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

data/reusables/actions/concurrency-beta.md

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

0 commit comments

Comments
 (0)