1
0
mirror of synced 2025-12-22 19:34:15 -05:00

merging main into branch and resolving conflicts

This commit is contained in:
Jules Parker
2021-10-07 15:02:14 +02:00
17335 changed files with 471500 additions and 101578 deletions

View File

@@ -16,7 +16,6 @@ versions:
{% data reusables.actions.enterprise-beta %}
{% data reusables.actions.enterprise-github-hosted-runners %}
{% data reusables.actions.ae-beta %}
## About YAML syntax for workflows
@@ -354,8 +353,6 @@ defaults:
{% ifversion fpt or ghae-next or ghes > 3.1 %}
## `concurrency`
{% data reusables.actions.concurrency-beta %}
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](/actions/learn-github-actions/contexts#github-context). For more information about expressions, see "[Expressions](/actions/learn-github-actions/expressions)."
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).
@@ -510,7 +507,7 @@ jobs:
{% ifversion fpt or ghes > 3.0 or ghae %}
## `jobs.<job_id>.environment`
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)."
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 "[Using environments for deployment](/actions/deployment/using-environments-for-deployment)."
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)."
@@ -545,8 +542,6 @@ environment:
{% ifversion fpt or ghae-next or ghes > 3.1 %}
## `jobs.<job_id>.concurrency`
{% data reusables.actions.concurrency-beta %}
{% note %}
**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.