diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js index a7cad0cd4f..e8cce1d06d 100644 --- a/.github/allowed-actions.js +++ b/.github/allowed-actions.js @@ -4,13 +4,13 @@ // can be added it this list. module.exports = [ - "actions/cache@0781355a23dac32fd3bac414512f4b903437991a", //actions/cache@v2.1.3 - "actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f", //actions/checkout@v2.3.4 - "actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9", //actions/script@v3.0.0 - "actions/labeler@5f867a63be70efff62b767459b009290364495eb", //actions/labeler@v2.2.0 - "actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e", //actions/setup-node@v2.1.4 - "ruby/setup-ruby@fdcfbcf14ec9672f6f615cb9589a1bc5dd69d262", //ruby/setup-ruby@vv1.64.1 - "actions/stale@9d6f46564a515a9ea11e7762ab3957ee58ca50da", //actions/stale@v3.0.16 + "actions/cache@0781355a23dac32fd3bac414512f4b903437991a", // v2.1.3 + "actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f", // v2.3.4 + "actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9", // v3.0.0 + "actions/labeler@5f867a63be70efff62b767459b009290364495eb", // v2.2.0 + "actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e", // v2.1.4 + "ruby/setup-ruby@fdcfbcf14ec9672f6f615cb9589a1bc5dd69d262", // v1.64.1 + "actions/stale@9d6f46564a515a9ea11e7762ab3957ee58ca50da", // v3.0.16 "alex-page/github-project-automation-plus@fdb7991b72040d611e1123d2b75ff10eda9372c9", "andymckay/labeler@22d5392de2b725cea4b284df5824125054049d84", "archive/github-actions-slack@d368c5a4ad757515a9344918f84c490b05777d94", @@ -23,11 +23,11 @@ module.exports = [ "github/codeql-action/analyze@v1", "github/codeql-action/init@v1", "juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8", - "juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9", + "juliangruber/find-pull-request-action@db875662766249c049b2dcd85293892d61cb0b51", // v1.5.0 "juliangruber/read-file-action@e0a316da496006ffd19142f0fd594a1783f3b512", "lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8", "lee-dohm/no-response@9bb0a4b5e6a45046f00353d5de7d90fb8bd773bb", - "pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07", //pascalgn/automerge@0.12.0 + "pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07", // v0.12.0 "peter-evans/create-issue-from-file@a04ce672e3acedb1f8e416b46716ddfd09905326", "peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd", "peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43", diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 882e62774c..851e7d9161 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -27,18 +27,19 @@ jobs: steps: - name: Find pull request if: ${{ github.repository == 'github/docs' }} - uses: juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9 + uses: juliangruber/find-pull-request-action@db875662766249c049b2dcd85293892d61cb0b51 id: find-pull-request with: - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.DOCS_BOT_SPAM_VISION }} branch: repo-sync base: main + state: open - name: Close pull request if unwanted if: ${{ github.repository == 'github/docs' && steps.find-pull-request.outputs.number }} uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 with: - github-token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }} + github-token: ${{ secrets.DOCS_BOT_SPAM_VISION }} script: | const { owner, repo } = context.repo @@ -119,13 +120,14 @@ jobs: github_token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} - name: Find pull request - uses: juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9 + uses: juliangruber/find-pull-request-action@db875662766249c049b2dcd85293892d61cb0b51 id: find-pull-request with: github-token: ${{ secrets.GITHUB_TOKEN }} branch: repo-sync base: main author: Octomerger + state: open - name: Approve pull request if: ${{ steps.find-pull-request.outputs.number }} diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index b17ee503bf..9ed82ba41f 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -21,13 +21,14 @@ jobs: echo 'The repo is currently frozen! Exiting this workflow.' exit 1 # prevents further steps from running - name: Find original Pull Request - uses: juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9 + uses: juliangruber/find-pull-request-action@db875662766249c049b2dcd85293892d61cb0b51 id: pr with: github-token: ${{ secrets.GITHUB_TOKEN }} branch: translations base: main author: octoglot + state: open - if: ${{ steps.pr.outputs.number }} name: Check if already labeled uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 diff --git a/content/actions/reference/environments.md b/content/actions/reference/environments.md index aa3570397f..779a70ad24 100644 --- a/content/actions/reference/environments.md +++ b/content/actions/reference/environments.md @@ -71,9 +71,6 @@ For more information on syntax to reference environments in workflows, see "[Wor 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)." -### Using concurrency to serialize deployments in an environment -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)." - ### Deleting an environment {% data reusables.github-actions.permissions-statement-environment %} diff --git a/content/actions/reference/workflow-syntax-for-github-actions.md b/content/actions/reference/workflow-syntax-for-github-actions.md index 0c8d16ff93..334df0d22f 100644 --- a/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/content/actions/reference/workflow-syntax-for-github-actions.md @@ -221,18 +221,6 @@ defaults: working-directory: scripts ``` -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@next" %} -### `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. 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)." - -You can also specify `concurrency` at the job level. For more information, see [`jobs..concurrency`](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idconcurrency). - -{% data reusables.actions.actions-group-concurrency %} - -{% endif %} ### `jobs` 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..needs` keyword. @@ -356,14 +344,13 @@ For more information, see "[About self-hosted runners](/github/automating-your-w 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)." -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)." +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)." ##### Example using a single environment name -{% raw %} + ```yaml environment: staging_environment ``` -{% endraw %} ##### Example using environment name and URL @@ -385,25 +372,6 @@ environment: {% endraw %} {% endif %} - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@next" %} -### `jobs..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. - -{% endnote %} - -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)." - -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). - -{% data reusables.actions.actions-group-concurrency %} - -{% endif %} ### `jobs..outputs` 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..needs`](#jobsjob_idneeds). diff --git a/data/reusables/actions/actions-group-concurrency.md b/data/reusables/actions/actions-group-concurrency.md deleted file mode 100644 index 493e81cb45..0000000000 --- a/data/reusables/actions/actions-group-concurrency.md +++ /dev/null @@ -1,25 +0,0 @@ -When a concurrent job or workflow is queued, if another job or workflow using the same concurrency group in the repository is in progress, the queued job or workflow will be `pending`. Any previously pending job or workflow in the concurrency group will be canceled. To also cancel any currently running job or workflow in the same concurrency group, specify `cancel-in-progress: true`. - -##### Examples using concurrency and the default behavior - -{% raw %} -```yaml -concurrency: staging_environment -``` -{% endraw %} - -{% raw %} -```yaml -concurrency: ci-${{ github.ref }} -``` -{% endraw %} - -##### Example using concurrency to cancel any in-progress job or run - -{% raw %} -```yaml -concurrency: - group: ${{ github.head_ref }} - cancel-in-progress: true -``` -{% endraw %} diff --git a/data/reusables/actions/concurrency-beta.md b/data/reusables/actions/concurrency-beta.md deleted file mode 100644 index c3f2c9a831..0000000000 --- a/data/reusables/actions/concurrency-beta.md +++ /dev/null @@ -1,5 +0,0 @@ -{% note %} - -**Note:** Concurrency is currently in beta and subject to change. - -{% endnote %} \ No newline at end of file diff --git a/data/ui.yml b/data/ui.yml index 6b2e9b30c2..fac465f2b4 100644 --- a/data/ui.yml +++ b/data/ui.yml @@ -143,12 +143,12 @@ product_landing: product_sublanding: start: Start start_path: Start path - learning_paths: '{{ allProducts[currentProduct].name }} learning paths' + learning_paths: '{{ productMap[currentProduct].name }} learning paths' learning_paths_desc: Learning paths are a collection of guides that help you master a particular subject. - guides: '{{ allProducts[currentProduct].name }} guides' + guides: '{{ productMap[currentProduct].name }} guides' more_guides: more guides load_more: Load more guides - all_guides: 'All {{ allProducts[currentProduct].name }} guides' + all_guides: 'All {{ productMap[currentProduct].name }} guides' no_result: Sorry, there is no guide that match your filter. filters: type: Type