diff --git a/translations/ja-JP/content/actions/examples/using-concurrency-expressions-and-a-test-matrix.md b/translations/ja-JP/content/actions/examples/using-concurrency-expressions-and-a-test-matrix.md index ad34bf3ecf..b76b40631b 100644 --- a/translations/ja-JP/content/actions/examples/using-concurrency-expressions-and-a-test-matrix.md +++ b/translations/ja-JP/content/actions/examples/using-concurrency-expressions-and-a-test-matrix.md @@ -69,7 +69,7 @@ on: pull_request: push: branches: - - gh-readonly-queue/main/** + - main permissions: contents: read @@ -277,12 +277,12 @@ Add the `pull_request` event, so that the workflow runs automatically every time ```yaml{:copy} push: branches: - - gh-readonly-queue/main/** + - main ``` -Add the `push` event, so that the workflow runs automatically every time a commit is pushed to a branch matching the filter `gh-readonly-queue/main/**`. For more information, see [`push`](/actions/using-workflows/events-that-trigger-workflows#push). +Add the `push` event, so that the workflow runs automatically every time a commit is pushed to a branch matching the filter `main`. For more information, see [`push`](/actions/using-workflows/events-that-trigger-workflows#push). diff --git a/translations/ja-JP/content/actions/using-workflows/events-that-trigger-workflows.md b/translations/ja-JP/content/actions/using-workflows/events-that-trigger-workflows.md index ac3608960e..1a2fbb5f41 100644 --- a/translations/ja-JP/content/actions/using-workflows/events-that-trigger-workflows.md +++ b/translations/ja-JP/content/actions/using-workflows/events-that-trigger-workflows.md @@ -381,6 +381,34 @@ on: types: [created, deleted] ``` +{% ifversion fpt or ghec %} + +### `merge_group` + +| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | +| -------------------------------------------------------------------------------------------------- | ------------------ | ---------------------- | ---------------------- | +| [`merge_group`](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads/#merge_group) | `checks_requested` | SHA of the merge group | Ref of the merge group | + +{% data reusables.pull_requests.merge-queue-beta %} + +{% note %} + +**Note**: {% data reusables.developer-site.multiple_activity_types %} Although only the `checks_requested` activity type is supported, specifying the activity type will keep your workflow specific if more activity types are added in the future. For information about each activity type, see "[Webhook events and payloads](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#merge_group)." {% data reusables.developer-site.limit_workflow_to_activity_types %} + +{% endnote %} + +Runs your workflow when a pull request is added to a merge queue, which adds the pull request to a merge group. For more information see "[Merging a pull request with a merge queue](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue)". + +For example, you can run a workflow when the `checks_requested` activity has occurred. + +```yaml +on: + merge_group: + types: [checks_requested] + +``` + +{% endif %} ### `マイルストーン` | webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` | @@ -603,7 +631,7 @@ jobs: #### Running your workflow based on the head or base branch of a pull request -You can use the `branches` or `branches-ignore` filter to configure your workflow to only run on pull requests that target specific branches. For more information, see "[Workflow syntax for GitHub Actions](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpull_requestpull_request_targetbranchesbranches-ignore)." +You can use the `branches` or `branches-ignore` filter to configure your workflow to only run on pull requests that target specific branches. 詳しい情報については「[GitHub Actionsのワークフロー構文](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpull_requestpull_request_targetbranchesbranches-ignore)」を参照してください。 For example, this workflow will run when someone opens a pull request that targets a branch whose name starts with `releases/`: @@ -612,7 +640,7 @@ on: pull_request: types: - opened - branches: + branches: - 'releases/**' ``` @@ -625,7 +653,7 @@ on: pull_request: types: - opened - branches: + branches: - 'releases/**' paths: - '**.js' @@ -650,7 +678,7 @@ jobs: #### Running your workflow based on files changed in a pull request -You can also configure your workflow to run when a pull request changes specific files. For more information, see "[Workflow syntax for GitHub Actions](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore)." +You can also configure your workflow to run when a pull request changes specific files. 詳しい情報については「[GitHub Actionsのワークフロー構文](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore)」を参照してください。 For example, this workflow will run when a pull request includes a change to a JavaScript file (`.js`): @@ -670,7 +698,7 @@ on: pull_request: types: - opened - branches: + branches: - 'releases/**' paths: - '**.js' @@ -800,7 +828,7 @@ on: #### Running your workflow based on the head or base branch of a pull request -You can use the `branches` or `branches-ignore` filter to configure your workflow to only run on pull requests that target specific branches. For more information, see "[Workflow syntax for GitHub Actions](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpull_requestpull_request_targetbranchesbranches-ignore)." +You can use the `branches` or `branches-ignore` filter to configure your workflow to only run on pull requests that target specific branches. 詳しい情報については「[GitHub Actionsのワークフロー構文](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpull_requestpull_request_targetbranchesbranches-ignore)」を参照してください。 For example, this workflow will run when someone opens a pull request that targets a branch whose name starts with `releases/`: @@ -809,7 +837,7 @@ on: pull_request_target: types: - opened - branches: + branches: - 'releases/**' ``` @@ -822,7 +850,7 @@ on: pull_request_target: types: - opened - branches: + branches: - 'releases/**' paths: - '**.js' @@ -847,7 +875,7 @@ jobs: #### Running your workflow based on files changed in a pull request -You can use the `paths` or `paths-ignore` filter to configure your workflow to run when a pull request changes specific files. For more information, see "[Workflow syntax for GitHub Actions](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore)." +You can use the `paths` or `paths-ignore` filter to configure your workflow to run when a pull request changes specific files. 詳しい情報については「[GitHub Actionsのワークフロー構文](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore)」を参照してください。 For example, this workflow will run when a pull request includes a change to a JavaScript file (`.js`): @@ -867,7 +895,7 @@ on: pull_request_target: types: - opened - branches: + branches: - 'releases/**' paths: - '**.js' @@ -929,14 +957,14 @@ on: #### Running your workflow only when a push to specific branches occurs -You can use the `branches` or `branches-ignore` filter to configure your workflow to only run when specific branches are pushed. For more information, see "[Workflow syntax for GitHub Actions](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushbranchestagsbranches-ignoretags-ignore)." +You can use the `branches` or `branches-ignore` filter to configure your workflow to only run when specific branches are pushed. 詳しい情報については「[GitHub Actionsのワークフロー構文](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushbranchestagsbranches-ignoretags-ignore)」を参照してください。 For example, this workflow will run when someone pushes to `main` or to a branch that starts with `releases/`. ```yaml on: push: - branches: + branches: - 'main' - 'releases/**' ``` @@ -948,7 +976,7 @@ on: ```yaml on: push: - branches: + branches: - 'releases/**' paths: - '**.js' @@ -958,20 +986,20 @@ on: #### Running your workflow only when a push of specific tags occurs -You can use the `tags` or `tags-ignore` filter to configure your workflow to only run when specific tags are pushed. For more information, see "[Workflow syntax for GitHub Actions](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushbranchestagsbranches-ignoretags-ignore)." +You can use the `tags` or `tags-ignore` filter to configure your workflow to only run when specific tags are pushed. 詳しい情報については「[GitHub Actionsのワークフロー構文](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushbranchestagsbranches-ignoretags-ignore)」を参照してください。 For example, this workflow will run when someone pushes a tag that starts with `v1.`. ```yaml on: push: - tags: + tags: - v1.** ``` #### Running your workflow only when a push affects specific files -You can use the `paths` or `paths-ignore` filter to configure your workflow to run when a push to specific files occurs. For more information, see "[Workflow syntax for GitHub Actions](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore)." +You can use the `paths` or `paths-ignore` filter to configure your workflow to run when a push to specific files occurs. 詳しい情報については「[GitHub Actionsのワークフロー構文](/actions/learn-github-actions/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore)」を参照してください。 For example, this workflow will run when someone pushes a change to a JavaScript file (`.js`): @@ -989,7 +1017,7 @@ on: ```yaml on: push: - branches: + branches: - 'releases/**' paths: - '**.js' @@ -1011,7 +1039,7 @@ on: {% data reusables.actions.branch-requirement %} -Runs your workflow when activity related to {% data variables.product.prodname_registry %} occurs in your repository. For more information, see "[{% data variables.product.prodname_registry %} Documentation](/packages)." +Runs your workflow when activity related to {% data variables.product.prodname_registry %} occurs in your repository. 詳しい情報については、「[{% data variables.product.prodname_registry %} のドキュメント](/packages)」を参照してください。 For example, you can run a workflow when a new package version has been `published`. @@ -1063,7 +1091,7 @@ on: {% data reusables.actions.branch-requirement %} -You can use the {% data variables.product.product_name %} API to trigger a webhook event called [`repository_dispatch`](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads/#repository_dispatch) when you want to trigger a workflow for activity that happens outside of {% data variables.product.product_name %}. 詳細については、「[リポジトリディスパッチ イベントの作成](/rest/reference/repos#create-a-repository-dispatch-event)」を参照してください。 +{% data variables.product.product_name %} の外部で生じるアクティビティのためにワークフローをトリガーしたい場合、{% data variables.product.product_name %} API を使って、[`repository_dispatch`](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads/#repository_dispatch) と呼ばれる webhook イベントをトリガーできます。 詳細については、「[リポジトリディスパッチ イベントの作成](/rest/reference/repos#create-a-repository-dispatch-event)」を参照してください。 When you make a request to create a `repository_dispatch` event, you must specify an `event_type` to describe the activity type. By default, all `repository_dispatch` activity types trigger a workflow to run. You can use the `types` keyword to limit your workflow to run when a specific `event_type` value is sent in the `repository_dispatch` webhook payload. @@ -1252,26 +1280,26 @@ on: workflow_dispatch This example defines inputs called `logLevel`, `tags`, and `environment`. You pass values for these inputs to the workflow when you run it. This workflow then prints the values to the log, using the {% ifversion actions-unified-inputs %}`inputs.logLevel`, `inputs.tags`, and `inputs.environment`{% else %}`github.event.inputs.logLevel`, `github.event.inputs.tags`, and `github.event.inputs.environment`{% endif %} context properties. ```yaml -on: +on: workflow_dispatch: inputs: logLevel: - description: 'Log level' + description: 'Log level' required: true - default: 'warning' + default: 'warning' type: choice options: - info - warning - - debug + - debug tags: description: 'Test scenario tags' - required: false + required: false type: boolean environment: description: 'Environment to run tests against' type: environment - required: true + required: true jobs: log-the-inputs: @@ -1422,7 +1450,7 @@ jobs: upload: runs-on: ubuntu-latest - steps: + steps: - name: Save PR number env: PR_NUMBER: {% raw %}${{ github.event.number }}{% endraw %} diff --git a/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md index 41f7692914..8bb6479d84 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md @@ -17,13 +17,9 @@ topics: shortTitle: webhookイベントとペイロード --- -{% ifversion fpt or ghec %} - -{% endif %} - {% data reusables.webhooks.webhooks_intro %} -このページに表示されているイベントをサブスクライブする webhook を作成できます。 各 webhook イベントには、webhook プロパティの説明とペイロードの例が含まれています。 詳しい情報については「[webhook を作成する](/webhooks/creating/)」を参照してください。 +このページに表示されているイベントをサブスクライブする webhook を作成できます。 各 webhook イベントには、webhook プロパティの説明とペイロードの例が含まれています。 For more information, see "[Creating webhooks](/webhooks/creating/)." ## webhook ペイロードオブジェクトの共通プロパティ @@ -101,7 +97,7 @@ webhook によって設定されている URL エンドポイントに配信さ > } ``` -{% ifversion fpt or ghes > 3.2 or ghae or ghec %} +{% ifversion fpt or ghes > 3.3 or ghae or ghec %} ## branch_protection_rule ブランチ保護ルールに関するアクティビティです。 詳しい情報については「[ブランチ保護ルールについて](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#about-branch-protection-rules)」を参照してください。 @@ -219,7 +215,7 @@ A Git ref has been successfully synced to a cache replica. For more information, {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} -`sender` | `object` | `action` が `reopened_by_user` または `closed_by_user` の場合、`sender` オブジェクトは、イベントをトリガーしたユーザになります。 `sender`オブジェクトは、他の全てのアクションに対して{% ifversion fpt or ghec %}`github`{% elsif ghes or ghae %}`github-enterprise`{% else %}empty{% endif %}です。 +`sender` | `object` | `action` が `reopened_by_user` または `closed_by_user` の場合、`sender` オブジェクトは、イベントをトリガーしたユーザになります。 The `sender` object is {% ifversion fpt or ghec %}`github`{% elsif ghes or ghae %}`github-enterprise`{% else %}empty{% endif %} for all other actions. ### webhook ペイロードの例 @@ -353,10 +349,10 @@ webhook イベントは、登録したドメインの特異性に基づいてト ### webhook ペイロードオブジェクト -| キー | 種類 | 説明 | -| ------------ | -------- | -------------------------------------------------------- | -| `action` | `string` | 実行されたアクション。 `created `になりうる。 | -| `deployment` | `オブジェクト` | [デプロイメント](/rest/reference/deployments#list-deployments)。 | +| キー | 種類 | 説明 | +| ------------ | -------- | --------------------------------------------------------------- | +| `action` | `string` | 実行されたアクション。 `created `になりうる。 | +| `deployment` | `オブジェクト` | The [deployment](/rest/reference/deployments#list-deployments). | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -378,14 +374,14 @@ webhook イベントは、登録したドメインの特異性に基づいてト ### webhook ペイロードオブジェクト -| キー | 種類 | 説明 | -| ---------------------------------- | -------- | -------------------------------------------------------------------------- | -| `action` | `string` | 実行されたアクション。 `created `になりうる。 | -| `deployment_status` | `オブジェクト` | [デプロイメントステータス](/rest/reference/deployments#list-deployment-statuses)。 | -| `deployment_status["state"]` | `string` | 新しい状態。 `pending`、`success`、`failure`、`error` のいずれかを指定可。 | -| `deployment_status["target_url"]` | `string` | ステータスに追加されたオプションのリンク。 | -| `deployment_status["description"]` | `string` | オプションの人間可読の説明がステータスに追加。 | -| `deployment` | `オブジェクト` | このステータスが関連付けられている [デプロイメント](/rest/reference/deployments#list-deployments)。 | +| キー | 種類 | 説明 | +| ---------------------------------- | -------- | --------------------------------------------------------------------------------------------------- | +| `action` | `string` | 実行されたアクション。 `created `になりうる。 | +| `deployment_status` | `オブジェクト` | The [deployment status](/rest/reference/deployments#list-deployment-statuses). | +| `deployment_status["state"]` | `string` | 新しい状態。 `pending`、`success`、`failure`、`error` のいずれかを指定可。 | +| `deployment_status["target_url"]` | `string` | ステータスに追加されたオプションのリンク。 | +| `deployment_status["description"]` | `string` | オプションの人間可読の説明がステータスに追加。 | +| `deployment` | `オブジェクト` | The [deployment](/rest/reference/deployments#list-deployments) that this status is associated with. | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -712,7 +708,42 @@ GitHub Marketplace の購入に関連するアクティビティ。 {% data reus {{ webhookPayloadsForCurrentVersion.membership.removed }} -## メタ情報 +{% ifversion fpt or ghec %} + +## merge_group + +{% data reusables.pull_requests.merge-queue-beta %} + +Activity related to merge groups in a merge queue. アクティビティのタイプは、ペイロードオブジェクトのactionプロパティで指定されます。 + + +### 利用の可否 + +- リポジトリ webhook +- Organization webhook +- {% data variables.product.prodname_github_apps %} with the `merge_queues` permission + +### webhook ペイロードオブジェクト + +| キー | 種類 | 説明 | +| ----------------------- | -------- | --------------------------------------------------------------- | +| `action` | `string` | 実行されたアクション. Currently, can only be `checks_requested`. | +| `merge_group` | `オブジェクト` | The merge group. | +| `merge_group[head_sha]` | `string` | The SHA of the merge group. | +| `merge_group[head_ref]` | `string` | The full ref of the merge group. | +| `merge_group[base_ref]` | `string` | The full ref of the branch the merge group will be merged into. | +{% data reusables.webhooks.repo_desc %} +{% data reusables.webhooks.org_desc %} +{% data reusables.webhooks.app_desc %} +{% data reusables.webhooks.sender_desc %} + +### webhook ペイロードの例 + +{{ webhookPayloadsForCurrentVersion.merge_group.checks_requested }} + +{% endif %} + +## meta このイベントが設定されている webhook が削除されました。 このイベントは、イベントがインストールされている特定のフックへの変更のみをリッスンします。 したがって、メタイベントを受信するフックごとに選択する必要があります。 @@ -1441,7 +1472,7 @@ Activity related to enabling or disabling code security and analysis features fo | `state` | `string` | 新しい状態。 `pending`、`success`、`failure`、`error` のいずれかを指定可。 | | `説明` | `string` | オプションの人間可読の説明がステータスに追加。 | | `target_url` | `string` | ステータスに追加されたオプションのリンク。 | -| `ブランチ` | `array` | ステータスの SHA を含むブランチオブジェクトの配列。 各ブランチには特定の SHA が含まれていますが、SHA がブランチの先頭である場合とそうでない場合があります。 配列には最大 10 個のブランチが含まれます。 | +| `branches` | `array` | ステータスの SHA を含むブランチオブジェクトの配列。 各ブランチには特定の SHA が含まれていますが、SHA がブランチの先頭である場合とそうでない場合があります。 配列には最大 10 個のブランチが含まれます。 | {% data reusables.webhooks.repo_desc %} {% data reusables.webhooks.org_desc %} {% data reusables.webhooks.app_desc %} @@ -1547,7 +1578,7 @@ Activity related to enabling or disabling code security and analysis features fo {% ifversion fpt or ghes or ghec %} ## workflow_dispatch -このイベントは、 ユーザが GitHub でワークフローの実行をトリガーするか、「[ワークフローディスパッチイベントの作成](/rest/reference/actions/#create-a-workflow-dispatch-event)」エンドポイントに `POST` リクエストを送信したときに発生します。 詳しい情報については、「[ワークフローをトリガーするイベント](/actions/reference/events-that-trigger-workflows#workflow_dispatch)」を参照してください。 +このイベントは、 ユーザが GitHub でワークフローの実行をトリガーするか、「[ワークフローディスパッチイベントの作成](/rest/reference/actions/#create-a-workflow-dispatch-event)」エンドポイントに `POST` リクエストを送信したときに発生します。 詳しい情報については「[ワークフローをトリガーするイベント](/actions/reference/events-that-trigger-workflows#workflow_dispatch)」 ### 利用の可否 diff --git a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/index.md b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/index.md index 4deb19447a..444abb63dc 100644 --- a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/index.md +++ b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/index.md @@ -1,7 +1,7 @@ --- -title: 'Organizing your work with {% data variables.product.prodname_projects_v1 %}' +title: '{% data variables.product.prodname_projects_v1 %}での作業の整理' shortTitle: '{% data variables.product.prodname_projects_v1_caps %}' -intro: 'Use {% data variables.product.prodname_projects_v1 %} to manage your work on {% data variables.product.prodname_dotcom %}' +intro: '{% data variables.product.prodname_projects_v1 %}を使って{% data variables.product.prodname_dotcom %}上の作業を管理してください' allowTitleToDifferFromFilename: true versions: feature: projects-v1 diff --git a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/tracking-progress-on-your-project-board.md b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/tracking-progress-on-your-project-board.md index f69f17d3ea..088925c89a 100644 --- a/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/tracking-progress-on-your-project-board.md +++ b/translations/ja-JP/content/issues/organizing-your-work-with-project-boards/tracking-work-with-project-boards/tracking-progress-on-your-project-board.md @@ -1,6 +1,6 @@ --- -title: 'Tracking progress on your {% data variables.product.prodname_project_v1 %}' -intro: 'You can see the overall progress of your {% data variables.projects.projects_v1_board %} in a progress bar.' +title: '{% data variables.product.prodname_project_v1 %}の進捗の追跡' +intro: 'プログレスバーで、{% data variables.projects.projects_v1_board %}の全体の進捗を見ることができます。' redirect_from: - /github/managing-your-work-on-github/tracking-the-progress-of-your-work-with-project-boards/tracking-progress-on-your-project-board - /articles/tracking-progress-on-your-project-board @@ -9,7 +9,7 @@ versions: feature: projects-v1 topics: - Pull requests -shortTitle: 'Track progress on {% data variables.product.prodname_project_v1 %}' +shortTitle: '{% data variables.product.prodname_project_v1 %}の進捗の追跡' allowTitleToDifferFromFilename: true --- @@ -17,7 +17,7 @@ allowTitleToDifferFromFilename: true {% data reusables.project-management.project-progress-locations %} -1. Navigate to the {% data variables.projects.projects_v1_board %} where you want to enable or disable project progress tracking. +1. プロジェクトの進捗の追跡を有効化もしくは無効化したい{% data variables.projects.projects_v1_board %}にアクセスしてください。 {% data reusables.project-management.click-menu %} {% data reusables.project-management.click-edit-sidebar-menu-project-board %} 4. [**Track project progress**] を選択または選択解除します。 diff --git a/translations/ja-JP/content/issues/planning-and-tracking-with-projects/automating-your-project/automating-projects-using-actions.md b/translations/ja-JP/content/issues/planning-and-tracking-with-projects/automating-your-project/automating-projects-using-actions.md index 76308cc33f..53f1ce068f 100644 --- a/translations/ja-JP/content/issues/planning-and-tracking-with-projects/automating-your-project/automating-projects-using-actions.md +++ b/translations/ja-JP/content/issues/planning-and-tracking-with-projects/automating-your-project/automating-projects-using-actions.md @@ -1,7 +1,7 @@ --- -title: 'Automating {% data variables.product.prodname_projects_v2 %} using Actions' -shortTitle: Automating with Actions -intro: 'You can use {% data variables.product.prodname_actions %} to automate your projects.' +title: 'Actionsを使った{% data variables.product.prodname_projects_v2 %}の自動化' +shortTitle: Actionsでの自動化 +intro: '{% data variables.product.prodname_actions %}を使ってプロジェクトを自動化できます。' miniTocMaxHeadingLevel: 3 versions: feature: projects-v2 @@ -26,11 +26,11 @@ allowTitleToDifferFromFilename: true APIを通じてプロジェクトに対して行える他の変更に関する情報については「[APIを使ったプロジェクトの管理](/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects)」を参照してください。 -You may also want to use the **actions/add-to-project** workflow, which is maintained by {% data variables.product.company_short %} and will add the current issue or pull request to the project specified. For more information, see the [actions/add-to-project](https://github.com/actions/add-to-project) repository and README. +{% data variables.product.company_short %}がメンテナンスしており、現在のIssueもしくはPull Requestを指定されたプロジェクトに追加してくれる**actions/add-to-project**ワークフローを利用するのもよいでしょう。 詳しい情報については[actions/add-to-project](https://github.com/actions/add-to-project)リポジトリとREADMEを参照してください。 {% note %} -**Note:** `GITHUB_TOKEN` is scoped to the repository level and cannot access {% data variables.projects.projects_v2 %}. To access {% data variables.projects.projects_v2 %} you can either create a {% data variables.product.prodname_github_app %} (recommended for organization projects) or a personal access token (recommended for user projects). 以下には、どちらの方法のワークフローの例も示します。 +**ノート:** `GITHUB_TOKEN`はリポジトリレベルをスコープとしており、{% data variables.projects.projects_v2 %}にはアクセスできません。 {% data variables.projects.projects_v2 %}にアクセスするには、{% data variables.product.prodname_github_app %}を作成する(Organizationプロジェクトの場合に推奨)か、個人アクセストークンを作成(ユーザプロジェクトの場合に推奨)してください。 以下には、どちらの方法のワークフローの例も示します。 {% endnote %} diff --git a/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md b/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md index 24f946b0ac..88d51c336c 100644 --- a/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md +++ b/translations/ja-JP/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md @@ -19,20 +19,8 @@ redirect_from: {% data reusables.pull_requests.merge-queue-overview %} -The merge queue creates temporary branches with a special prefix to validate pull request changes. The changes in the pull request are then grouped with the latest version of the `base_branch` as well as changes ahead of it in the queue. {% data variables.product.product_name %} will merge all these changes into `base_branch` once the checks required by the branch protections of `base_branch` pass. +The merge queue creates temporary branches with a special prefix to validate pull request changes. The changes in the pull request are then grouped into a `merge_group` with the latest version of the `base_branch` as well as changes ahead of it in the queue. {% data variables.product.product_name %} will merge all these changes into `base_branch` once the checks required by the branch protections of `base_branch` pass. -You may need to update your Continuous Integration (CI) configuration to trigger builds on branch names that begin with the special prefix `gh-readonly-queue/{base_branch}` after the group is created. - -For example, with {% data variables.product.prodname_actions %}, a workflow with the following trigger will run each time a pull request that targets the base branch `main` is queued to merge. - -```yaml -on: - push: - branches: - - gh-readonly-queue/main/** -``` - -{% data reusables.pull_requests.merge-queue-merging-method %} For information about merge methods, see "[About pull request merges](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)." @@ -46,6 +34,24 @@ For information about merge methods, see "[About pull request merges](/pull-requ {% data reusables.pull_requests.merge-queue-reject %} +### Triggering merge group checks with {% data variables.product.prodname_actions %} + +You can use the `merge_group` event to trigger your {% data variables.product.prodname_actions %} workflow when a pull request is added to a merge queue. Note that this is a different event from the `pull_request` and `push` events. + +A workflow that reports a check which is required by the target branch's protections would look like this: + +```yaml +on: + pull_request: + merge_group: +``` + +For more information see "[Events that trigger workflows](/actions/using-workflows/events-that-trigger-workflows#merge-group)" + +### Triggering merge group checks with other CI providers + +With other CI providers, you may need to update your CI configuration to run when a branch that begins with the special prefix `gh-readonly-queue/{base_branch}` is created. + ## Managing a merge queue Repository administrators can require a merge by enabling the branch protection setting "Require merge queue" in the protection rules for the base branch. diff --git a/translations/ja-JP/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md b/translations/ja-JP/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md index 070e3eb9fa..0e514db1d1 100644 --- a/translations/ja-JP/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md +++ b/translations/ja-JP/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md @@ -16,6 +16,12 @@ topics: 発効日:**2021年4月2日** +{% note %} + +**Note:** Changes to the list of cookies on this page are currently pending. + +{% endnote %} + GitHubは、お客様のデータを当社が利用する方法、お客様のデータを当社が収集する方法、およびお客様のデータを共有する対象について、高い透明性を提供します。 この目的のため、[当社のサブプロセッサ](#github-subprocessors)および[クッキー](#cookies-on-github)の使用方法ついて説明するページをご用意しました。 ## GitHubのサブプロセッサ diff --git a/translations/ja-JP/data/release-notes/enterprise-server/3-6/0-rc1.yml b/translations/ja-JP/data/release-notes/enterprise-server/3-6/0-rc1.yml index e87fd18797..d89c83b617 100644 --- a/translations/ja-JP/data/release-notes/enterprise-server/3-6/0-rc1.yml +++ b/translations/ja-JP/data/release-notes/enterprise-server/3-6/0-rc1.yml @@ -178,29 +178,29 @@ sections: - | Pull Requestの**Files changed(変更されたファイル)**タブにあるファイルツリーを使って、ユーザは変更されたファイルに見ていき、変更のサイズとスコープを理解し、レビューに集中できます。このファイルツリーは、Pull Requestが少なくとも2つのファイルを変更しており、ブラウザのウィンドウが十分に広いときに表示されます。詳しい情報については「[Pull Requestで提案された変更のレビュー(/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)」及び「[Pull Requestのファイルのフィルタリング](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request)」を参照してください。 - | - Users can default to using pull requests titles as the commit message for all squash merges. For more information, see "[Configuring commit squashing for pull requests](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests)." + ユーザは、すべてのsquashマージでPull Requestのタイトルをコミットメッセージとして使うことをデフォルトにできます。詳しい情報については「[Pull Requestのコミットsquashの設定](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests)」を参照してください。 - heading: リリース notes: - | - When viewing the details for a particular release, users can see the creation date for each release asset. For more information, see "[Viewing your repository's releases and tags](/repositories/releasing-projects-on-github/viewing-your-repositorys-releases-and-tags)." - - While creating a release with automatically generated release notes, users can see the tag identified as the previous release, then choose to select a different tag to specify as the previous release. For more information, see "[Automatically generated release notes](/repositories/releasing-projects-on-github/automatically-generated-release-notes)." + 特定のリリースの詳細を表示させるとき、ユーザは各リリースのアセットの作成日を見ることができます。詳しい情報については「[リポジトリのリリースとタグの表示](/repositories/releasing-projects-on-github/viewing-your-repositorys-releases-and-tags)」を参照してください。 + - 自動的にリリースされたリリースノート付きでリリースを作成する場合、ユーザは以前のリリースとして識別されるタグを見ることができ、そして以前のリリースとして指定する異なるタグを選択できます。詳しい情報については「[自動的に生成されるリリースノート](/repositories/releasing-projects-on-github/automatically-generated-release-notes)」を参照してください。 - heading: Markdown notes: - | - Editing Markdown in the web interface has been improved. + WebインターフェースでのMarkdownの編集が改善されました。 - - After a user selects text and pastes a URL, the selected text will become a Markdown link to the pasted URL. - - When a user pastes spreadsheet cells or HTML tables, the resulting text will render as a table. - - When a user copies text containing links, the pasted text will include the link as a Markdown link. + - ユーザがテキストを選択してURLを貼り付けると、選択されたテキストは貼り付けられたURLへのMarkdownリンクになります。 + - ユーザがスプレッドシートのセルもしくはHTMLテーブルを貼り付けると、その結果のテキストは表として描画されます。 + - ユーザがリンクを含むテキストをコピーすると、貼り付けられたテキストはそのリンクをMarkdownのリンクとして含みます。 - For more information, see "[Basic writing and formatting syntax](/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#links)." + 詳しい情報については「[基本的な書き方とフォーマットの構文](/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#links)」を参照してください。 - | - When editing a Markdown file in the web interface, clicking the **Preview** tab will automatically scroll to the place in the preview that you were editing. The scroll location is based on the position of your cursor before you clicked the **Preview** tab. + MarkdownのファイルをWebインターフェースで編集する場合、**Preview(プレビュー)**タブをクリックすると自動的に編集中のプレビューの場所までスクロールします。スクロールの場所は、**Preview(プレビュー)**タブをクリックする前のカーソルの場所に基づきます。 changes: - - Interactive elements in the web interface such as links and buttons show a visible outline when focused with a keyboard, to help users find the current position on a page. In addition, when focused, form fields have a higher contrast outline. - - If a user refreshes the page while creating a new issue or pull request, the assignees, reviewers, labels and projects will all be preserved. + - リンクやボタンなどのWebインターフェースにおけるインタラクティブな要素は、キーボードでフォーカスされたときに視覚的なアウトラインを表示し、ユーザがページ上の現在の場所を見つけやすくします。加えて、フォームのフィールドはフォーカスされたときに、高コントラストのアウトラインを持つようになります。 + - 新しいIssueやPull Requestを作成する際にユーザがページを更新した場合、アサインされた人、レビュー担当者、ラベル、プロジェクトはすべて保持されます。 known_issues: - 新しくセットアップされたユーザを持たない{% data variables.product.prodname_ghe_server %}インスタンスで、攻撃者が最初の管理ユーザを作成できました。 - アップグレードの過程で、カスタムのファイアウォールのルールが削除されます。 @@ -209,7 +209,7 @@ sections: - GitHub Connectで"Users can search GitHub.com"が有効化されている場合、GitHub.comの検索結果にプライベート及びインターナルリポジトリのIssueが含まれません。 - '{% data variables.product.prodname_registry %}のnpmレジストリは、メタデータのレスポンス中で時間の値を返さなくなります。これは、大きなパフォーマンス改善のために行われました。メタデータレスポンスの一部として時間の値を返すために必要なすべてのデータは保持し続け、既存のパフォーマンスの問題を解決した将来に、この値を返すことを再開します。' - pre-receive フックの処理に固有のリソース制限によって、pre-receive フックに失敗するものが生じることがあります。 - - Actions services need to be restarted after restoring an instance from a backup taken on a different host. - - In a repository's settings, enabling the option to allow users with read access to create discussions does not enable this functionality. - - In some cases, users cannot convert existing issues to discussions. - - Custom patterns for secret scanning have `.*` as an end delimiter, specifically in the "After secret" field. This delimiter causes inconsistencies in scans for secrets across repositories, and you may notice gaps in a repository's history where no scans completed. Incremental scans may also be impacted. To prevent issues with scans, modify the end of the pattern to remove the `.*` delimiter. + - 他のホストで取られたバックアップからインスタンスを復元したあと、Actionsサービスは再起動する必要があります。 + - リポジトリの設定で、読み取りアクセスを持つユーザにディスカッションの作成を許可するオプションを有効化しても、この機能は有効化されません。 + - ユーザが既存のIssueをディスカッションに変換できないことがあります。 + - Secret scanningのカスタムパターンは、特に"After secret"パターンにおいて`.*`を終了の区切り文字として持ちます。この区切り文字は、リポジトリにまたがるシークレットのスキャンにおいて矛盾を生じさせ、スキャンがまったく完了していないというリポジトリの履歴のギャップに気づくかもしれません。インクリメンタルなスキャンにも影響があるかもしれません。スキャンの問題を回避するために、パターンの終わりから`.*`という区切り文字を取り除く修正をしてください。 diff --git a/translations/ja-JP/data/reusables/pull_requests/merge-queue-beta.md b/translations/ja-JP/data/reusables/pull_requests/merge-queue-beta.md index 8e28b8ae80..d1f5f775e2 100644 --- a/translations/ja-JP/data/reusables/pull_requests/merge-queue-beta.md +++ b/translations/ja-JP/data/reusables/pull_requests/merge-queue-beta.md @@ -1,7 +1,7 @@ {% ifversion fpt %} {% note %} -**Note:** The pull request merge queue feature is currently in limited public beta and subject to change. Organizations owners can request early access to the beta by joining the [waitlist](https://github.com/features/merge-queue/signup). +**Note:** The pull request merge queue feature is currently in limited public beta and subject to change. {% endnote %} diff --git a/translations/zh-CN/content/actions/examples/using-concurrency-expressions-and-a-test-matrix.md b/translations/zh-CN/content/actions/examples/using-concurrency-expressions-and-a-test-matrix.md index bc86e2a0d4..d17fb292a3 100644 --- a/translations/zh-CN/content/actions/examples/using-concurrency-expressions-and-a-test-matrix.md +++ b/translations/zh-CN/content/actions/examples/using-concurrency-expressions-and-a-test-matrix.md @@ -69,7 +69,7 @@ on: pull_request: push: branches: - - gh-readonly-queue/main/** + - main permissions: contents: read @@ -277,12 +277,12 @@ on: ```yaml{:copy} push: branches: - - gh-readonly-queue/main/** + - main ``` -添加 'push' 事件,以便每次将提交推送到与筛选器 'gh-readonly-queue/main/**' 匹配的分支时,工作流程都会自动运行。 更多信息请参阅 [`push`](/actions/using-workflows/events-that-trigger-workflows#push)。 +Add the `push` event, so that the workflow runs automatically every time a commit is pushed to a branch matching the filter `main`. 更多信息请参阅 [`push`](/actions/using-workflows/events-that-trigger-workflows#push)。 diff --git a/translations/zh-CN/content/actions/using-workflows/events-that-trigger-workflows.md b/translations/zh-CN/content/actions/using-workflows/events-that-trigger-workflows.md index 22ac9b1ff2..4ab6eaa0c2 100644 --- a/translations/zh-CN/content/actions/using-workflows/events-that-trigger-workflows.md +++ b/translations/zh-CN/content/actions/using-workflows/events-that-trigger-workflows.md @@ -381,6 +381,34 @@ on: types: [created, deleted] ``` +{% ifversion fpt or ghec %} + +### `merge_group` + +| Web 挂钩事件有效负载 | 活动类型 | `GITHUB_SHA` | `GITHUB_REF` | +| -------------------------------------------------------------------------------------------------- | ------------------ | ---------------------- | ---------------------- | +| [`merge_group`](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads/#merge_group) | `checks_requested` | SHA of the merge group | Ref of the merge group | + +{% data reusables.pull_requests.merge-queue-beta %} + +{% note %} + +**Note**: {% data reusables.developer-site.multiple_activity_types %} Although only the `checks_requested` activity type is supported, specifying the activity type will keep your workflow specific if more activity types are added in the future. For information about each activity type, see "[Webhook events and payloads](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#merge_group)." {% data reusables.developer-site.limit_workflow_to_activity_types %} + +{% endnote %} + +Runs your workflow when a pull request is added to a merge queue, which adds the pull request to a merge group. For more information see "[Merging a pull request with a merge queue](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue)". + +For example, you can run a workflow when the `checks_requested` activity has occurred. + +```yaml +on: + merge_group: + types: [checks_requested] + +``` + +{% endif %} ### `里程碑` | Web 挂钩事件有效负载 | 活动类型 | `GITHUB_SHA` | `GITHUB_REF` | @@ -415,7 +443,7 @@ on: {% data reusables.actions.branch-requirement %} -当有人推送到作为 {% data variables.product.prodname_pages %} 的发布源的分支时,如果为存储库启用了 {% data variables.product.prodname_pages %} ,则运行工作流程。 有关 {% data variables.product.prodname_pages %} 发布源的详细信息,请参阅“[为 GitHub Pages 站点配置发布源](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)”。 有关 REST API 的信息,请参阅“[页面](/rest/reference/repos#pages)”。 +当有人推送到作为 {% data variables.product.prodname_pages %} 的发布源的分支时,如果为存储库启用了 {% data variables.product.prodname_pages %} ,则运行工作流程。 For more information about {% data variables.product.prodname_pages %} publishing sources, see "[Configuring a publishing source for your GitHub Pages site](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)." 有关 REST API 的信息,请参阅“[页面](/rest/reference/repos#pages)”。 例如,您可以在发生 `page_build` 事件时运行工作流程。 @@ -612,7 +640,7 @@ on: pull_request: types: - opened - branches: + branches: - 'releases/**' ``` @@ -625,7 +653,7 @@ on: pull_request: types: - opened - branches: + branches: - 'releases/**' paths: - '**.js' @@ -670,7 +698,7 @@ on: pull_request: types: - opened - branches: + branches: - 'releases/**' paths: - '**.js' @@ -809,7 +837,7 @@ on: pull_request_target: types: - opened - branches: + branches: - 'releases/**' ``` @@ -822,7 +850,7 @@ on: pull_request_target: types: - opened - branches: + branches: - 'releases/**' paths: - '**.js' @@ -867,7 +895,7 @@ on: pull_request_target: types: - opened - branches: + branches: - 'releases/**' paths: - '**.js' @@ -936,7 +964,7 @@ on: ```yaml on: push: - branches: + branches: - 'main' - 'releases/**' ``` @@ -948,7 +976,7 @@ on: ```yaml on: push: - branches: + branches: - 'releases/**' paths: - '**.js' @@ -965,7 +993,7 @@ on: ```yaml on: push: - tags: + tags: - v1.** ``` @@ -989,7 +1017,7 @@ on: ```yaml on: push: - branches: + branches: - 'releases/**' paths: - '**.js' @@ -1252,26 +1280,26 @@ on: workflow_dispatch 此示例定义了称为 `logLevel`、`tags` 和 `environment` 的输入。 在运行工作流程时,可以将这些输入的值传递给工作流程。 然后,此工作流程使用 {% ifversion actions-unified-inputs %}`inputs.logLevel`、`inputs.tags` 和 `inputs.environment`{% else %}`github.event.inputs.logLevel`、`github.event.inputs.tags`)和 `github.event.inputs.environment`{% endif %} 上下文属性,将值打印到日志中。 ```yaml -on: +on: workflow_dispatch: inputs: logLevel: - description: 'Log level' + description: 'Log level' required: true - default: 'warning' + default: 'warning' type: choice options: - info - warning - - debug + - debug tags: description: 'Test scenario tags' - required: false + required: false type: boolean environment: description: 'Environment to run tests against' type: environment - required: true + required: true jobs: log-the-inputs: @@ -1422,7 +1450,7 @@ jobs: upload: runs-on: ubuntu-latest - steps: + steps: - name: Save PR number env: PR_NUMBER: {% raw %}${{ github.event.number }}{% endraw %} diff --git a/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md index 7e11bed715..d6eaa28728 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md @@ -16,9 +16,6 @@ topics: - Webhooks shortTitle: Webhook events & payloads --- -{% ifversion fpt or ghec %} - -{% endif %} {% data reusables.webhooks.webhooks_intro %} @@ -100,7 +97,7 @@ Also, the `User-Agent` for the requests will have the prefix `GitHub-Hookshot/`. > } ``` -{% ifversion fpt or ghes > 3.2 or ghae or ghec %} +{% ifversion fpt or ghes > 3.3 or ghae or ghec %} ## branch_protection_rule Activity related to a branch protection rule. For more information, see "[About branch protection rules](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#about-branch-protection-rules)." @@ -711,6 +708,41 @@ For a detailed description of this payload and the payload for each type of `act {{ webhookPayloadsForCurrentVersion.membership.removed }} +{% ifversion fpt or ghec %} + +## merge_group + +{% data reusables.pull_requests.merge-queue-beta %} + +Activity related to merge groups in a merge queue. The type of activity is specified in the action property of the payload object. + + +### Availability + +- Repository webhooks +- Organization webhooks +- {% data variables.product.prodname_github_apps %} with the `merge_queues` permission + +### Webhook payload object + +Key | Type | Description +----|------|------------- +`action`|`string` | The action that was performed. Currently, can only be `checks_requested`. +`merge_group`|`object` | The merge group. +`merge_group[head_sha]`|`string` | The SHA of the merge group. +`merge_group[head_ref]`|`string` | The full ref of the merge group. +`merge_group[base_ref]`|`string` | The full ref of the branch the merge group will be merged into. +{% data reusables.webhooks.repo_desc %} +{% data reusables.webhooks.org_desc %} +{% data reusables.webhooks.app_desc %} +{% data reusables.webhooks.sender_desc %} + +### Webhook payload example + +{{ webhookPayloadsForCurrentVersion.merge_group.checks_requested }} + +{% endif %} + ## meta The webhook this event is configured on was deleted. This event will only listen for changes to the particular hook the event is installed on. Therefore, it must be selected for each hook that you'd like to receive meta events for. @@ -1324,7 +1356,7 @@ Key | Type | Description {% ifversion fpt or ghes or ghec %} ## security_advisory -Activity related to a security advisory that has been reviewed by {% data variables.product.company_short %}. A {% data variables.product.company_short %}-reviewed security advisory provides information about security-related vulnerabilities in software on {% data variables.product.prodname_dotcom %}. +Activity related to a security advisory that has been reviewed by {% data variables.product.company_short %}. A {% data variables.product.company_short %}-reviewed security advisory provides information about security-related vulnerabilities in software on {% data variables.product.prodname_dotcom %}. The security advisory dataset also powers the GitHub {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies/)." diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md index ecf8c6cfd4..682b176c38 100644 --- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md +++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md @@ -19,20 +19,8 @@ redirect_from: {% data reusables.pull_requests.merge-queue-overview %} -合并队列创建具有特殊前缀的临时分支,以验证拉取请求更改。 然后,拉取请求中的更改将与最新版本的 `base_branch` 以及队列中位于其前面的更改组合。 {% data variables.product.product_name %} 将在 `base_branch` 的分支保护所需的检查通过后,将所有这些更改合并到 `base_branch` 中。 +合并队列创建具有特殊前缀的临时分支,以验证拉取请求更改。 The changes in the pull request are then grouped into a `merge_group` with the latest version of the `base_branch` as well as changes ahead of it in the queue. {% data variables.product.product_name %} 将在 `base_branch` 的分支保护所需的检查通过后,将所有这些更改合并到 `base_branch` 中。 -您可能需要更新持续集成 (CI) 配置,以便在创建组后触发以特殊前缀 `gh-readonly-queue/{base_branch}` 开头的分支名称的构建。 - -例如,使用 {% data variables.product.prodname_actions %},每当面向基本分支 `main` 的拉取请求排队等待合并时,都会运行具有以下触发器的工作流程。 - -```yaml -on: - push: - branches: - - gh-readonly-queue/main/** -``` - -{% data reusables.pull_requests.merge-queue-merging-method %} 有关合并方法的信息,请参阅“[关于拉取请求合并](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)”。 @@ -46,6 +34,24 @@ on: {% data reusables.pull_requests.merge-queue-reject %} +### Triggering merge group checks with {% data variables.product.prodname_actions %} + +You can use the `merge_group` event to trigger your {% data variables.product.prodname_actions %} workflow when a pull request is added to a merge queue. Note that this is a different event from the `pull_request` and `push` events. + +A workflow that reports a check which is required by the target branch's protections would look like this: + +```yaml +on: + pull_request: + merge_group: +``` + +For more information see "[Events that trigger workflows](/actions/using-workflows/events-that-trigger-workflows#merge-group)" + +### Triggering merge group checks with other CI providers + +With other CI providers, you may need to update your CI configuration to run when a branch that begins with the special prefix `gh-readonly-queue/{base_branch}` is created. + ## 管理合并队列 存储库管理员可以通过在基本分支的保护规则中启用分支保护设置“需要合并队列”来要求合并。 diff --git a/translations/zh-CN/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md b/translations/zh-CN/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md index 1260daacf1..ace6586271 100644 --- a/translations/zh-CN/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md +++ b/translations/zh-CN/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md @@ -16,6 +16,12 @@ topics: 生效日期:**2021 年 4 月 2 日** +{% note %} + +**Note:** Changes to the list of cookies on this page are currently pending. + +{% endnote %} + GitHub 在如何使用您的数据、如何收集您的数据以及与谁分享您的数据方面提供很大的透明度。 为此,我们提供此页面,以详细介绍了我们的[子处理商](#github-subprocessors),以及我们如何使用 [cookie](#cookies-on-github)。 ## GitHub 子处理商 diff --git a/translations/zh-CN/data/reusables/pull_requests/merge-queue-beta.md b/translations/zh-CN/data/reusables/pull_requests/merge-queue-beta.md index 338f9165d8..197a128d19 100644 --- a/translations/zh-CN/data/reusables/pull_requests/merge-queue-beta.md +++ b/translations/zh-CN/data/reusables/pull_requests/merge-queue-beta.md @@ -1,7 +1,7 @@ {% ifversion fpt %} {% note %} -**注意:** 拉取请求合并队列功能目前处于有限公测阶段,可能会发生更改。 组织所有者可以通过加入[等待列表](https://github.com/features/merge-queue/signup)来请求提前访问测试版。 +**注意:** 拉取请求合并队列功能目前处于有限公测阶段,可能会发生更改。 {% endnote %}