From 1ba55397c8de6ec9a0e0a71c5c2223412455b1b0 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Fri, 11 Mar 2022 20:45:46 +0000 Subject: [PATCH 01/18] update enterprise contact link --- components/GenericError.tsx | 9 +-------- components/page-footer/Support.tsx | 8 +------- pages/404.tsx | 8 +------- tests/rendering/footer.js | 4 ++-- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/components/GenericError.tsx b/components/GenericError.tsx index 88cd4ee20359..c3f5b4dff71b 100644 --- a/components/GenericError.tsx +++ b/components/GenericError.tsx @@ -3,12 +3,9 @@ import Link from 'next/link' import { useRouter } from 'next/router' import { MarkGithubIcon, CommentDiscussionIcon } from '@primer/octicons-react' -import { useVersion } from 'components/hooks/useVersion' import { Lead } from 'components/ui/Lead' export function GenericError() { - const { isEnterprise } = useVersion() - return (
@@ -28,11 +25,7 @@ export function GenericError() {

diff --git a/components/page-footer/Support.tsx b/components/page-footer/Support.tsx index 9613ad6f4a1f..75876eba6008 100644 --- a/components/page-footer/Support.tsx +++ b/components/page-footer/Support.tsx @@ -1,11 +1,9 @@ import { PeopleIcon, CommentDiscussionIcon } from '@primer/octicons-react' import { useTranslation } from 'components/hooks/useTranslation' -import { useVersion } from 'components/hooks/useVersion' import { useMainContext } from 'components/context/MainContext' export const Support = () => { - const { isEnterprise } = useVersion() const { t } = useTranslation('support') const { communityRedirect } = useMainContext() @@ -25,11 +23,7 @@ export const Support = () => {
diff --git a/pages/404.tsx b/pages/404.tsx index bb555a71981f..aea3d11ac867 100644 --- a/pages/404.tsx +++ b/pages/404.tsx @@ -1,11 +1,9 @@ import { SimpleHeader, SimpleFooter } from 'components/GenericError' import Head from 'next/head' import { CommentDiscussionIcon } from '@primer/octicons-react' -import { useVersion } from 'components/hooks/useVersion' import { Lead } from 'components/ui/Lead' const Custom404 = () => { - const { isEnterprise } = useVersion() return (
@@ -25,11 +23,7 @@ const Custom404 = () => {

diff --git a/tests/rendering/footer.js b/tests/rendering/footer.js index 46f5af6525a4..5504a378b822 100644 --- a/tests/rendering/footer.js +++ b/tests/rendering/footer.js @@ -14,12 +14,12 @@ describe('footer', () => { test('leads to Enterprise support on Enterprise pages', async () => { const $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.latest}`) - expect($('a#contact-us').attr('href')).toBe('https://enterprise.github.com/support') + expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') }) test('leads to Enterprise support on GHEC pages', async () => { const $ = await getDOM('/en/enterprise-cloud@latest') - expect($('a#contact-us').attr('href')).toBe('https://enterprise.github.com/support') + expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') }) test('leads to dotcom support on 404 pages', async () => { From f69a72a718cf66f92a5a6edb8e6dd229b660b17a Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 14 Mar 2022 07:55:28 -0700 Subject: [PATCH 02/18] Update components/GenericError.tsx Co-authored-by: Peter Bengtsson --- components/GenericError.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/GenericError.tsx b/components/GenericError.tsx index c3f5b4dff71b..a10583d508fa 100644 --- a/components/GenericError.tsx +++ b/components/GenericError.tsx @@ -25,7 +25,7 @@ export function GenericError() {

From 2de792f3ae3f6b13d2bed3bd6d628952ccf209bb Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 14 Mar 2022 07:55:37 -0700 Subject: [PATCH 03/18] Update components/page-footer/Support.tsx Co-authored-by: Peter Bengtsson --- components/page-footer/Support.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/page-footer/Support.tsx b/components/page-footer/Support.tsx index 75876eba6008..5e84238574c9 100644 --- a/components/page-footer/Support.tsx +++ b/components/page-footer/Support.tsx @@ -23,7 +23,7 @@ export const Support = () => {
From f57a9801c395b25b9c69f394be2ff89d900f246b Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 14 Mar 2022 07:55:48 -0700 Subject: [PATCH 04/18] Update pages/404.tsx Co-authored-by: Peter Bengtsson --- pages/404.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/404.tsx b/pages/404.tsx index aea3d11ac867..496e4b9ae395 100644 --- a/pages/404.tsx +++ b/pages/404.tsx @@ -23,7 +23,7 @@ const Custom404 = () => {

From 2fe134919e775259ad8a191f60ea8abd589c4a72 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 14 Mar 2022 08:25:48 -0700 Subject: [PATCH 05/18] Update GenericError.tsx Making the linter happy --- components/GenericError.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/GenericError.tsx b/components/GenericError.tsx index a10583d508fa..24bbdf86a3d6 100644 --- a/components/GenericError.tsx +++ b/components/GenericError.tsx @@ -25,7 +25,7 @@ export function GenericError() {

From 0f2f23799aec423136a83960a2e81fb9bec13401 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 14 Mar 2022 08:31:43 -0700 Subject: [PATCH 06/18] Update 404.tsx making the linter happy --- pages/404.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/404.tsx b/pages/404.tsx index 496e4b9ae395..db0d2c5b1f76 100644 --- a/pages/404.tsx +++ b/pages/404.tsx @@ -23,7 +23,7 @@ const Custom404 = () => {

From cbc92f1956843ae97b6e5027848e3512d014466c Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 14 Mar 2022 08:32:20 -0700 Subject: [PATCH 07/18] Update Support.tsx making the linter happy --- components/page-footer/Support.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/page-footer/Support.tsx b/components/page-footer/Support.tsx index 5e84238574c9..a09d6bbacaf5 100644 --- a/components/page-footer/Support.tsx +++ b/components/page-footer/Support.tsx @@ -23,7 +23,7 @@ export const Support = () => {
From a61ebaa066954e7da7c8c1ad398b20ebb69c5a11 Mon Sep 17 00:00:00 2001 From: Sarah Edwards Date: Mon, 14 Mar 2022 08:53:24 -0700 Subject: [PATCH 08/18] point to deployment guidance (#26129) --- .../about-deployments/deploying-with-github-actions.md | 4 +++- data/reusables/actions/cd-templates-actions.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/content/actions/deployment/about-deployments/deploying-with-github-actions.md b/content/actions/deployment/about-deployments/deploying-with-github-actions.md index 60116eae147d..f84c55082675 100644 --- a/content/actions/deployment/about-deployments/deploying-with-github-actions.md +++ b/content/actions/deployment/about-deployments/deploying-with-github-actions.md @@ -132,6 +132,8 @@ jobs: # ...deployment-specific steps ``` +For guidance on writing deployment-specific steps, see "[Finding deployment examples](#finding-deployment-examples)." + ## Viewing deployment history When a {% data variables.product.prodname_actions %} workflow deploys to an environment, the environment is displayed on the main page of the repository. For more information about viewing deployments to environments, see "[Viewing deployment history](/developers/overview/viewing-deployment-history)." @@ -164,7 +166,7 @@ You can use a status badge to display the status of your deployment workflow. {% For more information, see "[Adding a workflow status badge](/actions/managing-workflow-runs/adding-a-workflow-status-badge)." -## Next steps +## Finding deployment examples This article demonstrated features of {% data variables.product.prodname_actions %} that you can add to your deployment workflows. diff --git a/data/reusables/actions/cd-templates-actions.md b/data/reusables/actions/cd-templates-actions.md index 7bc93daf9a4d..9ad1e090b0e2 100644 --- a/data/reusables/actions/cd-templates-actions.md +++ b/data/reusables/actions/cd-templates-actions.md @@ -1,3 +1,3 @@ -{% data variables.product.product_name %} offers CD starter workflow for several popular services, such as Azure Web App. To learn how to get started using a starter workflow, see "[Using starter workflows](/actions/learn-github-actions/using-starter-workflows)" or [browse the full list of deployment starter workflows](https://github.com/actions/starter-workflows/tree/main/deployments). You can also check out our more detailed guides for specific deployment workflows, such as "[Deploying to Azure App Service](/actions/deployment/deploying-to-azure-app-service)." +{% data variables.product.product_name %} offers deployment starter workflows for several popular services, such as Azure Web App. To learn how to get started using a starter workflow, see "[Using starter workflows](/actions/learn-github-actions/using-starter-workflows)" or [browse the full list of deployment starter workflows](https://github.com/actions/starter-workflows/tree/main/deployments). You can also check out our more detailed guides for specific deployment workflows, such as "[Deploying to Azure App Service](/actions/deployment/deploying-to-azure-app-service)." Many service providers also offer actions on {% data variables.product.prodname_marketplace %} for deploying to their service. For the full list, see [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?category=deployment&type=actions). From ea49b45ec4922d26b24f39e002ae7acb492c515a Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 14 Mar 2022 08:59:29 -0700 Subject: [PATCH 09/18] Update footer.js removed unnecessary tests --- tests/rendering/footer.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tests/rendering/footer.js b/tests/rendering/footer.js index 5504a378b822..bb68476a8960 100644 --- a/tests/rendering/footer.js +++ b/tests/rendering/footer.js @@ -7,22 +7,12 @@ describe('footer', () => { jest.setTimeout(10 * 60 * 1000) describe('"contact us" link', () => { - test('leads to dotcom support on dotcom pages', async () => { + test('leads to support and articles', async () => { const $ = await getDOM(`/en/${nonEnterpriseDefaultVersion}/github`) expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') }) - test('leads to Enterprise support on Enterprise pages', async () => { - const $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.latest}`) - expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') - }) - - test('leads to Enterprise support on GHEC pages', async () => { - const $ = await getDOM('/en/enterprise-cloud@latest') - expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') - }) - - test('leads to dotcom support on 404 pages', async () => { + test('leads to support on 404 pages', async () => { const $ = await getDOM('/delicious-snacks/donuts.php', { allow404: true }) expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') }) From c7de0c20b98471e85bc54d38191322deb96e18a1 Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Mon, 14 Mar 2022 12:02:02 -0400 Subject: [PATCH 10/18] Add 'GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY' to actions self-hosted runner doc (#25757) Co-authored-by: Edward Thomson Co-authored-by: Sarah Edwards --- .../about-self-hosted-runners.md | 2 ++ ...and-troubleshooting-self-hosted-runners.md | 25 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index d086fee7b1be..f2904902c919 100644 --- a/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -197,6 +197,8 @@ You must ensure that the machine has the appropriate network access to communica You can also use self-hosted runners with a proxy server. For more information, see "[Using a proxy server with self-hosted runners](/actions/automating-your-workflow-with-github-actions/using-a-proxy-server-with-self-hosted-runners)." +For more information about troubleshooting common network connectivity issues, see "[Monitoring and troubleshooting self-hosted runners](/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners#troubleshooting-network-connectivity)." + {% ifversion ghes %} ## Communication between self-hosted runners and {% data variables.product.prodname_dotcom_the_website %} diff --git a/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md b/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md index 71a7221f3777..95f3f2a9f362 100644 --- a/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md @@ -32,7 +32,9 @@ shortTitle: Monitor & troubleshoot * **Active**: The runner is currently executing a job. * **Offline**: The runner is not connected to {% data variables.product.product_name %}. This could be because the machine is offline, the self-hosted runner application is not running on the machine, or the self-hosted runner application cannot communicate with {% data variables.product.product_name %}. -## Checking self-hosted runner network connectivity +## Troubleshooting network connectivity + +### Checking self-hosted runner network connectivity You can use the self-hosted runner application's `run` script with the `--check` parameter to check that a self-hosted runner can access all required network services on {% data variables.product.product_location %}. @@ -65,6 +67,27 @@ The script tests each service, and outputs either a `PASS` or `FAIL` for each on If you have any failing checks, you should also verify that your self-hosted runner machine meets all the communication requirements. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners#communication-requirements)." +### Disabling TLS certificate verification +{% ifversion ghes %} +By default, the self-hosted runner application verifies the TLS certificate for {% data variables.product.product_name %}. If your {% data variables.product.product_name %} has a self-signed or internally-issued certificate, you may wish to disable TLS certificate verification for testing purposes. +{% else %} +By default, the self-hosted runner application verifies the TLS certificate for {% data variables.product.product_name %}. If you encounter network problems, you may wish to disable TLS certificate verification for testing purposes. +{% endif %} + +To disable TLS certification verification in the self-hosted runner application, set the `GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY` environment variable to `1` before configuring and running the self-hosted runner application. + +```shell +export GITHUB_ACTIONS_RUNNER_TLS_NO_VERIFY=1 +./config.sh --url https://github.com/octo-org/octo-repo --token +./run.sh +``` + +{% warning %} + +**Warning**: Disabling TLS verification is not recommended since TLS provides privacy and data integrity between the self-hosted runner application and {% data variables.product.product_name %}. We recommend that you install the {% data variables.product.product_name %} certificate in the operating system certificate store for your self-hosted runner. For guidance on how to install the {% data variables.product.product_name %} certificate, check with your operating system vendor. + +{% endwarning %} + ## Reviewing the self-hosted runner application log files You can monitor the status of the self-hosted runner application and its activities. Log files are kept in the `_diag` directory where you installed the runner application, and a new log is generated each time the application is started. The filename begins with *Runner_*, and is followed by a UTC timestamp of when the application was started. From bb23efed69f01720960521d63659180df18019a0 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 14 Mar 2022 09:08:43 -0700 Subject: [PATCH 11/18] Update footer.js --- tests/rendering/footer.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/rendering/footer.js b/tests/rendering/footer.js index bb68476a8960..ff06162b2c59 100644 --- a/tests/rendering/footer.js +++ b/tests/rendering/footer.js @@ -1,5 +1,4 @@ import { getDOM } from '../helpers/supertest.js' -import enterpriseServerReleases from '../../lib/enterprise-server-releases.js' import nonEnterpriseDefaultVersion from '../../lib/non-enterprise-default-version.js' import { jest } from '@jest/globals' @@ -7,7 +6,7 @@ describe('footer', () => { jest.setTimeout(10 * 60 * 1000) describe('"contact us" link', () => { - test('leads to support and articles', async () => { + test('leads to support from articles', async () => { const $ = await getDOM(`/en/${nonEnterpriseDefaultVersion}/github`) expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') }) @@ -19,7 +18,7 @@ describe('footer', () => { }) describe('"contact us" link with nextjs', () => { - test('leads to dotcom support on dotcom pages', async () => { + test('leads to support from articles', async () => { const $ = await getDOM(`/en/${nonEnterpriseDefaultVersion}/github?nextjs=`) expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact') }) From ce3c52e06c323e0a5c781ad2bbed029eb145fda2 Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Mon, 14 Mar 2022 09:19:59 -0700 Subject: [PATCH 12/18] New translation batch for cn (#26147) * Add crowdin translations * Run script/i18n/homogenize-frontmatter.js * Run script/i18n/lint-translation-files.js --check parsing * Run script/i18n/lint-translation-files.js --check rendering * run script/i18n/reset-files-with-broken-liquid-tags.js --language=cn * run script/i18n/reset-known-broken-translation-files.js * Check in cn CSV report Co-authored-by: Robert Sese --- translations/log/cn-resets.csv | 11 +- .../about-continuous-integration.md | 32 +- .../building-and-testing-java-with-ant.md | 2 +- .../building-and-testing-java-with-gradle.md | 14 +- .../building-and-testing-java-with-maven.md | 8 +- .../building-and-testing-net.md | 2 +- .../building-and-testing-nodejs.md | 2 +- .../building-and-testing-python.md | 16 +- .../building-and-testing-ruby.md | 2 +- .../building-and-testing-swift.md | 8 +- .../creating-actions/about-custom-actions.md | 12 +- .../creating-a-javascript-action.md | 4 +- .../deployment/about-deployments/index.md | 3 +- .../deploying-xcode-applications/index.md | 3 +- .../zh-CN/content/actions/deployment/index.md | 2 +- .../managing-your-deployments/index.md | 3 +- .../targeting-different-environments/index.md | 3 +- .../about-self-hosted-runners.md | 5 +- ...-hosted-runner-application-as-a-service.md | 2 +- ...ess-to-self-hosted-runners-using-groups.md | 51 +++- .../actions/learn-github-actions/contexts.md | 281 +++++++++--------- .../environment-variables.md | 114 +++---- .../learn-github-actions/expressions.md | 70 ++--- ...-from-azure-pipelines-to-github-actions.md | 2 +- ...ting-from-gitlab-cicd-to-github-actions.md | 2 +- ...rating-from-travis-ci-to-github-actions.md | 4 +- .../security-guides/encrypted-secrets.md | 40 +-- .../content/actions/security-guides/index.md | 6 +- .../security-hardening-for-github-actions.md | 2 +- .../using-containerized-services/index.md | 6 +- ...hing-dependencies-to-speed-up-workflows.md | 2 +- .../using-workflows/reusing-workflows.md | 2 + .../using-workflows/triggering-a-workflow.md | 2 +- .../workflow-commands-for-github-actions.md | 2 +- .../managing-dormant-users.md | 1 - ...-token-for-use-with-saml-single-sign-on.md | 4 +- .../index.md | 2 +- .../about-ssh.md | 25 +- ...ng-a-new-ssh-key-to-your-github-account.md | 10 +- .../checking-for-existing-ssh-keys.md | 8 +- ...-ssh-key-and-adding-it-to-the-ssh-agent.md | 99 +++--- .../testing-your-ssh-connection.md | 2 +- .../about-anonymized-urls.md | 2 +- .../about-githubs-ip-addresses.md | 4 +- .../authorizing-github-apps.md | 19 +- ...onnecting-with-third-party-applications.md | 22 +- .../creating-a-personal-access-token.md | 55 ++-- .../creating-a-strong-password.md | 6 +- .../index.md | 2 +- .../reviewing-your-deploy-keys.md | 2 +- .../reviewing-your-security-log.md | 76 ++--- .../reviewing-your-ssh-keys.md | 2 +- .../token-expiration-and-revocation.md | 42 +-- ...updating-your-github-access-credentials.md | 6 +- ...ng-a-new-gpg-key-to-your-github-account.md | 4 +- .../associating-an-email-with-your-gpg-key.md | 2 +- .../checking-for-existing-gpg-keys.md | 4 +- .../telling-git-about-your-signing-key.md | 8 +- .../about-two-factor-authentication.md | 4 +- ...-github-using-two-factor-authentication.md | 64 ++-- ...delivery-methods-for-your-mobile-device.md | 2 +- .../configuring-two-factor-authentication.md | 117 ++++---- ...s-where-sms-authentication-is-supported.md | 124 ++++---- .../index.md | 2 +- ...ccount-if-you-lose-your-2fa-credentials.md | 45 +-- .../error-key-already-in-use.md | 2 +- .../error-permission-denied-publickey.md | 6 +- .../using-ssh-over-the-https-port.md | 2 +- .../about-billing-for-github-actions.md | 2 +- .../about-billing-for-codespaces.md | 2 +- .../about-billing-for-github-packages.md | 4 +- .../sarif-support-for-code-scanning.md | 8 +- ...ng-from-the-codeql-runner-to-codeql-cli.md | 52 ++-- .../zh-CN/content/code-security/guides.md | 5 + .../zh-CN/content/code-security/index.md | 28 +- ...nerable-dependencies-in-your-repository.md | 10 +- .../about-dependency-review.md | 13 +- ...abling-codespaces-for-your-organization.md | 48 +-- ...g-allowed-ip-addresses-for-a-github-app.md | 23 +- .../events/issue-event-types.md | 2 +- ...roject-to-github-using-the-command-line.md | 165 ---------- .../adding-locally-hosted-code-to-github.md | 162 ++++++++++ .../importing-source-code-to-github/index.md | 2 +- .../github-cli/using-github-cli-extensions.md | 22 +- translations/zh-CN/content/index.md | 2 +- .../about-projects.md | 2 +- .../best-practices-for-managing-projects.md | 2 +- .../creating-a-project.md | 6 +- .../customizing-your-project-views.md | 9 +- .../filtering-projects.md | 26 ++ .../index.md | 3 + .../managing-iterations.md | 64 ++++ .../using-insights-with-projects.md | 29 ++ ...owed-ip-addresses-for-your-organization.md | 13 +- ...ing-the-audit-log-for-your-organization.md | 8 +- ...rs-to-repositories-in-your-organization.md | 8 +- ...g-people-with-access-to-your-repository.md | 23 +- ...ssions-for-adding-outside-collaborators.md | 13 +- .../roles-in-an-organization.md | 117 ++++---- ...ng-dependency-changes-in-a-pull-request.md | 2 + ...wing-proposed-changes-in-a-pull-request.md | 2 +- .../adding-a-file-to-a-repository.md | 2 +- .../features/restrict-groups-to-workflows.yml | 7 + .../data/learning-tracks/code-security.yml | 45 +-- .../code-security/code-examples.yml | 9 +- .../accounts/you-must-know-your-password.md | 2 +- .../actions/restrict-runner-workflow-beta.md | 7 + .../actions/runner-group-assign-policy-org.md | 4 +- .../runner-group-assign-policy-repo.md | 2 +- .../runner-group-assign-policy-workflow.md | 6 + ...ed-runner-configure-runner-group-access.md | 4 +- ...lf-hosted-runner-configure-runner-group.md | 1 + .../actions/workflow-dispatch-inputs.md | 10 +- ...ection-run-on-specific-branches-or-tags.md | 2 +- .../reusables/dotcom_billing/pricing_cal.md | 1 - .../pricing_calculator/pricing_cal_actions.md | 1 + .../pricing_cal_codespaces.md | 1 + .../pricing_cal_packages.md | 1 + .../gated-features/allowed-ip-addresses.md | 1 - .../gated-features/dependency-review.md | 16 +- .../restrict-add-collaborator.md | 1 - .../getting-started/managing-org-policies.md | 2 +- .../data/reusables/projects/insights-alpha.md | 5 + .../reusables/projects/projects-filters.md | 9 + translations/zh-CN/data/ui.yml | 1 + 125 files changed, 1402 insertions(+), 1110 deletions(-) delete mode 100644 translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line.md create mode 100644 translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-locally-hosted-code-to-github.md create mode 100644 translations/zh-CN/content/issues/trying-out-the-new-projects-experience/filtering-projects.md create mode 100644 translations/zh-CN/content/issues/trying-out-the-new-projects-experience/managing-iterations.md create mode 100644 translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md create mode 100644 translations/zh-CN/data/features/restrict-groups-to-workflows.yml create mode 100644 translations/zh-CN/data/reusables/actions/restrict-runner-workflow-beta.md create mode 100644 translations/zh-CN/data/reusables/actions/runner-group-assign-policy-workflow.md create mode 100644 translations/zh-CN/data/reusables/actions/self-hosted-runner-configure-runner-group.md delete mode 100644 translations/zh-CN/data/reusables/dotcom_billing/pricing_cal.md create mode 100644 translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md create mode 100644 translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md create mode 100644 translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md delete mode 100644 translations/zh-CN/data/reusables/gated-features/allowed-ip-addresses.md delete mode 100644 translations/zh-CN/data/reusables/gated-features/restrict-add-collaborator.md create mode 100644 translations/zh-CN/data/reusables/projects/insights-alpha.md create mode 100644 translations/zh-CN/data/reusables/projects/projects-filters.md diff --git a/translations/log/cn-resets.csv b/translations/log/cn-resets.csv index c8adfa19e5ea..3237861b366f 100644 --- a/translations/log/cn-resets.csv +++ b/translations/log/cn-resets.csv @@ -8,6 +8,7 @@ translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-gith translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md,parsing error translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-the-default-branch-name-for-your-repositories.md,broken liquid tags translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-your-membership-in-organizations/about-organization-membership.md,broken liquid tags +translations/zh-CN/content/actions/automating-builds-and-tests/about-continuous-integration.md,broken liquid tags translations/zh-CN/content/actions/hosting-your-own-runners/about-self-hosted-runners.md,broken liquid tags translations/zh-CN/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md,Listed in localization-support#489 translations/zh-CN/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md,broken liquid tags @@ -71,10 +72,17 @@ translations/zh-CN/content/admin/user-management/managing-users-in-your-enterpri translations/zh-CN/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-githubcom.md,broken liquid tags translations/zh-CN/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-your-enterprise.md,broken liquid tags translations/zh-CN/content/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on.md,broken liquid tags +translations/zh-CN/content/authentication/connecting-to-github-with-ssh/about-ssh.md,broken liquid tags +translations/zh-CN/content/authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys.md,broken liquid tags +translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md,broken liquid tags translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md,broken liquid tags +translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/authorizing-github-apps.md,broken liquid tags translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/authorizing-oauth-apps.md,broken liquid tags +translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token.md,broken liquid tags translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository.md,broken liquid tags translations/zh-CN/content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md,broken liquid tags +translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md,broken liquid tags +translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md,broken liquid tags translations/zh-CN/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md,parsing error translations/zh-CN/content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md,broken liquid tags translations/zh-CN/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md,broken liquid tags @@ -125,6 +133,7 @@ translations/zh-CN/content/codespaces/customizing-your-codespace/personalizing-c translations/zh-CN/content/codespaces/developing-in-codespaces/developing-in-a-codespace.md,broken liquid tags translations/zh-CN/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md,broken liquid tags translations/zh-CN/content/codespaces/developing-in-codespaces/using-codespaces-in-visual-studio-code.md,broken liquid tags +translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md,broken liquid tags translations/zh-CN/content/codespaces/troubleshooting/troubleshooting-your-connection-to-codespaces.md,broken liquid tags translations/zh-CN/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md,broken liquid tags translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-an-existing-project-to-github-using-github-desktop.md,broken liquid tags @@ -134,6 +143,7 @@ translations/zh-CN/content/desktop/installing-and-configuring-github-desktop/ins translations/zh-CN/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/installing-github-desktop.md,broken liquid tags translations/zh-CN/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/setting-up-github-desktop.md,broken liquid tags translations/zh-CN/content/desktop/installing-and-configuring-github-desktop/overview/creating-your-first-repository-using-github-desktop.md,broken liquid tags +translations/zh-CN/content/developers/apps/building-github-apps/managing-allowed-ip-addresses-for-a-github-app.md,broken liquid tags translations/zh-CN/content/developers/apps/building-github-apps/rate-limits-for-github-apps.md,broken liquid tags translations/zh-CN/content/developers/apps/getting-started-with-apps/about-apps.md,broken liquid tags translations/zh-CN/content/developers/apps/getting-started-with-apps/migrating-oauth-apps-to-github-apps.md,broken liquid tags @@ -152,7 +162,6 @@ translations/zh-CN/content/education/manage-coursework-with-github-classroom/lea translations/zh-CN/content/get-started/customizing-your-github-workflow/exploring-integrations/about-github-marketplace.md,broken liquid tags translations/zh-CN/content/get-started/getting-started-with-git/about-remote-repositories.md,broken liquid tags translations/zh-CN/content/get-started/getting-started-with-git/updating-credentials-from-the-macos-keychain.md,broken liquid tags -translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line.md,broken liquid tags translations/zh-CN/content/get-started/learning-about-github/about-github-advanced-security.md,broken liquid tags translations/zh-CN/content/get-started/learning-about-github/githubs-products.md,parsing error translations/zh-CN/content/get-started/learning-about-github/types-of-github-accounts.md,broken liquid tags diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/about-continuous-integration.md b/translations/zh-CN/content/actions/automating-builds-and-tests/about-continuous-integration.md index 9fe8cb2f97d4..5c660e6ecb4d 100644 --- a/translations/zh-CN/content/actions/automating-builds-and-tests/about-continuous-integration.md +++ b/translations/zh-CN/content/actions/automating-builds-and-tests/about-continuous-integration.md @@ -1,5 +1,5 @@ --- -title: 关于持续集成 +title: About continuous integration intro: 'You can create custom continuous integration (CI) workflows directly in your {% data variables.product.prodname_dotcom %} repository with {% data variables.product.prodname_actions %}.' redirect_from: - /articles/about-continuous-integration @@ -15,37 +15,37 @@ versions: type: overview topics: - CI -shortTitle: 持续集成 +shortTitle: Continuous integration --- {% data reusables.actions.enterprise-beta %} {% data reusables.actions.enterprise-github-hosted-runners %} -## 关于持续集成 +## About continuous integration -持续集成 (CI) 是一种需要频繁提交代码到共享仓库的软件实践。 频繁提交代码能较早检测到错误，减少在查找错误来源时开发者需要调试的代码量。 频繁的代码更新也更便于从软件开发团队的不同成员合并更改。 这对开发者非常有益，他们可以将更多时间用于编写代码，而减少在调试错误或解决合并冲突上所花的时间。 +Continuous integration (CI) is a software practice that requires frequently committing code to a shared repository. Committing code more often detects errors sooner and reduces the amount of code a developer needs to debug when finding the source of an error. Frequent code updates also make it easier to merge changes from different members of a software development team. This is great for developers, who can spend more time writing code and less time debugging errors or resolving merge conflicts. -提交代码到仓库时，可以持续创建并测试代码，以确保提交未引入错误。 您的测试可以包括代码语法检查（检查样式格式）、安全性检查、代码覆盖率、功能测试及其他自定义检查。 +When you commit code to your repository, you can continuously build and test the code to make sure that the commit doesn't introduce errors. Your tests can include code linters (which check style formatting), security checks, code coverage, functional tests, and other custom checks. -创建和测试代码需要服务器。 您可以在推送代码到仓库之前在本地创建并测试更新，也可以使用 CI 服务器检查仓库中的新代码提交。 +Building and testing your code requires a server. You can build and test updates locally before pushing code to a repository, or you can use a CI server that checks for new code commits in a repository. -## 关于使用 {% data variables.product.prodname_actions %} 的持续集成 +## About continuous integration using {% data variables.product.prodname_actions %} -{% ifversion ghae %}使用 {% data variables.product.prodname_actions %} 的 CI 提供可以在仓库中构建代码并运行测试的工作流程。 Workflows can run on runner systems that you host. 更多信息请参阅“[关于自托管运行器](/actions/hosting-your-own-runners/about-self-hosted-runners)”。 -{% else %}使用 {% data variables.product.prodname_actions %} 的 CI 提供可以在仓库中构建代码并运行测试的工作流程。 工作流程可在 {% data variables.product.prodname_dotcom %} 托管的虚拟机或您自行托管的机器上运行。 更多信息请参阅“[{% data variables.product.prodname_dotcom %} 托管的运行器的虚拟环境](/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners)”和“[关于自托管运行器](/actions/automating-your-workflow-with-github-actions/about-self-hosted-runners)”。 +{% ifversion ghae %}CI using {% data variables.product.prodname_actions %} offers workflows that can build the code in your repository and run your tests. Workflows can run on runner systems that you host. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners)." +{% else %} CI using {% data variables.product.prodname_actions %} offers workflows that can build the code in your repository and run your tests. Workflows can run on {% data variables.product.prodname_dotcom %}-hosted virtual machines, or on machines that you host yourself. For more information, see "[Virtual environments for {% data variables.product.prodname_dotcom %}-hosted runners](/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners)" and "[About self-hosted runners](/actions/automating-your-workflow-with-github-actions/about-self-hosted-runners)." {% endif %} -您可以配置 CI 工作流程在 {% data variables.product.prodname_dotcom %} 事件发生时运行（例如，当新代码推送到您的仓库时）、按设定的时间表运行，或者在使用仓库分发 web 挂钩的外部事件发生时运行。 +You can configure your CI workflow to run when a {% data variables.product.prodname_dotcom %} event occurs (for example, when new code is pushed to your repository), on a set schedule, or when an external event occurs using the repository dispatch webhook. -{% data variables.product.product_name %} 运行 CI 测试并在拉取请求中提供每次测试的结果，因此您可以查看分支中的更改是否引入错误。 如果工作流程中的所有 CI 测试通过，您推送的更改可供团队成员审查或合并 如果测试失败，则是其中某项更改导致了失败。 +{% data variables.product.product_name %} runs your CI tests and provides the results of each test in the pull request, so you can see whether the change in your branch introduces an error. When all CI tests in a workflow pass, the changes you pushed are ready to be reviewed by a team member or merged. When a test fails, one of your changes may have caused the failure. -如果在仓库中设置了 CI，{% data variables.product.product_name %} 会分析仓库中的代码，并根据仓库中的语言和框架推荐 CI 工作流程。 For example, if you use [Node.js](https://nodejs.org/en/), {% data variables.product.product_name %} will suggest a starter workflow that installs your Node.js packages and runs your tests. You can use the CI starter workflow suggested by {% data variables.product.product_name %}, customize the suggested starter workflow, or create your own custom workflow file to run your CI tests. +When you set up CI in your repository, {% data variables.product.product_name %} analyzes the code in your repository and recommends CI workflows based on the language and framework in your repository. For example, if you use [Node.js](https://nodejs.org/en/), {% data variables.product.product_name %} will suggest a starter workflow that installs your Node.js packages and runs your tests. You can use the CI starter workflow suggested by {% data variables.product.product_name %}, customize the suggested starter workflow, or create your own custom workflow file to run your CI tests. ![Screenshot of suggested continuous integration starter workflows](/assets/images/help/repository/ci-with-actions-template-picker.png) -除了帮助设置项目的 CI 工作流程之外，您还可以使用 {% data variables.product.prodname_actions %} 创建跨整个软件开发生命周期的工作流程。 例如，您可以使用操作来部署、封装或发行项目。 更多信息请参阅“[关于 {% data variables.product.prodname_actions %}](/articles/about-github-actions)”。 +In addition to helping you set up CI workflows for your project, you can use {% data variables.product.prodname_actions %} to create workflows across the full software development life cycle. For example, you can use actions to deploy, package, or release your project. For more information, see "[About {% data variables.product.prodname_actions %}](/articles/about-github-actions)." -有关常用术语的定义，请参阅“[{% data variables.product.prodname_actions %} 的核心概念](/github/automating-your-workflow-with-github-actions/core-concepts-for-github-actions)”。 +For a definition of common terms, see "[Core concepts for {% data variables.product.prodname_actions %}](/github/automating-your-workflow-with-github-actions/core-concepts-for-github-actions)." ## Starter workflow @@ -53,8 +53,8 @@ shortTitle: 持续集成 Browse the complete list of CI starter workflow offered by {% data variables.product.company_short %} in the {% ifversion fpt or ghec %}[actions/starter-workflows](https://github.com/actions/starter-workflows/tree/main/ci) repository{% else %} `actions/starter-workflows` repository on {% data variables.product.product_location %}{% endif %}. -## 延伸阅读 +## Further reading {% ifversion fpt or ghec %} -- "[管理 {% data variables.product.prodname_actions %} 的计费](/billing/managing-billing-for-github-actions)" +- "[Managing billing for {% data variables.product.prodname_actions %}](/billing/managing-billing-for-github-actions)" {% endif %} diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-ant.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-ant.md index 5c0ae92154ea..94388b6b1501 100644 --- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-ant.md +++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-ant.md @@ -76,7 +76,7 @@ jobs: 2. `setup-java` 步骤配置 Adoptium 的 Java 11 JDK。 3. “使用 Ant 构建”步骤以非交互模式运行 `build.xml` 中的默认目标。 -The default starter workflows are excellent starting points when creating your build and test workflow, and you can customize the starter workflow to suit your project’s needs. +在创建构建和测试工作流程时，默认初学者工作流程是很好的起点，然后您可以自定义初学者工作流程以满足项目的需求。 {% data reusables.actions.example-github-runner %} diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md index 63c6272c07a0..9ad15d0c9bf5 100644 --- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md +++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md @@ -40,11 +40,11 @@ shortTitle: 构建和测试 Java & Gradle {% data reusables.actions.enterprise-setup-prereq %} -## Using the Gradle starter workflow +## 使用 Gradle 初学者工作流程 -{% data variables.product.prodname_dotcom %} provides a Gradle starter workflow that will work for most Gradle-based Java projects. For more information, see the [Gradle starter workflow](https://github.com/actions/starter-workflows/blob/main/ci/gradle.yml). +{% data variables.product.prodname_dotcom %} 提供有 Gradle 初学者工作流程，适用于大多数基于 Gradle 的 Java 项目。 更多信息请参阅 [Gradle 初学者工作流程](https://github.com/actions/starter-workflows/blob/main/ci/gradle.yml)。 -To get started quickly, you can choose the preconfigured Gradle starter workflow when you create a new workflow. 更多信息请参阅“[{% data variables.product.prodname_actions %} 快速入门](/actions/quickstart)”。 +要快速开始，您可以在创建新工作流程时选择预配置的 Gradle 初学者工作流程。 更多信息请参阅“[{% data variables.product.prodname_actions %} 快速入门](/actions/quickstart)”。 您也可以通过在仓库的 `.github/workflow` 目录中创建新文件来手动添加此工作流程。 @@ -79,9 +79,9 @@ jobs: 1. `checkout` 步骤在运行器上下载仓库的副本。 2. `setup-java` 步骤配置 Adoptium 的 Java 11 JDK。 3. “验证 Gradle 包装器”步骤验证源树中存在的 Gradle Wrapper JAR 文件的校验和。 -4. The "Build with Gradle" step does a build using the `gradle/gradle-build-action` action provided by the Gradle organization on {% data variables.product.prodname_dotcom %}. The action takes care of invoking Gradle, collecting results, and caching state between jobs. For more information see [`gradle/gradle-build-action`](https://github.com/gradle/gradle-build-action). +4. “使用 Gradle 构建”步骤使用 Gradle 组织在 {% data variables.product.prodname_dotcom %}上提供的 `gradle/gradle-build-action` 操作进行构建。 该操作负责调用 Gradle、收集结果以及在作业之间缓存状态。 更多信息请参阅 [`gradle/gradle-build-action`](https://github.com/gradle/gradle-build-action)。 -The default starter workflows are excellent starting points when creating your build and test workflow, and you can customize the starter workflow to suit your project’s needs. +在创建构建和测试工作流程时，默认初学者工作流程是很好的起点，然后您可以自定义初学者工作流程以满足项目的需求。 {% data reusables.actions.example-github-runner %} @@ -114,9 +114,9 @@ steps: ## 缓存依赖项 -When using {% data variables.product.prodname_dotcom %}-hosted runners, your build dependencies can be cached to speed up your workflow runs. After a successful run, the `gradle/gradle-build-action` caches important parts of the Gradle user home directory. In future jobs, the cache will be restored so that build scripts won't need to be recompiled and dependencies won't need to be downloaded from remote package repositories. +使用 {% data variables.product.prodname_dotcom %} 托管的运行器时，可以缓存构建依赖项以加快工作流程运行速度。 成功运行后， `gradle/gradle-build-action` 会缓存 Gradle 用户主目录的重要部分。 在将来的作业中，将还原缓存，这样就不需要重新编译构建脚本，也不需要从远程包存储库下载依赖项。 -Caching is enabled by default when using the `gradle/gradle-build-action` action. For more information, see [`gradle/gradle-build-action`](https://github.com/gradle/gradle-build-action#caching). +使用 `gradle/gradle-build-action` 操作时，缓存默认启用。 更多信息请参阅 [`gradle/gradle-build-action`](https://github.com/gradle/gradle-build-action#caching)。 ## 将工作流数据打包为构件 diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-maven.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-maven.md index 50bc34f65dee..11c532e1877c 100644 --- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-maven.md +++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-maven.md @@ -40,11 +40,11 @@ shortTitle: 使用 Maven 构建和测试 Java {% data reusables.actions.enterprise-setup-prereq %} -## Using the Maven starter workflow +## 使用 Maven 初学者工作流程 -{% data variables.product.prodname_dotcom %} provides a Maven starter workflow that will work for most Maven-based Java projects. For more information, see the [Maven starter workflow](https://github.com/actions/starter-workflows/blob/main/ci/maven.yml). +{% data variables.product.prodname_dotcom %} 提供有 Maven 初学者工作流程，适用于大多数基于 Maven 的 Java 项目。 更多信息请参阅 [Maven 初学者工作流程](https://github.com/actions/starter-workflows/blob/main/ci/maven.yml)。 -To get started quickly, you can choose the preconfigured Maven starter workflow when you create a new workflow. 更多信息请参阅“[{% data variables.product.prodname_actions %} 快速入门](/actions/quickstart)”。 +要快速开始，您可以在创建新工作流程时选择预配置的 Maven 初学者工作流程。 更多信息请参阅“[{% data variables.product.prodname_actions %} 快速入门](/actions/quickstart)”。 您也可以通过在仓库的 `.github/workflow` 目录中创建新文件来手动添加此工作流程。 @@ -76,7 +76,7 @@ jobs: 2. `setup-java` 步骤配置 Adoptium 的 Java 11 JDK。 3. “使用 Maven 构建”步骤以非交互模式运行 Maven `package` 目标，以确保创建代码版本、测试通行证和软件包。 -The default starter workflows are excellent starting points when creating your build and test workflow, and you can customize the starter workflow to suit your project’s needs. +在创建构建和测试工作流程时，默认初学者工作流程是很好的起点，然后您可以自定义初学者工作流程以满足项目的需求。 {% data reusables.actions.example-github-runner %} diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-net.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-net.md index 34717343cb34..9ab17ec26bdd 100644 --- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-net.md +++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-net.md @@ -32,7 +32,7 @@ shortTitle: 构建和测试 .NET {% data variables.product.prodname_dotcom %} provides a .NET starter workflow that should work for most .NET projects, and this guide includes examples that show you how to customize this starter workflow. For more information, see the [.NET starter workflow](https://github.com/actions/setup-dotnet). -To get started quickly, add the starter workflow to the `.github/workflows` directory of your repository. +要快速开始，请将初学者工作流程添加到仓库的 `.github/workflows` 目录中。 {% raw %} diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-nodejs.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-nodejs.md index e95ee8666cc6..484738b3e4d8 100644 --- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-nodejs.md +++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-nodejs.md @@ -40,7 +40,7 @@ hasExperimentalAlternative: true {% data variables.product.prodname_dotcom %} provides a Node.js starter workflow that will work for most Node.js projects. This guide includes npm and Yarn examples that you can use to customize the starter workflow. For more information, see the [Node.js starter workflow](https://github.com/actions/starter-workflows/blob/main/ci/node.js.yml). -To get started quickly, add the starter workflow to the `.github/workflows` directory of your repository. 下面显示的工作流假定仓库的默认分支是 `main`。 +要快速开始，请将初学者工作流程添加到仓库的 `.github/workflows` 目录中。 下面显示的工作流假定仓库的默认分支是 `main`。 {% raw %} ```yaml{:copy} diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-python.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-python.md index ecd9c0c08516..9b3f621c52c0 100644 --- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-python.md +++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-python.md @@ -42,11 +42,11 @@ hasExperimentalAlternative: true {% data reusables.actions.enterprise-setup-prereq %} -## Using the Python starter workflow +## 使用 Python 初学者工作流程 -{% data variables.product.prodname_dotcom %} provides a Python starter workflow that should work for most Python projects. This guide includes examples that you can use to customize the starter workflow. For more information, see the [Python starter workflow](https://github.com/actions/starter-workflows/blob/main/ci/python-package.yml). +{% data variables.product.prodname_dotcom %} 提供了一个适用于大多数 Python 项目的 Python 初学者工作流程。 本指南包含可用于自定义初学者工作流程的示例。 更多信息请参阅 [Python 初学者工作流程](https://github.com/actions/starter-workflows/blob/main/ci/python-package.yml)。 -To get started quickly, add the starter workflow to the `.github/workflows` directory of your repository. +要快速开始，请将初学者工作流程添加到仓库的 `.github/workflows` 目录中。 {% raw %} ```yaml{:copy} @@ -278,9 +278,9 @@ steps: ### 缓存依赖项 -When using {% data variables.product.prodname_dotcom %}-hosted runners, you can cache and restore the dependencies using the [`setup-python` action](https://github.com/actions/setup-python). +使用 {% data variables.product.prodname_dotcom %} 托管的运行器时，您可以使用 [`setup-python` 操作](https://github.com/actions/setup-python)缓存和恢复依赖项。 -The following example caches dependencies for pip. +以下示例缓存 pip 的依赖项。 @@ -296,9 +296,9 @@ steps: ``` -By default, the `setup-python` action searches for the dependency file (`requirements.txt` for pip or `Pipfile.lock` for pipenv) in the whole repository. For more information, see "Caching packages dependencies" in the `setup-python` actions README. +默认情况下， `setup-python` 操作会在整个存储库中搜索依赖项文件（对于 pip 为`requirements.txt`，对于 pipenv 为 `Pipfile.lock`）。 更多信息请参阅 `setup-python` 操作自述文件中的“缓存包依赖项”。 -If you have a custom requirement or need finer controls for caching, you can use the [`cache` action](https://github.com/marketplace/actions/cache). Pip 根据运行器的操作系统将依赖项缓存在不同的位置。 The path you'll need to cache may differ from the Ubuntu example above, depending on the operating system you use. For more information, see [Python caching examples](https://github.com/actions/cache/blob/main/examples.md#python---pip) in the `cache` action repository. +If you have a custom requirement or need finer controls for caching, you can use the [`cache` action](https://github.com/marketplace/actions/cache). Pip 根据运行器的操作系统将依赖项缓存在不同的位置。 您需要缓存的路径可能不同于上面的 Ubuntu 示例，具体取决于您使用的操作系统。 更多信息请参阅 `cache` 操作存储库中的 [Python 缓存示例](https://github.com/actions/cache/blob/main/examples.md#python---pip)。 @@ -497,4 +497,4 @@ jobs: ``` -For more information about the starter workflow, see [`python-publish`](https://github.com/actions/starter-workflows/blob/main/ci/python-publish.yml). +有关初学者工作流程的更多信息，请参阅 [`python-published`](https://github.com/actions/starter-workflows/blob/main/ci/python-publish.yml)。 diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-ruby.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-ruby.md index a6461fab1a9d..d12be767efc0 100644 --- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-ruby.md +++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-ruby.md @@ -33,7 +33,7 @@ shortTitle: 构建和测试Ruby {% data variables.product.prodname_dotcom %} provides a Ruby starter workflow that will work for most Ruby projects. For more information, see the [Ruby starter workflow](https://github.com/actions/starter-workflows/blob/master/ci/ruby.yml). -To get started quickly, add the starter workflow to the `.github/workflows` directory of your repository. 下面显示的工作流假定仓库的默认分支是 `main`。 +要快速开始，请将初学者工作流程添加到仓库的 `.github/workflows` 目录中。 下面显示的工作流假定仓库的默认分支是 `main`。 ```yaml {% data reusables.actions.actions-not-certified-by-github-comment %} diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-swift.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-swift.md index e0078f45771d..01d541fe3692 100644 --- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-swift.md +++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-swift.md @@ -22,7 +22,7 @@ shortTitle: 构建和测试 Swift 本指南介绍如何构建和测试 Swift 包。 -{% ifversion ghae %} To build and test your Swift project on {% data variables.product.prodname_ghe_managed %}, the necessary Swift dependencies are required. {% data reusables.actions.self-hosted-runners-software %} +{% ifversion ghae %} 要在 {% data variables.product.prodname_ghe_managed %}上构建和测试 Swift 项目，需要必要的 Swift 依赖项。 {% data reusables.actions.self-hosted-runners-software %} {% else %}{% data variables.product.prodname_dotcom %} 托管的运行器带有预装软件的工具缓存，Ubuntu 和 macOS 运行器包括用于构建 Swift 包的依赖项。 有关最新版软件以及 Swift 和 Xcode 预安装版本的完整列表，请参阅“[关于 GitHub 托管的运行器](/actions/using-github-hosted-runners/about-github-hosted-runners#supported-software)”。{% endif %} ## 基本要求 @@ -31,11 +31,11 @@ shortTitle: 构建和测试 Swift 我们建议您对 Swift 包有基本的了解。 更多信息请参阅 Apple 开发者文档中的“[Swift 包](https://developer.apple.com/documentation/swift_packages)”。 -## Using the Swift starter workflow +## 使用 Swift 初学者工作流程 -{% data variables.product.prodname_dotcom %} provides a Swift starter workflow that should work for most Swift projects, and this guide includes examples that show you how to customize this starter workflow. For more information, see the [Swift starter workflow](https://github.com/actions/starter-workflows/blob/main/ci/swift.yml). +{% data variables.product.prodname_dotcom %} 提供有 Swift 初学者工作流程，应适合大多数 Swift 项目，本指南包括演示如何自定义此初学者工作流程的示例。 更多信息请参阅 [Swift 初学者工作流程](https://github.com/actions/starter-workflows/blob/main/ci/swift.yml)。 -To get started quickly, add the starter workflow to the `.github/workflows` directory of your repository. +要快速开始，请将初学者工作流程添加到仓库的 `.github/workflows` 目录中。 {% raw %} ```yaml{:copy} diff --git a/translations/zh-CN/content/actions/creating-actions/about-custom-actions.md b/translations/zh-CN/content/actions/creating-actions/about-custom-actions.md index 7b8ae2a1ac1c..328e8035bf56 100644 --- a/translations/zh-CN/content/actions/creating-actions/about-custom-actions.md +++ b/translations/zh-CN/content/actions/creating-actions/about-custom-actions.md @@ -1,5 +1,5 @@ --- -title: About custom actions +title: 关于自定义操作 intro: '操作是可以组合来创建作业和自定义工作流程的单个任务。 您可以创建自己的操作，或者使用和自定义 {% data variables.product.prodname_dotcom %} 社区分享的操作。' redirect_from: - /articles/about-actions @@ -21,12 +21,12 @@ topics: {% data reusables.actions.enterprise-beta %} {% data reusables.actions.enterprise-github-hosted-runners %} -## About custom actions +## 关于自定义操作 您可以编写自定义代码来创建操作，以您喜欢的方式与仓库交互，包括使用 {% data variables.product.prodname_dotcom %} 的 API 以及任何公开的第三方 API 进行交互。 例如，操作可以发布 npm 模块、在创建紧急议题时发送短信提醒，或者部署可用于生产的代码。 {% ifversion fpt or ghec %} -您可以编写自己的操作以用于工作流程，或者与 {% data variables.product.prodname_dotcom %} 社区共享您创建的操作。 To share actions you've built with everyone, your repository must be public. {% if internal-actions %}To share actions only within your enterprise, your repository must be internal.{% endif %} +您可以编写自己的操作以用于工作流程，或者与 {% data variables.product.prodname_dotcom %} 社区共享您创建的操作。 要与每个人共享您创建的操作，您的仓库必须是公共的。 {% if internal-actions %}若要仅在企业内共享操作，存储库必须是内部的。{% endif %} {% endif %} 操作可以直接在计算机或 Docker 容器中运行。 您可以定义操作的输入、输出和环境变量。 @@ -71,11 +71,11 @@ _复合_操作允许您在一个操作中组合多个工作流程步骤。 例 {% data reusables.actions.internal-actions-summary %} -{% ifversion fpt or ghec %}If you're building an action that you don't plan to make available to others, you {% else %} You{% endif %} can store the action's files in any location in your repository. 如果计划将操作、工作流程和应用程序代码合并到一个仓库中，建议将操作存储在 `.github` 目录中。 例如，`.github/actions/action-a` 和 `.github/actions/action-b`。 +{% ifversion fpt or ghec %}如果创建不打算供他人使用的操作，您{% else %}您{% endif %}可以将操作的文件存储在您的仓库中的任何位置。 如果计划将操作、工作流程和应用程序代码合并到一个仓库中，建议将操作存储在 `.github` 目录中。 例如，`.github/actions/action-a` 和 `.github/actions/action-b`。 ## 与 {% data variables.product.prodname_ghe_server %} 的兼容性 -To ensure that your action is compatible with {% data variables.product.prodname_ghe_server %}, you should make sure that you do not use any hard-coded references to {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API URLs. You should instead use environment variables to refer to the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API: +为了确保操作与 {% data variables.product.prodname_ghe_server %} 兼容，应确保不使用任何硬编码引用来引用 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API URL。 您应该改用环境变量来引用 {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API： - 创建发行版标记（例如，`v1.0.2`）之前，在发行版分支（如 `release/v1`）上创建发行版并进行验证。 - 对于 GraphQL，使用 `GITHUB_GRAPHQL_URL` 环境变量。 @@ -129,7 +129,7 @@ steps: ### 使用提交的 SHA 进行发行版管理 -每个 Git 提交都会收到一个计算出来的 SHA 值，该值是唯一且不可更改的。 您操作的用户可能更喜欢依赖提交的 SHA 值，因为此方法会比指定可删除或移动的标记更可靠。 但是，这意味着用户将不会收到对该操作所做的进一步更新。 You must use a commit's full SHA value, and not an abbreviated value. +每个 Git 提交都会收到一个计算出来的 SHA 值，该值是唯一且不可更改的。 您操作的用户可能更喜欢依赖提交的 SHA 值，因为此方法会比指定可删除或移动的标记更可靠。 但是，这意味着用户将不会收到对该操作所做的进一步更新。 必须使用提交的完整 SHA 值，而不是缩写值。 ```yaml steps: diff --git a/translations/zh-CN/content/actions/creating-actions/creating-a-javascript-action.md b/translations/zh-CN/content/actions/creating-actions/creating-a-javascript-action.md index f9289668e826..d1dde5175700 100644 --- a/translations/zh-CN/content/actions/creating-actions/creating-a-javascript-action.md +++ b/translations/zh-CN/content/actions/creating-actions/creating-a-javascript-action.md @@ -141,7 +141,7 @@ try { - 操作使用的环境变量。 - 如何在工作流程中使用操作的示例。 -```markdown +```markdown{:copy} # Hello world javascript action This action prints "Hello World" or "Hello" + the name of a person to greet to the log. @@ -193,7 +193,7 @@ git push --follow-tags 1. 如果已检入您的 `node_modules` 目录，请删除它。 `rm -rf node_modules/*` 1. 从您的终端，将更新提交到 `action.yml`、`dist/index.js` 和 `node_modules` 文件。 -```shell +```shell{:copy} git add action.yml dist/index.js node_modules/* git commit -m "Use vercel/ncc" git tag -a -m "My first action release" v1.1 diff --git a/translations/zh-CN/content/actions/deployment/about-deployments/index.md b/translations/zh-CN/content/actions/deployment/about-deployments/index.md index 89456a53a4f3..921a8c1fbd47 100644 --- a/translations/zh-CN/content/actions/deployment/about-deployments/index.md +++ b/translations/zh-CN/content/actions/deployment/about-deployments/index.md @@ -4,7 +4,8 @@ shortTitle: About deployments intro: 'Learn how deployments can run with {% data variables.product.prodname_actions %} workflows.' versions: fpt: '*' - ghae: issue-4856 + ghes: '*' + ghae: '*' ghec: '*' children: - /about-continuous-deployment diff --git a/translations/zh-CN/content/actions/deployment/deploying-xcode-applications/index.md b/translations/zh-CN/content/actions/deployment/deploying-xcode-applications/index.md index a7d964575679..857ef66b1eb0 100644 --- a/translations/zh-CN/content/actions/deployment/deploying-xcode-applications/index.md +++ b/translations/zh-CN/content/actions/deployment/deploying-xcode-applications/index.md @@ -4,7 +4,8 @@ shortTitle: Deploying Xcode applications intro: '您可以在 {% data variables.product.prodname_actions %} 运行器上安装 Apple 代码签名证书，以在持续集成 (CI) 工作流程中对 Xcode 应用签名。' versions: fpt: '*' - ghae: issue-4856 + ghes: '*' + ghae: '*' ghec: '*' children: - /installing-an-apple-certificate-on-macos-runners-for-xcode-development diff --git a/translations/zh-CN/content/actions/deployment/index.md b/translations/zh-CN/content/actions/deployment/index.md index c480a14bf28e..74557c902980 100644 --- a/translations/zh-CN/content/actions/deployment/index.md +++ b/translations/zh-CN/content/actions/deployment/index.md @@ -1,7 +1,7 @@ --- title: 部署 shortTitle: 部署 -intro: 'Automatically deploy projects with {% data variables.product.prodname_actions %}.' +intro: '使用 {% data variables.product.prodname_actions %} 自动部署项目。' versions: fpt: '*' ghes: '*' diff --git a/translations/zh-CN/content/actions/deployment/managing-your-deployments/index.md b/translations/zh-CN/content/actions/deployment/managing-your-deployments/index.md index d1d09d4013d8..46b63742610e 100644 --- a/translations/zh-CN/content/actions/deployment/managing-your-deployments/index.md +++ b/translations/zh-CN/content/actions/deployment/managing-your-deployments/index.md @@ -4,7 +4,8 @@ shortTitle: Managing your deployments intro: You can review the past activity of your deployments. versions: fpt: '*' - ghae: issue-4856 + ghes: '*' + ghae: '*' ghec: '*' children: - /viewing-deployment-history diff --git a/translations/zh-CN/content/actions/deployment/targeting-different-environments/index.md b/translations/zh-CN/content/actions/deployment/targeting-different-environments/index.md index 4487f9b003fc..a3360b7e0227 100644 --- a/translations/zh-CN/content/actions/deployment/targeting-different-environments/index.md +++ b/translations/zh-CN/content/actions/deployment/targeting-different-environments/index.md @@ -4,7 +4,8 @@ shortTitle: Targeting different environments intro: 您可以使用保护规则和机密配置环境。 A workflow job that references an environment must follow any protection rules for the environment before running or accessing the environment's secrets. versions: fpt: '*' - ghae: issue-4856 + ghes: '*' + ghae: '*' ghec: '*' children: - /using-environments-for-deployment diff --git a/translations/zh-CN/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/zh-CN/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index 5e7c96e02894..d086fee7b1be 100644 --- a/translations/zh-CN/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/translations/zh-CN/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -51,7 +51,8 @@ For more information about installing and using self-hosted runners, see "[Addin - Can use cloud services or local machines that you already pay for. - Are customizable to your hardware, operating system, software, and security requirements. - Don't need to have a clean instance for every job execution. -- Are free to use with {% data variables.product.prodname_actions %}, but you are responsible for the cost of maintaining your runner machines. +- Are free to use with {% data variables.product.prodname_actions %}, but you are responsible for the cost of maintaining your runner machines.{% ifversion ghec or ghes or ghae %} +- Can be organized into groups to restrict access to specific {% if restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories. For more information, see "[Managing access to self-hosted runners using groups](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)."{% endif %} ## Requirements for self-hosted runner machines @@ -186,7 +187,7 @@ github-registry-files.githubusercontent.com In addition, your workflow may require access to other network resources. For example, if your workflow installs packages or publishes containers to {% data variables.product.prodname_dotcom %} Packages, then the runner will also require access to those network endpoints. -If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing policies for security settings in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise)". +If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/{% ifversion fpt %}enterprise-cloud@latest/{% endif %}/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing policies for security settings in your enterprise](/{% ifversion fpt %}enterprise-cloud@latest/{% endif %}admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} {% else %} diff --git a/translations/zh-CN/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md b/translations/zh-CN/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md index af2434c796b4..39fa8cbe1be5 100644 --- a/translations/zh-CN/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md +++ b/translations/zh-CN/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md @@ -78,7 +78,7 @@ shortTitle: 启动时运行运行器应用程序 ``` {% endmac %} -The command takes an optional `user` argument to install the service as a different user. +该命令采用可选的 `user` 参数，以其他用户身份安装服务。 ```shell ./svc.sh install --user USERNAME diff --git a/translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index c65ec5df1c5b..86479eb7c5d7 100644 --- a/translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/translations/zh-CN/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -9,11 +9,12 @@ versions: ghae: '*' ghec: '*' type: tutorial -shortTitle: 管理运行器组 +shortTitle: 管理对运行器的访问 --- {% data reusables.actions.enterprise-beta %} {% data reusables.actions.enterprise-github-hosted-runners %} +{% data reusables.actions.restrict-runner-workflow-beta %} ## 关于自托管运行器组 @@ -31,9 +32,10 @@ shortTitle: 管理运行器组 {% endif %} {% ifversion ghec or ghes or ghae %} -自托管运行器组用于控制对组织和企业级自托管运行器的访问。 企业管理员可以配置访问策略，用以控制企业中的哪些组织可以访问运行器组。 组织管理员可以配置访问策略，用以控制组织中的哪些组织可以访问运行器组。 +自托管运行器组用于控制对组织和企业级自托管运行器的访问。 企业所有者可以配置访问策略来控制企业中哪些组织 +{% if restrict-groups-to-workflows %}和工作流程{% endif %}可以访问运行器组。 组织所有者可以配置访问策略，以控制组织中哪些存储库{% if restrict-groups-to-workflows %} 和工作流程{% endif %} 可以访问运行器组。 -当企业管理员授予组织对运行器组的访问权限时，组织管理员可以看到组织的自托管运行器设置中列出的运行器组。 然后，组织管理员可以为企业运行器组分配其他细致的仓库访问策略。 +当企业所有者授予组织对运行器组的访问权限时，组织所有者可以看到组织的自托管运行器设置中列出的运行器组。 然后，组织所有者可以为企业运行器组分配更细致的存储库{% if restrict-groups-to-workflows %} 和工作流程{% endif %} 访问策略。 新运行器在创建时，将自动分配给默认组。 运行器每次只能在一个组中。 您可以将运行器从默认组移到另一组。 更多信息请参阅“[将自托管运行器移动到组](#moving-a-self-hosted-runner-to-a-group)”。 @@ -43,13 +45,14 @@ shortTitle: 管理运行器组 自托管运行器在创建时会自动分配给默认组，并且每次只能成为一个组的成员。 您可以将运行器从默认组移到您创建的任何组。 -创建组时，必须选择用于定义哪些仓库有权访问运行器组的策略。 +创建组时，必须选择一个策略，用于定义哪些存储库{% if restrict-groups-to-workflows %} 和工作流程{% endif %} 有权访问运行器组。 {% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.actions.settings-sidebar-actions-runner-groups %} 1. 在“Runner groups（运行器组）”部分，单击 **New runner group（新运行器组）**。 +1. 为运行器组输入名称。 {% data reusables.actions.runner-group-assign-policy-repo %} {% warning %} @@ -59,6 +62,7 @@ shortTitle: 管理运行器组 更多信息请参阅“[关于自托管运行器](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories)”。 {% endwarning %} +{% data reusables.actions.runner-group-assign-policy-workflow %}{%- if restrict-groups-to-workflows %} 组织拥有的运行器组无法访问企业中其他组织的工作流程；相反，您必须创建企业拥有的运行器组。{% endif %} {% data reusables.actions.self-hosted-runner-create-group %} {% elsif ghae or ghes < 3.4 %} {% data reusables.organizations.navigate-to-org %} @@ -89,7 +93,7 @@ shortTitle: 管理运行器组 ## 为企业创建自托管运行器组 -企业可以将其自托管的运行器添加到组以进行访问管理。 企业可以创建供企业帐户中特定组织访问的自托管运行器组。 然后，组织管理员可以为企业运行器组分配其他细致的仓库访问策略。 有关如何使用 REST API 创建自托管运行器组的信息，请参阅 [{% data variables.product.prodname_actions %} REST API](/rest/reference/actions#self-hosted-runner-groups) 中的企业端点。 +企业可以将其自托管的运行器添加到组以进行访问管理。 企业可以创建自托管运行器组，这些组可供企业帐户中的特定组织{% if restrict-groups-to-workflows %} 或特定工作流程{% endif %} 访问。 然后，组织所有者可以为企业运行器组分配更细致的存储库{% if restrict-groups-to-workflows %} 和工作流程{% endif %} 访问策略。 有关如何使用 REST API 创建自托管运行器组的信息，请参阅 [{% data variables.product.prodname_actions %} REST API](/rest/reference/actions#self-hosted-runner-groups) 中的企业端点。 自托管运行器在创建时会自动分配给默认组，并且每次只能成为一个组的成员。 您可以在注册过程中将运行器分配给特定组，也可以稍后将运行器从默认组移到自定义组。 @@ -116,17 +120,21 @@ shortTitle: 管理运行器组 ![添加运行器组选项](/assets/images/help/settings/actions-enterprise-account-add-runner-group-options-ae.png) {%- endif %} +{% data reusables.actions.runner-group-assign-policy-workflow %} 1. 单击 **Save group（保存组）**创建组并应用策略。 {% endif %} ## 更改自托管运行器组的访问策略 -您可以更新运行器组的访问策略，或重命名运行器组。 +对于企业中的运行器组，您可以更改企业中可以访问运行器组的组织{% if restrict-groups-to-workflows %} 或限制运行器组可以运行的工作流程{% endif %}。 对于组织中的运行器组，您可以更改组织中可以访问运行器组的存储库{% if restrict-groups-to-workflows %} 或限制运行器组可以运行的工作流程{% endif %}。 + +### 更改可以访问运行器组的组织或存储库 + {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.actions.self-hosted-runner-groups-navigate-to-repo-org-enterprise %} {% data reusables.actions.settings-sidebar-actions-runner-groups-selection %} -1. 修改访问选项或更改运行器组名称。 +1. 对于企业中的运行器组，在 **Organization access（组织访问）**下，修改可以访问运行器组的组织。 对于组织中的运行器组，在 **Repository access（存储库访问）**下，修改可以访问运行器组的存储库。 {%- ifversion fpt or ghec or ghes %} {% warning %} @@ -143,6 +151,35 @@ shortTitle: 管理运行器组 {% data reusables.actions.self-hosted-runner-configure-runner-group-access %} {% endif %} +{% if restrict-groups-to-workflows %} +### 更改可以访问运行器组的工作流程 +您可以将自托管运行器组配置为运行选定的工作流程或所有工作流程。 例如，可以使用此设置来保护存储在自托管运行器上的机密，或者通过将运行器组限制为仅运行特定的可重用工作流程来标准化部署工作流程。 如果配置企业共享的组织的运行组，则不能覆盖此设置。 +{% data reusables.actions.self-hosted-runner-groups-navigate-to-repo-org-enterprise %} +{% data reusables.actions.settings-sidebar-actions-runner-groups-selection %} +1. 在 **Workflow access（工作流程访问）**下，选择下拉菜单，然后单击 **Selected workflows（选定的工作流程）**。 +1. 单击 {% octicon "gear" aria-label="the gear icon" %}。 +1. 输入以逗号分隔的可访问运行器组的工作流程列表。 使用完整路径，包括存储库名称和所有者。 将工作流程固定到分支、标记或完整 SHA。 例如：`octo-org/octo-repo/.github/workflows/build.yml@v2, octo-org/octo-repo/.github/workflows/deploy.yml@d6dc6c96df4f32fa27b039f2084f576ed2c5c2a5, monalisa/octo-test/.github/workflows/test.yml@main`。 + + 只有直接在所选工作流程中定义的作业才能访问运行器组。 + + 组织拥有的运行器组无法访问企业中其他组织的工作流程。相反，您必须创建企业拥有的运行器组。 + +1. 单击 **Save（保存）**。 + +{% endif %} + +## 更改运行器组的名称 + +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} +{% data reusables.actions.self-hosted-runner-groups-navigate-to-repo-org-enterprise %} +{% data reusables.actions.settings-sidebar-actions-runner-groups-selection %} +1. 更改运行器组名称。 + +{% elsif ghae or ghes < 3.4 %} +{% data reusables.actions.self-hosted-runner-configure-runner-group %} +1. 更改运行器组名称。 +{% endif %} + {% ifversion ghec or ghes or ghae %} ## 自动向组添加自托管运行器 diff --git a/translations/zh-CN/content/actions/learn-github-actions/contexts.md b/translations/zh-CN/content/actions/learn-github-actions/contexts.md index ac73e7509529..4ce39401af73 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/contexts.md +++ b/translations/zh-CN/content/actions/learn-github-actions/contexts.md @@ -1,7 +1,7 @@ --- title: 上下文 shortTitle: 上下文 -intro: You can access context information in workflows and actions. +intro: 您可以在工作流程和操作中访问上下文信息。 redirect_from: - /articles/contexts-and-expression-syntax-for-github-actions - /github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions @@ -19,13 +19,13 @@ miniTocMaxHeadingLevel: 3 {% data reusables.actions.enterprise-beta %} {% data reusables.actions.enterprise-github-hosted-runners %} -## About contexts +## 关于上下文 -上下文是一种访问工作流程运行、运行器环境、作业及步骤相关信息的方式。 Each context is an object that contains properties, which can be strings or other objects. +上下文是一种访问工作流程运行、运行器环境、作业及步骤相关信息的方式。 每个上下文都是一个包含属性的对象，属性可以是字符串或其他对象。 -{% data reusables.actions.context-contents %} For example, the `matrix` context is only populated for jobs in a [build matrix](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix). +{% data reusables.actions.context-contents %} 例如，`matrix` 上下文中仅填充 [build matrix](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix) 中的作业。 -You can access contexts using the expression syntax. For more information, see "[Expressions](/actions/learn-github-actions/expressions)." +您可以使用表达式语法访问上下文。 更多信息请参阅“[表达式](/actions/learn-github-actions/expressions)”。 {% raw %} `${{ }}` @@ -33,21 +33,21 @@ You can access contexts using the expression syntax. For more information, see " {% data reusables.actions.context-injection-warning %} -| 上下文名称 | 类型 | 描述 | -| ---------- | ---- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | -| `github` | `对象` | 工作流程运行的相关信息。 更多信息请参阅 [`github` 上下文](#github-context)。 | -| `env` | `对象` | 包含工作流程、作业或步骤中设置的环境变量。 更多信息请参阅 [`env` 上下文](#env-context)。 | -| `job` | `对象` | Information about the currently running job. 更多信息请参阅 [`job` 上下文](#job-context)。 | -| `steps` | `对象` | Information about the steps that have been run in the current job. 更多信息请参阅 [`steps` 上下文](#steps-context)。 | -| `runner` | `对象` | 运行当前作业的运行程序相关信息。 更多信息请参阅 [`runner` 上下文](#runner-context)。 | -| `secrets` | `对象` | Contains the names and values of secrets that are available to a workflow run. For more information, see [`secrets` context](#secrets-context). | -| `strategy` | `对象` | Information about the matrix execution strategy for the current job. For more information, see [`strategy` context](#strategy-context). | -| `matrix` | `对象` | Contains the matrix properties defined in the workflow that apply to the current job. For more information, see [`matrix` context](#matrix-context). | -| `needs` | `对象` | Contains the outputs of all jobs that are defined as a dependency of the current job. 更多信息请参阅 [`needs` 上下文](#needs-context)。 | +| 上下文名称 | 类型 | 描述 | +| ---------- | ---- | ----------------------------------------------------------------- | +| `github` | `对象` | 工作流程运行的相关信息。 更多信息请参阅 [`github` 上下文](#github-context)。 | +| `env` | `对象` | 包含工作流程、作业或步骤中设置的环境变量。 更多信息请参阅 [`env` 上下文](#env-context)。 | +| `job` | `对象` | 有关当前运行的作业的信息。 更多信息请参阅 [`job` 上下文](#job-context)。 | +| `steps` | `对象` | 有关当前作业中已运行的步骤的信息。 更多信息请参阅 [`steps` 上下文](#steps-context)。 | +| `runner` | `对象` | 运行当前作业的运行程序相关信息。 更多信息请参阅 [`runner` 上下文](#runner-context)。 | +| `secrets` | `对象` | 包含可用于工作流程运行的机密的名称和值。 更多信息请参阅 [`secrets` 上下文](#secrets-context)。 | +| `strategy` | `对象` | 有关当前作业的矩阵执行策略的信息。 更多信息请参阅 [`strategy` 上下文](#strategy-context)。 | +| `matrix` | `对象` | 包含在工作流程中定义的应用于当前作业的矩阵属性。 更多信息请参阅 [`matrix` 上下文](#matrix-context)。 | +| `needs` | `对象` | 包含定义为当前作业依赖项的所有作业的输出。 更多信息请参阅 [`needs` 上下文](#needs-context)。 | {%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-4757 %} -| `inputs` | `object` | Contains the inputs of a reusable workflow. For more information, see [`inputs` context](#inputs-context). |{% endif %} +| `inputs` | `object` | 包含可重用工作流的输入。 更多信息请参阅 [`inputs` 上下文](#inputs-context)。 |{% endif %} -As part of an expression, you can access context information using one of two syntaxes. +作为表达式的一部分，您可以使用以下两种语法之一访问上下文信息。 - 索引语法：`github['sha']` - 属性解除参考语法：`github.sha` @@ -68,7 +68,7 @@ As part of an expression, you can access context information using one of two sy 此外，某些功能只能在某些地方使用。 例如， `hashFiles` 函数无法随处可用。 下表列出了工作流程中每一个上下文和特殊函数可以使用的地方。 除非下面列出，否则可以在任何地方使用函数。 |{% ifversion fpt or ghes > 3.3 or ghae-issue-4757 or ghec %} -| Workflow key | 上下文 | 特殊函数 | +| 工作流程键 | 上下文 | 特殊函数 | | -------------------------- | -------------------------- | -------------------------- | | concurrency | github, inputs | | | env | github, secrets, inputs | | @@ -135,9 +135,9 @@ As part of an expression, you can access context information using one of two sy | jobs.<job_id>.timeout-minutes | github, needs, strategy, matrix | | {% endif %} -### Example: printing context information to the log +### 示例：将上下文信息打印到日志 -You can print the contents of contexts to the log for debugging. The [`toJSON` function](/actions/learn-github-actions/expressions#tojson) is required to pretty-print JSON objects to the log. +您可以将上下文的内容打印到日志中进行调试。 需要 [`toJSON` 函数](/actions/learn-github-actions/expressions#tojson)才能将 JSON 对象打印到日志中。 {% data reusables.actions.github-context-warning %} @@ -168,41 +168,42 @@ jobs: ## `github` 上下文 -`github` 上下文包含有关工作流程运行以及触发运行的事件相关信息。 You can also read most of the `github` context data in environment variables. 有关环境变量的更多信息，请参阅“[使用环境变量](/actions/automating-your-workflow-with-github-actions/using-environment-variables)”。 +`github` 上下文包含有关工作流程运行以及触发运行的事件相关信息。 您还可以读取环境变量中的大多数 `github` 上下文数据。 有关环境变量的更多信息，请参阅“[使用环境变量](/actions/automating-your-workflow-with-github-actions/using-environment-variables)”。 {% data reusables.actions.github-context-warning %} {% data reusables.actions.context-injection-warning %} -| 属性名称 | 类型 | 描述 | -| -------------------------- | ----- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `github` | `对象` | 工作流程中任何作业或步骤期间可用的顶层上下文。 This object contains all the properties listed below. | -| `github.action` | `字符串` | The name of the action currently running, or the [`id`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsid) of a step. {% data variables.product.prodname_dotcom %} removes special characters, and uses the name `__run` when the current step runs a script without an `id`. If you use the same action more than once in the same job, the name will include a suffix with the sequence number with underscore before it. For example, the first script you run will have the name `__run`, and the second script will be named `__run_2`. 同样，`actions/checkout` 第二次调用时将变成 `actionscheckout2`。 | -| `github.action_path` | `字符串` | The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action. | -| `github.action_ref` | `字符串` | For a step executing an action, this is the ref of the action being executed. For example, `v2`. | -| `github.action_repository` | `字符串` | For a step executing an action, this is the owner and repository name of the action. For example, `actions/checkout`. | -| `github.actor` | `字符串` | The username of the user that initiated the workflow run. | -| `github.api_url` | `字符串` | The URL of the {% data variables.product.prodname_dotcom %} REST API. | -| `github.base_ref` | `字符串` | 工作流程运行中拉取请求的 `base_ref` 或目标分支。 此属性仅在触发工作流程运行的事件为 `pull_request` 或 `pull_request_target` 时才可用。 | -| `github.env` | `字符串` | Path on the runner to the file that sets environment variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "[Workflow commands for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/workflow-commands-for-github-actions#setting-an-environment-variable)." | -| `github.event` | `对象` | 完整事件 web 挂钩有效负载。 您可以使用上下文访问事件的个别属性。 This object is identical to the webhook payload of the event that triggered the workflow run, and is different for each event. The webhooks for each {% data variables.product.prodname_actions %} event is linked in "[Events that trigger workflows](/articles/events-that-trigger-workflows/)." For example, for a workflow run triggered by the [`push` event](/actions/using-workflows/events-that-trigger-workflows#push), this object contains the contents of the [push webhook payload](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#push). | -| `github.event_name` | `字符串` | 触发工作流程运行的事件的名称。 | -| `github.event_path` | `字符串` | The path to the file on the runner that contains the full event webhook payload. | -| `github.graphql_url` | `字符串` | The URL of the {% data variables.product.prodname_dotcom %} GraphQL API. | -| `github.head_ref` | `字符串` | 工作流程运行中拉取请求的 `head_ref` 或来源分支。 此属性仅在触发工作流程运行的事件为 `pull_request` 或 `pull_request_target` 时才可用。 | -| `github.job` | `字符串` | 当前作业的 [`job_id`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id)。 | -| `github.ref` | `字符串` | 触发工作流程的分支或标记参考。 对于分支，格式为 `refs/heads/`，对于标记是 `refs/tags/`。 | +| 属性名称 | 类型 | 描述 | +| -------------------------- | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `github` | `对象` | 工作流程中任何作业或步骤期间可用的顶层上下文。 此对象包含下面列出的所有属性。 | +| `github.action` | `字符串` | 当前运行的操作的名称，或步骤的 [`id`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsid)。 {% data variables.product.prodname_dotcom %} 将删除特殊字符，并在当前步骤运行没有 `id` 的脚本时使用名称 `__run`。 如果在同一作业中多次使用相同的操作，则名称将包含一个前面跟序号和下划线的后缀。 例如，运行的第一个脚本名称 `__run`，则第二个脚本将命名为 `__run_2`。 同样，`actions/checkout` 第二次调用时将变成 `actionscheckout2`。 | +| `github.action_path` | `字符串` | 操作所在的路径。 此属性仅在复合操作中受支持。 您可以使用此路径访问与操作位于同一存储库中的文件。 | +| `github.action_ref` | `字符串` | 对于执行操作的步骤，这是正在执行的操作的引用。 例如 `v2`。 | +| `github.action_repository` | `字符串` | 对于执行操作的步骤，这是操作的所有者和存储库名称。 例如 `actions/checkout`。 | +| `github.action_status` | `字符串` | 对于复合操作，这是复合操作的当前结果。 | +| `github.actor` | `字符串` | 发起工作流程运行的用户的用户名。 | +| `github.api_url` | `字符串` | {% data variables.product.prodname_dotcom %} REST API 的 URL。 | +| `github.base_ref` | `字符串` | 工作流程运行中拉取请求的 `base_ref` 或目标分支。 此属性仅在触发工作流程运行的事件为 `pull_request` 或 `pull_request_target` 时才可用。 | +| `github.env` | `字符串` | 运行器上从工作流程命令到设置环境变量的文件路径。 此文件对于当前步骤是唯一的，并且是作业中每个步骤的不同文件。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/learn-github-actions/workflow-commands-for-github-actions#setting-an-environment-variable)”。 | +| `github.event` | `对象` | 完整事件 web 挂钩有效负载。 您可以使用上下文访问事件的个别属性。 此对象与触发工作流运行的事件的 web 挂钩有效负载相同，并且对于每个事件都是不同的。 每个 {% data variables.product.prodname_actions %} 事件的 web 挂钩都链接在“[触发工作流程](/articles/events-that-trigger-workflows/)”的事件中。 例如，对于由 [`push` 事件](/actions/using-workflows/events-that-trigger-workflows#push)触发的工作流程运行，此对象包含[push webhook payload](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#push) 的内容。 | +| `github.event_name` | `字符串` | 触发工作流程运行的事件的名称。 | +| `github.event_path` | `字符串` | 运行器上包含完整事件 web 挂钩负载的文件的路径。 | +| `github.graphql_url` | `字符串` | {% data variables.product.prodname_dotcom %} GraphQL API 的 URL。 | +| `github.head_ref` | `字符串` | 工作流程运行中拉取请求的 `head_ref` 或来源分支。 此属性仅在触发工作流程运行的事件为 `pull_request` 或 `pull_request_target` 时才可用。 | +| `github.job` | `字符串` | 当前作业的 [`job_id`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id)。 | +| `github.ref` | `字符串` | 触发工作流程的分支或标记参考。 对于分支，格式为 `refs/heads/`，对于标记是 `refs/tags/`。 | {%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5338 %} | `github.ref_name` | `string` | {% data reusables.actions.ref_name-description %} | | `github.ref_protected` | `string` | {% data reusables.actions.ref_protected-description %} | | `github.ref_type` | `string` | {% data reusables.actions.ref_type-description %} {%- endif %} -| `github.path` | `string` | Path on the runner to the file that sets system `PATH` variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "[Workflow commands for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/workflow-commands-for-github-actions#adding-a-system-path)." | | `github.repository` | `string` | The owner and repository name. 例如 `Codertocat/Hello-World`。 | | `github.repository_owner` | `string` | The repository owner's name. 例如 `Codertocat`。 | | `github.repositoryUrl` | `string` | The Git URL to the repository. For example, `git://github.com/codertocat/hello-world.git`. | | `github.retention_days` | `string` | The number of days that workflow run logs and artifacts are kept. | | `github.run_id` | `string` | {% data reusables.actions.run_id_description %} | | `github.run_number` | `string` | {% data reusables.actions.run_number_description %} +| `github.path` | `string` | 运行器上从工作流程命令到设置系统 `PATH` 变量的文件的路径。 此文件对于当前步骤是唯一的，并且是作业中每个步骤的不同文件。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/learn-github-actions/workflow-commands-for-github-actions#adding-a-system-path)”。 | | `github.repository` | `string` | 所有者和存储库名称。 例如 `Codertocat/Hello-World`。 | | `github.repository_owner` | `string` | 存储库所有者的名称。 例如 `Codertocat`。 | | `github.repositoryUrl` | `string` | 存储库的 Git URL。 例如 `git://github.com/codertocat/hello-world.git`。 | | `github.retention_days` | `string` | 工作流程运行日志和构件的保留天数。 | | `github.run_id` | `string` | {% data reusables.actions.run_id_description %} | | `github.run_number` | `string` | {% data reusables.actions.run_number_description %} {%- ifversion fpt or ghec or ghes > 3.5 or ghae-issue-4722 %} -| `github.run_attempt` | `string` | A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. | +| `github.run_attempt` | `string` | 在存储库中运行的特定工作流程的每次尝试的唯一编号。 对于工作流程运行的第一次尝试，此数字从 1 开始，并随着每次重新运行而递增。 | {%- endif %} -| `github.server_url` | `string` | The URL of the GitHub server. 例如：`https://github.com`。 | | `github.sha` | `string` | The commit SHA that triggered the workflow run. | | `github.token` | `string` | A token to authenticate on behalf of the GitHub App installed on your repository. 这在功能上等同于 `GITHUB_TOKEN` 密码。 For more information, see "[Automatic token authentication](/actions/security-guides/automatic-token-authentication)." | | `github.workflow` | `string` | The name of the workflow. 如果工作流程文件未指定 `name`，此属性的值将是仓库中工作流程文件的完整路径。 | | `github.workspace` | `string` | The default working directory on the runner for steps, and the default location of your repository when using the [`checkout`](https://github.com/actions/checkout) action. | +| `github.server_url` | `string` | GitHub 服务器的 URL。 例如：`https://github.com`。 | | `github.sha` | `string` | 触发工作流运行的提交 SHA。 | | `github.token` | `string` | 用于代表存储库上安装的 GitHub 应用进行身份验证的令牌。 这在功能上等同于 `GITHUB_TOKEN` 密码。 更多信息请参阅“[自动令牌身份验证](/actions/security-guides/automatic-token-authentication)”。 | | `github.workflow` | `string` | 工作流程的名称。 如果工作流程文件未指定 `name`，此属性的值将是仓库中工作流程文件的完整路径。 | | `github.workspace` | `string` | 运行器上步骤的默认工作目录，以及使用[`检出`](https://github.com/actions/checkout)操作时存储库的默认位置。 | -### Example contents of the `github` context +### `github` 上下文的示例内容 -The following example context is from a workflow run triggered by the `push` event. The `event` object in this example has been truncated because it is identical to the contents of the [`push` webhook payload](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#push). +以下示例上下文来自由 `push` 事件触发的工作流程运行。 此示例中的 `event` 对象已被截断，因为它与 [`push` web 挂钩有效负载](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#push)的内容相同。 {% data reusables.actions.context-example-note %} @@ -244,9 +245,9 @@ The following example context is from a workflow run triggered by the `push` eve } ``` -### Example usage of the `github` context +### `github` 上下文的示例用法 -This example workflow uses the `github.event_name` context to run a job only if the workflow run was triggered by the `pull_request` event. +仅当工作流运行是由 `pull_request` 事件触发时，此示例工作流才使用 `github.event_name` 上下文来运行作业。 ```yaml{:copy} name: Run CI @@ -273,18 +274,18 @@ jobs: `env` 上下文包含已在工作流程、作业或步骤中设置的环境变量。 有关在工作流程中设置环境变量的更多信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#env)”。 -`env` 上下文语法允许您在工作流程文件中使用环境变量的值。 You can use the `env` context in the value of any key in a step except for the `id` and `uses` keys. 有关步骤语法的更多信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idsteps)”。 +`env` 上下文语法允许您在工作流程文件中使用环境变量的值。 您可以在步骤中除 `id` 和 `uses` 之外的任何键的值中使用 `env` 上下文。 有关步骤语法的更多信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idsteps)”。 如果您想要在运行器中使用环境变量的值，请使用运行器操作系统的正常方法来读取环境变量。 -| 属性名称 | 类型 | 描述 | -| ---------------------- | ----- | ---------------------------------------------------------------------------------------- | -| `env` | `对象` | 此上下文针对作业中的每个步骤而改变。 您可以从作业中的任何步骤访问此上下文。 This object contains the properties listed below. | -| `env.` | `字符串` | 特定环境变量的值。 | +| 属性名称 | 类型 | 描述 | +| ---------------------- | ----- | ---------------------------------------------------- | +| `env` | `对象` | 此上下文针对作业中的每个步骤而改变。 您可以从作业中的任何步骤访问此上下文。 此对象包含下面列出的属性。 | +| `env.` | `字符串` | 特定环境变量的值。 | -### Example contents of the `env` context +### `env` 上下文的示例内容 -The contents of the `env` context is a mapping of environment variable names to their values. The context's contents can change depending on where it is used in the workflow run. +`env` 上下文的内容是环境变量名称与其值的映射。 上下文的内容可能会根据工作流运行中的使用位置而更改。 ```json { @@ -293,9 +294,9 @@ The contents of the `env` context is a mapping of environment variable names to } ``` -### Example usage of the `env` context +### `env` 上下文的示例用法 -This example workflow shows how the `env` context can be configured at the workflow, job, and step levels, as well as using the context in steps. +此示例工作流演示如何在工作流、作业和步骤级别配置 `env` 上下文，以及如何在步骤中使用上下文。 {% data reusables.repositories.actions-env-var-note %} @@ -330,19 +331,19 @@ jobs: | 属性名称 | 类型 | 描述 | | ----------------------------------------- | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `job` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 您可以从作业中的任何步骤访问此上下文。 This object contains all the properties listed below. | +| `job` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 您可以从作业中的任何步骤访问此上下文。 此对象包含下面列出的所有属性。 | | `job.container` | `对象` | 作业的容器相关信息。 有关容器的更多信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/articles/workflow-syntax-for-github-actions#jobsjob_idcontainer)”。 | -| `job.container.id` | `字符串` | The ID of the container. | -| `job.container.network` | `字符串` | The ID of the container network. 运行程序创建作业中所有容器使用的网络。 | +| `job.container.id` | `字符串` | 容器的 ID。 | +| `job.container.network` | `字符串` | 容器网络的 ID。 运行程序创建作业中所有容器使用的网络。 | | `job.services` | `对象` | 为作业创建的服务容器。 有关服务容器的更多信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/articles/workflow-syntax-for-github-actions#jobsjob_idservices)”。 | -| `job.services..id` | `字符串` | The ID of the service container. | -| `job.services..network` | `字符串` | The ID of the service container network. 运行程序创建作业中所有容器使用的网络。 | +| `job.services..id` | `字符串` | 服务容器的 ID。 | +| `job.services..network` | `字符串` | 服务容器网络的 ID。 运行程序创建作业中所有容器使用的网络。 | | `job.services..ports` | `对象` | 服务容器显露的端口。 | | `job.status` | `字符串` | 作业的当前状态。 可能的值包括 `success`、`failure` 或 `cancelled`。 | -### Example contents of the `job` context +### `job` 上下文的示例内容 -This example `job` context uses a PostgreSQL service container with mapped ports. If there are no containers or service containers used in a job, the `job` context only contains the `status` property. +此示例 `job` 上下文使用具有映射端口的 PostgreSQL 服务容器。 如果作业中没有使用容器或服务容器，则 `job` 上下文仅包含 `status` 属性。 ```json { @@ -362,9 +363,9 @@ This example `job` context uses a PostgreSQL service container with mapped ports } ``` -### Example usage of the `job` context +### `job` 上下文的示例用法 -This example workflow configures a PostgreSQL service container, and automatically maps port 5432 in the service container to a randomly chosen available port on the host. The `job` context is used to access the number of the port that was assigned on the host. +此示例工作流程配置 PostgreSQL 服务容器，并自动将服务容器中的端口 5432 映射到主机上随机选择的可用端口。 `job` 上下文用于访问在主机上分配的端口号。 {% raw %} ```yaml{:copy} @@ -392,19 +393,19 @@ jobs: ## `steps` 上下文 -The `steps` context contains information about the steps in the current job that have an [`id`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsid) specified and have already run. +`steps` 上下文包含有关当前作业中指定了 [`id`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsid) 且已运行的步骤的信息。 | 属性名称 | 类型 | 描述 | | --------------------------------------------------- | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `steps` | `对象` | 此上下文针对作业中的每个步骤而改变。 您可以从作业中的任何步骤访问此上下文。 This object contains all the properties listed below. | -| `steps..outputs` | `对象` | 为步骤定义的输出集。 For more information, see "[Metadata syntax for {% data variables.product.prodname_actions %}](/articles/metadata-syntax-for-github-actions#outputs-for-docker-container-and-javascript-actions)." | +| `steps` | `对象` | 此上下文针对作业中的每个步骤而改变。 您可以从作业中的任何步骤访问此上下文。 此对象包含下面列出的所有属性。 | +| `steps..outputs` | `对象` | 为步骤定义的输出集。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的元数据语法](/articles/metadata-syntax-for-github-actions#outputs-for-docker-container-and-javascript-actions)”。 | | `steps..conclusion` | `字符串` | 在 [`continue-on-error`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepscontinue-on-error) 应用之后完成的步骤的结果。 可能的值包括 `success`、`failure`、`cancelled` 或 `skipped`。 当 `continue-on-error` 步骤失败时，`outcome` 为 `failure`，但最终的 `conclusion` 为 `success`。 | | `steps..outcome` | `字符串` | 在 [`continue-on-error`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepscontinue-on-error) 应用之前完成的步骤的结果。 可能的值包括 `success`、`failure`、`cancelled` 或 `skipped`。 当 `continue-on-error` 步骤失败时，`outcome` 为 `failure`，但最终的 `conclusion` 为 `success`。 | | `steps..outputs.` | `字符串` | 特定输出的值。 | -### Example contents of the `steps` context +### `steps` 上下文的示例内容 -This example `steps` context shows two previous steps that had an [`id`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsid) specified. The first step had the `id` named `checkout`, the second `generate_number`. The `generate_number` step had an output named `random_number`. +此示例 `steps` 上下文显示前面两个指定了 [`id`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsid) 的步骤。 第一步将 `id` 命名为 `checkout`，第二步 `generate_number`。 `generate_number` 步骤有一个名为 `random_number` 的输出。 ```yaml { @@ -423,9 +424,9 @@ This example `steps` context shows two previous steps that had an [`id`](/action } ``` -### Example usage of the `steps` context +### `steps` 上下文的示例用法 -This example workflow generates a random number as an output in one step, and a later step uses the `steps` context to read the value of that output. +此示例工作流程在一个步骤中生成一个随机数作为输出，后面的步骤使用 `steps` 上下文来读取该输出的值。 {% raw %} ```yaml{:copy} @@ -452,7 +453,7 @@ jobs: | 属性名称 | 类型 | 描述 | | ------------------- | ----- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `runner` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 This object contains all the properties listed below. | +| `runner` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 此对象包含下面列出的所有属性。 | | `runner.name` | `字符串` | {% data reusables.actions.runner-name-description %} | `runner.os` | `字符串` | {% data reusables.actions.runner-os-description %} |{% if actions-runner-arch-envvars %} | `runner.arch` | `字符串` | {% data reusables.actions.runner-arch-description %} @@ -460,12 +461,12 @@ jobs: | `runner.temp` | `字符串` | {% data reusables.actions.runner-temp-directory-description %} | `runner.tool_cache` | `字符串` | {% ifversion ghae %}{% data reusables.actions.self-hosted-runners-software %} {% else %} {% data reusables.actions.runner-tool-cache-description %} {% endif %} {%- comment %} -The `runner.workspace` property is purposefully not documented. It is an early Actions property that now isn't relevant for users, compared to `github.workspace`. It is kept around for compatibility. | `runner.workspace` | `string` | | +`runner.workspace` 属性故意不记录。 与 `github.workspace`相比，这是一个早期的 Actions 属性，现在与用户无关。 它为兼容性而保留。 | `runner.workspace` | `string` | | {%- endcomment %} -### Example contents of the `runner` context +### `runner` 上下文的示例内容 -The following example context is from a Linux {% data variables.product.prodname_dotcom %}-hosted runner. +以下示例上下文来自 Linux {% data variables.product.prodname_dotcom %} 托管的运行器。 ```yaml { @@ -475,15 +476,15 @@ The following example context is from a Linux {% data variables.product.prodname "tool_cache": "/opt/hostedtoolcache", "temp": "/home/runner/work/_temp" {%- comment %} - # The `runner.workspace` property is purposefully not documented. It is an early Actions property that now isn't relevant for users, compared to `github.workspace`. It is kept around for compatibility. + # The `runner.workspace` property is purposefully not documented. 与 `github.workspace` 相比，这是一个早期的 Actions 属性，现在与用户无关。 它为兼容性而保留。 "workspace": "/home/runner/work/hello-world" {%- endcomment %} } ``` -### Example usage of the `runner` context +### `runner` 上下文的示例用法 -This example workflow uses the `runner` context to set the path to the temporary directory to write logs, and if the workflow fails, it uploads those logs as artifact. +此示例工作流程使用 `runner` 上下文来设置临时目录的路径以写入日志，如果工作流程失败，它将这些日志上传为构件。 {% raw %} ```yaml{:copy} @@ -508,23 +509,23 @@ jobs: ``` {% endraw %} -## `secrets` context +## `secrets` 上下文 -The `secrets` context contains the names and values of secrets that are available to a workflow run. The `secrets` context is not available for composite actions. For more information about secrets, see "[Encrypted secrets](/actions/security-guides/encrypted-secrets)." +`secrets` 上下文包含可用于工作流程运行的机密的名称和值。 `secrets` 上下文不可用于复合操作。 有关机密的更多信息，请参阅“[加密密码](/actions/security-guides/encrypted-secrets)”。 -`GITHUB_TOKEN` is a secret that is automatically created for every workflow run, and is always included in the `secrets` context. For more information, see "[Automatic token authentication](/actions/security-guides/automatic-token-authentication)." +`GITHUB_TOKEN` 是为每个工作流程运行自动创建的机密，并且始终包含在 `secrets` 上下文中。 更多信息请参阅“[自动令牌身份验证](/actions/security-guides/automatic-token-authentication)”。 {% data reusables.actions.secrets-redaction-warning %} -| 属性名称 | 类型 | 描述 | -| ----------------------------- | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `secrets` | `对象` | This context is the same for each job in a workflow run. 您可以从作业中的任何步骤访问此上下文。 This object contains all the properties listed below. | -| `secrets.GITHUB_TOKEN` | `字符串` | Automatically created token for each workflow run. For more information, see "[Automatic token authentication](/actions/security-guides/automatic-token-authentication)." | -| `secrets.` | `字符串` | The value of a specific secret. | +| 属性名称 | 类型 | 描述 | +| ----------------------------- | ----- | ----------------------------------------------------------------------------------------------- | +| `secrets` | `对象` | 对于工作流程运行中的每个作业，此上下文都是相同的。 您可以从作业中的任何步骤访问此上下文。 此对象包含下面列出的所有属性。 | +| `secrets.GITHUB_TOKEN` | `字符串` | 为每个工作流程运行自动创建的令牌。 更多信息请参阅“[自动令牌身份验证](/actions/security-guides/automatic-token-authentication)”。 | +| `secrets.` | `字符串` | 特定机密的值。 | -### Example contents of the `secrets` context +### `secrets` 上下文的示例内容 -The following example contents of the `secrets` context shows the automatic `GITHUB_TOKEN`, as well as two other secrets available to the workflow run. +以下 `secrets` 上下文的示例内容显示了自动 `GITHUB_TOKEN`，以及可用于工作流程运行的另外两个机密。 ```yaml { @@ -534,25 +535,25 @@ The following example contents of the `secrets` context shows the automatic `GIT } ``` -### Example usage of the `secrets` context +### `secrets` 上下文的示例用法 {% data reusables.actions.github_token-input-example %} -## `strategy` context +## `strategy` 上下文 -For workflows with a build matrix, the `strategy` context contains information about the matrix execution strategy for the current job. +对于具有生成矩阵的工作流程，`strategy` 上下文包含有关当前作业的矩阵执行策略的信息。 -| 属性名称 | 类型 | 描述 | -| ----------------------- | ----- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `strategy` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 You can access this context from any job or step in a workflow. This object contains all the properties listed below. | -| `strategy.fail-fast` | `字符串` | When `true`, all in-progress jobs are canceled if any job in a build matrix fails. 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast)”。 | -| `strategy.job-index` | `字符串` | The index of the current job in the build matrix. **Note:** This number is a zero-based number. The first job's index in the build matrix is `0`. | -| `strategy.job-total` | `字符串` | The total number of jobs in the build matrix. **Note:** This number **is not** a zero-based number. For example, for a build matrix with four jobs, the value of `job-total` is `4`. | -| `strategy.max-parallel` | `字符串` | 使用 `matrix` 作业策略时可同时运行的最大作业数。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategymax-parallel)”。 | +| 属性名称 | 类型 | 描述 | +| ----------------------- | ----- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `strategy` | `对象` | 此上下文针对工作流程运行中的每项作业而改变。 您可以从工作流程中的任何作业或步骤访问此上下文。 此对象包含下面列出的所有属性。 | +| `strategy.fail-fast` | `字符串` | 为 `true` 时，如果构建矩阵中的任何作业失败，所有正在进行的作业都将被取消。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast)”。 | +| `strategy.job-index` | `字符串` | 生成矩阵中当前作业的索引。 **注意：** 此数字是零基数字。 生成矩阵中第一个作业的索引是 `0`。 | +| `strategy.job-total` | `字符串` | 生成矩阵中的作业总数。 **注意：** 此数字 **不是**从零基数字。 例如，对于具有四个作业的生成矩阵，`job-total` 的值为 `4`。 | +| `strategy.max-parallel` | `字符串` | 使用 `matrix` 作业策略时可同时运行的最大作业数。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategymax-parallel)”。 | -### Example contents of the `strategy` context +### `strategy` 上下文的示例内容 -The following example contents of the `strategy` context is from a build matrix with four jobs, and is taken from the final job. Note the difference between the zero-based `job-index` number, and `job-total` which is not zero-based. +`strategy` 上下文的以下示例内容来自具有四个作业的生成矩阵，取自最终作业。 请注意零基 `job-index` 数字与 `job-total` （非零基）之间的差异。 ```yaml { @@ -563,9 +564,9 @@ The following example contents of the `strategy` context is from a build matrix } ``` -### Example usage of the `strategy` context +### `strategy` 上下文的示例用法 -This example workflow uses the `strategy.job-index` property to set a unique name for a log file for each job in a build matrix. +此示例工作流程使用 `strategy.job-index` 属性为生成矩阵中每个作业的日志文件设置唯一名称。 {% raw %} ```yaml{:copy} @@ -590,20 +591,20 @@ jobs: ``` {% endraw %} -## `matrix` context +## `matrix` 上下文 -For workflows with a build matrix, the `matrix` context contains the matrix properties defined in the workflow file that apply to the current job. For example, if you configure a build matrix with the `os` and `node` keys, the `matrix` context object includes the `os` and `node` properties with the values that are being used for the current job. +对于具有生成矩阵的工作流程，`matrix` 上下文包含工作流程文件中定义的适用于当前作业的矩阵属性。 例如，如果使用 `os` 和 `node` 键配置生成矩阵，则 `matrix` 上下文对象将包括 `os` 和 `node` 属性，具有用于当前作业的值。 -There are no standard properties in the `matrix` context, only those which are defined in the workflow file. +`matrix` 上下文中没有标准属性，只有工作流程文件中定义的属性。 -| 属性名称 | 类型 | 描述 | -| ------------------------------ | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `matrix` | `对象` | This context is only available for jobs in a build matrix, and changes for each job in a workflow run. You can access this context from any job or step in a workflow. This object contains the properties listed below. | -| `matrix.` | `字符串` | The value of a matrix property. | +| 属性名称 | 类型 | 描述 | +| ------------------------------ | ----- | ------------------------------------------------------------------------------ | +| `matrix` | `对象` | 此上下文仅适用于生成矩阵中的作业，并且对于工作流运行中的每个作业都会发生更改。 您可以从工作流程中的任何作业或步骤访问此上下文。 此对象包含下面列出的属性。 | +| `matrix.` | `字符串` | 矩阵属性的值。 | -### Example contents of the `matrix` context +### `matrix` 上下文的示例内容 -The following example contents of the `matrix` context is from a job in a build matrix that has the `os` and `node` matrix properties defined in the workflow. The job is executing the matrix combination of an `ubuntu-latest` OS and Node.js version `16`. +`matrix` 上下文的以下示例内容来自生成矩阵中的作业，该生成矩阵具有工作流中定义的 `os` 和 `node` 矩阵属性。 该作业执行 `ubuntu-latest` OS 和 Node.js 版本 `16` 的矩阵组合。 ```yaml { @@ -612,9 +613,9 @@ The following example contents of the `matrix` context is from a job in a build } ``` -### Example usage of the `matrix` context +### `matrix` 上下文的示例用法 -This example workflow creates a build matrix with `os` and `node` keys. It uses the `matrix.os` property to set the runner type for each job, and uses the `matrix.node` property to set the Node.js version for each job. +此示例工作流程创建一个包含 `os` 和 `node` 键的生成矩阵。 它使用 `matrix.os` 属性为每个作业设置运行器类型，并使用 `matrix.node` 属性为每个作业设置 Node.js 版本。 {% raw %} ```yaml{:copy} @@ -642,19 +643,19 @@ jobs: ## `needs` 上下文 -`needs` 上下文包含定义为当前作业依赖项的所有作业的输出。 For more information on defining job dependencies, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idneeds)." +`needs` 上下文包含定义为当前作业依赖项的所有作业的输出。 有关定义作业依赖项的更多信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idneeds)”。 -| 属性名称 | 类型 | 描述 | -| -------------------------------------------------- | ----- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `needs` | `对象` | This context is only populated for workflow runs that have dependent jobs, and changes for each job in a workflow run. You can access this context from any job or step in a workflow. This object contains all the properties listed below. | -| `needs.` | `对象` | 当前作业依赖的单个作业。 | -| `needs..outputs` | `对象` | 当前作业依赖的作业的输出集。 | -| `needs..outputs.` | `字符串` | 当前作业依赖的作业的特定输出值。 | -| `needs..result` | `字符串` | 当前作业依赖的作业的结果。 可能的值包括 `success`、`failure`、`cancelled` 或 `skipped`。 | +| 属性名称 | 类型 | 描述 | +| -------------------------------------------------- | ----- | ------------------------------------------------------------------------------------ | +| `needs` | `对象` | 仅为具有相关作业的工作流程运行填充此上下文，并为工作流程运行中的每个作业填充此上下文。 您可以从工作流程中的任何作业或步骤访问此上下文。 此对象包含下面列出的所有属性。 | +| `needs.` | `对象` | 当前作业依赖的单个作业。 | +| `needs..outputs` | `对象` | 当前作业依赖的作业的输出集。 | +| `needs..outputs.` | `字符串` | 当前作业依赖的作业的特定输出值。 | +| `needs..result` | `字符串` | 当前作业依赖的作业的结果。 可能的值包括 `success`、`failure`、`cancelled` 或 `skipped`。 | -### Example contents of the `needs` context +### `needs` 上下文的示例内容 -The following example contents of the `needs` context shows information for two jobs that the current job depends on. +`needs` 上下文的以下示例内容显示了当前作业所依赖的两个作业的信息。 ```yaml { @@ -671,9 +672,9 @@ The following example contents of the `needs` context shows information for two } ``` -### Example usage of the `needs` context +### `needs` 上下文的示例用法 -This example workflow has three jobs: a `build` job that does a build, a `deploy` job that requires the `build` job, and a `debug` job that requires both the `build` and `deploy` jobs and runs only if there is a failure in the workflow. The `deploy` job also uses the `needs` context to access an output from the `build` job. +此示例工作流程有三个作业：执行生成的 `build` 作业，执行生成；需要 `build` 作业的 `deploy` 作业，以及需要 `build` 和 `deploy` 作业并且仅工作流程中出现失败时运行的 `debug` 作业。 `deploy` 作业还使用 `needs` 上下文来访问 `build` 作业的输出。 {% raw %} ```yaml{:copy} @@ -709,24 +710,24 @@ jobs: {% endraw %} {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-4757 %} -## `inputs` context +## `inputs` 上下文 -The `inputs` context contains input properties passed to a reusable workflow. The input names and types are defined in the [`workflow_call` event configuration](/actions/learn-github-actions/events-that-trigger-workflows#workflow-reuse-events) of a reusable workflow, and the input values are passed from [`jobs..with`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idwith) in an external workflow that calls the reusable workflow. +`inputs` 上下文包含传递给可重用工作流程的输入属性。 输入名称和类型在可重用工作流程的 [`workflow_call` 事件配置](/actions/learn-github-actions/events-that-trigger-workflows#workflow-reuse-events)中定义，输入值从调用可重用工作流程的外部工作流中的 [`jobs..with`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idwith) 传递。 -There are no standard properties in the `inputs` context, only those which are defined in the reusable workflow file. +`inputs` 上下文中没有标准属性，只有那些在可重用工作流程文件中定义的属性。 {% data reusables.actions.reusable-workflows-ghes-beta %} -For more information, see "[Reusing workflows](/actions/learn-github-actions/reusing-workflows)". +更多信息请参阅“[重用工作流程](/actions/learn-github-actions/reusing-workflows)”。 -| 属性名称 | 类型 | 描述 | -| --------------------- | --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `inputs` | `对象` | This context is only available in a [reusable workflow](/actions/learn-github-actions/reusing-workflows). You can access this context from any job or step in a workflow. This object contains the properties listed below. | -| `inputs.` | `string` or `number` or `boolean` | Each input value passed from an external workflow. | +| 属性名称 | 类型 | 描述 | +| --------------------- | ------------------------------- | ------------------------------------------------------------------------------------------------------------ | +| `inputs` | `对象` | 此上下文仅在[可重用的工作流程](/actions/learn-github-actions/reusing-workflows)中可用。 您可以从工作流程中的任何作业或步骤访问此上下文。 此对象包含下面列出的属性。 | +| `inputs.` | `string` 或 `number` 或 `boolean` | 从外部工作流传递的每个输入值。 | -### Example contents of the `inputs` context +### `inputs` 上下文的示例内容 -The following example contents of the `inputs` context is from a job in a reusable workflow that has defined the `build_id` and `deploy_target` inputs. +`inputs` 上下文的以下示例内容来自已定义 `build_id` 和 `deploy_target` 输入的可重用工作流程中的作业。 ```yaml { @@ -735,9 +736,9 @@ The following example contents of the `inputs` context is from a job in a reusab } ``` -### Example usage of the `inputs` context +### `inputs` 上下文的示例用法 -This example reusable workflow uses the `inputs` context to get the values of the `build_id` and `deploy_target` inputs that were passed to the reusable workflow from the caller workflow. +此可重用工作流程示例使用 `inputs` 上下文来获取从调用方工作流传递到可重用工作流的 `build_id` 的值和 `deploy_target` 输入。 {% raw %} ```yaml{:copy} @@ -751,10 +752,14 @@ on: deploy_target: required: true type: string + perform_deploy: + required: true + type: boolean jobs: deploy: runs-on: ubuntu-latest + if: ${{ inputs.perform_deploy == 'true' }} steps: - name: Deploy build to target run: deploy --build ${{ inputs.build_id }} --target ${{ inputs.deploy_target }} diff --git a/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md b/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md index 3c37234146de..e283071d753e 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md +++ b/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md @@ -18,15 +18,15 @@ versions: ## 关于环境变量 -You can use environment variables to store information that you want to reference in your workflow. You reference environment variables within a workflow step or an action, and the variables are interpolated on the runner machine that runs your workflow. Commands that run in actions or workflow steps can create, read, and modify environment variables. +您可以使用环境变量来存储要在工作流程中引用的信息。 您可以在工作流程步骤或操作中引用环境变量，这些变量将在运行工作流程的运行器计算机上插值。 在操作或工作流程步骤中运行的命令可以创建、读取和修改环境变量。 -You can set your own custom environment variables, you can use the default environment variables that {% data variables.product.prodname_dotcom %} sets automatically, and you can also use any other environment variables that are set in the working environment on the runner. 环境变量区分大小写。 +您可以设置自己的自定义环境变量，可以使用 {% data variables.product.prodname_dotcom %} 自动设置的默认环境变量，还可以使用在运行器上的工作环境中设置的任何其他环境变量。 环境变量区分大小写。 -To set a custom environment variable, you must define it in the workflow file. The scope of a custom environment variable is limited to the element in which it is defined. You can define environment variables that are scoped for: +要设置自定义环境变量，必须在工作流程文件中定义它。 自定义环境变量的作用域仅限于在其中定义它的元素。 您可以定义作用域如下的环境变量： -* The entire workflow, by using [`env`](/actions/using-workflows/workflow-syntax-for-github-actions#env) at the top level of the workflow file. -* The contents of a job within a workflow, by using [`jobs..env`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idenv). -* A specific step within a job, by using [`jobs..steps[*].env`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsenv). +* 整个工作流程，通过使用 [`env`](/actions/using-workflows/workflow-syntax-for-github-actions#env) 工作流程文件的顶级来定义。 +* 工作流程中作业的内容，通过使用 [`jobs..env`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idenv) 来定义。 +* 作业中的特定步骤，通过使用 [`jobs..steps[*].env`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsenv) 来定义。 {% raw %} ```yaml @@ -51,21 +51,21 @@ jobs: ``` {% endraw %} -The example above shows three custom environment variables being used in an `echo` command: `$DAY_OF_WEEK`, `$Greeting`, and `$First_Name`. The values for these environment variables are set, and scoped, at the workflow, job, and step level respectively. +上面的示例显示了在 `echo` 命令中使用的三个自定义环境变量：`$DAY_OF_WEEK`、`$Greeting` 和 `$First_Name`。 这些环境变量的值分别在工作流程、作业和步骤级别设置和定义作用域。 -Because environment variable interpolation is done after a workflow job is sent to a runner machine, you must use the appropriate syntax for the shell that's used on the runner. In this example, the workflow specifies `ubuntu-latest`. By default, Linux runners use the bash shell, so you must use the syntax `$NAME`. If the workflow specified a Windows runner, you would use the syntax for PowerShell, `$env:NAME`. For more information about shells, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsshell)." +由于环境变量插值是在将工作流作业发送到运行器计算机后完成的，因此必须对运行器上使用的 shell 使用适当的语法。 在此示例中，工作流程指定 `ubuntu-latest`。 默认情况下，Linux 运行器使用 bash shell，因此您必须使用语法 `$NAME`。 如果工作流程指定了 Windows 运行器，则将使用 PowerShell 的语法 `$env:NAME`。 有关 shell 的更多信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsshell)”。 {% note %} -**Note**: You can list the entire set of environment variables that are available to a workflow step by using `run: env` in a step and then examining the output for the step. +**注意**：您可以在步骤中使用 `run: env` ，然后检查步骤的输出，以列出可用于工作流程步骤的整个环境变量集。 {% endnote %} -## Using contexts to access environment variable values +## 使用上下文访问环境变量值 -In addition to environment variables, {% data variables.product.prodname_actions %} also allows you to set and read values using contexts. Environment variables and contexts are intended for use at different points in the workflow. +除了环境变量之外，{% data variables.product.prodname_actions %} 还允许您使用上下文设置和读取值。 环境变量和上下文旨在用于工作流程中的不同点。 -Environment variables are always interpolated on the virtual machine runner. However, parts of a workflow are processed by {% data variables.product.prodname_actions %} and are not sent to the runner. You cannot use environment variables in these parts of a workflow file. Instead, you can use contexts. For example, an `if` conditional, which determines whether a job or step is sent to the runner, is always processed by {% data variables.product.prodname_actions %}. You can use a context in an `if` conditional statement to access the value of an environment variable. +环境变量始终在虚拟机运行器上插值。 但是，工作流程的某些部分由 {% data variables.product.prodname_actions %} 处理，不会发送到运行器。 不能在工作流程文件的这些部分中使用环境变量。 相反，您可以使用上下文。 例如，`if` 条件（确定作业或步骤是否发送到运行器）始终由 {% data variables.product.prodname_actions %} 处理。 可以在 `if` 条件语句中使用上下文访问环境变量的值。 {% raw %} ```yaml @@ -86,86 +86,86 @@ jobs: ``` {% endraw %} -In this modification of the first example, we've introduced an `if` conditional. The workflow step is now only run if `DAYS_OF_WEEK` is set to "Monday". We access this value from the `if` conditional statement by using the [`env` context](/actions/learn-github-actions/contexts#env-context). +在第一个示例的修改中，我们引入了 `if` 条件。 现在，工作流程步骤仅在 `DAYS_OF_WEEK` 设置为 "Monday" 时才会运行。 我们通过使用 [`env` context](/actions/learn-github-actions/contexts#env-context)从 `if` 语句访问此值。 {% note %} -**Note**: Contexts are usually denoted using the dollar sign and curly braces, as {% raw %}`${{ context.property }}`{% endraw %}. In an `if` conditional, the {% raw %}`${{` and `}}`{% endraw %} are optional, but if you use them they must enclose the entire comparison statement, as shown above. +**注意**：上下文通常使用美元符号和大括号表示，如 {% raw %}`${{ context.property }}`{% endraw %}。 在 `if` 条件中，{% raw %}`${{` and `}}`{% endraw %} 是可选的，但如果使用它们，它们必须括住整个比较语句，如上所示。 {% endnote %} -You will commonly use either the `env` or `github` context to access environment variable values in parts of the workflow that are processed before jobs are sent to runners. +您通常使用 `env` 或 `github` 上下文来访问工作流程部分中的环境变量值，这些值在作业发送给运行器之前处理。 -| 上下文 | Use case | 示例 | -| -------- | ---------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | -| `env` | Reference custom environment variables defined in the workflow. | {% raw %}`${{ env.MY_VARIABLE }}`{% endraw %} | -| `github` | Reference information about the workflow run and the event that triggered the run. | {% raw %}`${{ github.repository }}`{% endraw %} | +| 上下文 | 用例 | 示例 | +| -------- | ---------------------- | ----------------------------------------------------------------------------------------- | +| `env` | 引用工作流中定义的自定义环境变量。 | {% raw %}`${{ env.MY_VARIABLE }}`{% endraw %} | +| `github` | 引用有关工作流程运行的信息和触发运行的事件。 | {% raw %}`${{ github.repository }}`{% endraw %} | -There are many other contexts that you can use for a variety of purposes in your workflows. 更多信息请参阅“[上下文](/actions/learn-github-actions/contexts)”。 For details of where you can use specific contexts within a workflow, see "[Context availability](/actions/learn-github-actions/contexts#context-availability)." +在工作流程中，还有许多其他上下文可用于各种目的。 更多信息请参阅“[上下文](/actions/learn-github-actions/contexts)”。 有关您可以在工作流程中使用特定上下文的详细信息，请参阅“[上下文可用性](/actions/learn-github-actions/contexts#context-availability)”。 -### Other types of variables +### 其他类型的变量 -In most places in a workflow, the only types of variables that you can use are either environment variables, such as `$MY_VARIABLE`, or the equivalent context property, such as {% raw %}`${{ env.MY_VARIABLE }}`{% endraw %}. Exceptions are: +在工作流程中的大多数位置，可以使用的唯一变量类型是环境变量，如 `$MY_VARIABLE`，或等效的上下文属性，如 {% raw %}'${{ env.MY_VARIABLE }}'{% endraw %}。 例外情况包括： -* Inputs for the `workflow_call` and `workflow_dispatch` events, which allow you to pass values to a workflow. For more information, see [`on.workflow_call.inputs`](/actions/learn-github-actions/workflow-syntax-for-github-actions#onworkflow_callinputs) and [`on.workflow_dispatch.inputs`](/actions/learn-github-actions/workflow-syntax-for-github-actions#onworkflow_dispatchinputs). -* Job outputs, which allow you to pass values between jobs in a workflow. For more information, see [`jobs..outputs`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idoutputs). -* The variables in a format expression, which allow you to replace parts of a string. For more information, see [`format`](/actions/learn-github-actions/expressions#format). +* `workflow_call` 和 `workflow_dispatch` 事件的输入，允许您将值传递到工作流程。 更多信息请参阅 [`on.workflow_call.inputs`](/actions/learn-github-actions/workflow-syntax-for-github-actions#onworkflow_callinputs) 和 [`on.workflow_dispatch.inputs`](/actions/learn-github-actions/workflow-syntax-for-github-actions#onworkflow_dispatchinputs)。 +* 作业输出，允许您在工作流程中的作业之间传递值。 更多信息请参阅 [`jobs..outputs`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idoutputs)。 +* 格式表达式中的变量，允许您替换字符串的某些部分。 更多信息请参阅 [`format`](/actions/learn-github-actions/expressions#format)。 ## 环境变量命名约定 -When you set a custom environment variable, you cannot use any of the default environment variable names. For a complete list of these, see "[Default environment variables](#default-environment-variables)" below. 如果尝试重写其中一个默认环境变量的值，则会忽略赋值。 +设置自定义环境变量时，不能使用任何默认环境变量名称。 有关这些变量的完整列表，请参阅下面的“[默认环境变量](#default-environment-variables)”。 如果尝试重写其中一个默认环境变量的值，则会忽略赋值。 -您设置的指向文件系统上某个位置的任何新环境变量都应该有 `_PATH` 后缀。 The `HOME`, `GITHUB_ENV`, and `GITHUB_WORKSPACE` default environment variables are exceptions to this convention. +您设置的指向文件系统上某个位置的任何新环境变量都应该有 `_PATH` 后缀。 `HOME`、`GITHUB_ENV` 和 `GITHUB_WORKSPACE` 默认环境变量是此约定的例外。 ## 默认环境变量 -The default environment variables that {% data variables.product.prodname_dotcom %} sets are available to every step in a workflow. +{% data variables.product.prodname_dotcom %} 设置的默认环境变量可用于工作流程中的每个步骤。 强烈建议操作使用环境变量访问文件系统，而非使用硬编码的文件路径。 {% data variables.product.prodname_dotcom %} 设置供操作用于所有运行器环境中的环境变量。 -| 环境变量 | 描述 | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `CI` | 始终设置为 `true`。 | -| `GITHUB_ACTION` | The name of the action currently running, or the [`id`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsid) of a step. For example, for an action, `__repo-owner_name-of-action-repo`.

{% data variables.product.prodname_dotcom %} removes special characters, and uses the name `__run` when the current step runs a script without an `id`. If you use the same script or action more than once in the same job, the name will include a suffix that consists of the sequence number preceded by an underscore. For example, the first script you run will have the name `__run`, and the second script will be named `__run_2`. 同样，`actions/checkout` 第二次调用时将变成 `actionscheckout2`。 | -| `GITHUB_ACTION_PATH` | The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action. For example, `/home/runner/work/_actions/repo-owner/name-of-action-repo/v1`. | -| `GITHUB_ACTION_REPOSITORY` | For a step executing an action, this is the owner and repository name of the action. For example, `actions/checkout`. | -| `GITHUB_ACTIONS` | 当 {% data variables.product.prodname_actions %} 运行工作流程时，始终设置为 `true`。 您可以使用此变量来区分测试是在本地运行还是通过 {% data variables.product.prodname_actions %} 运行。 | -| `GITHUB_ACTOR` | 发起工作流程的个人或应用程序的名称。 例如 `octocat`。 | -| `GITHUB_API_URL` | 返回 API URL。 For example: `{% data variables.product.api_url_code %}`. | -| `GITHUB_BASE_REF` | The name of the base ref or target branch of the pull request in a workflow run. This is only set when the event that triggers a workflow run is either `pull_request` or `pull_request_target`. For example, `main`. | -| `GITHUB_ENV` | The path on the runner to the file that sets environment variables from workflow commands. This file is unique to the current step and changes for each step in a job. For example, `/home/runner/work/_temp/_runner_file_commands/set_env_87406d6e-4979-4d42-98e1-3dab1f48b13a`. 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable)”。 | -| `GITHUB_EVENT_NAME` | The name of the event that triggered the workflow. For example, `workflow_dispatch`. | -| `GITHUB_EVENT_PATH` | The path to the file on the runner that contains the full event webhook payload. 例如 `/github/workflow/event.json`。 | -| `GITHUB_GRAPHQL_URL` | 返回 GraphQL API URL。 For example: `{% data variables.product.graphql_url_code %}`. | -| `GITHUB_HEAD_REF` | The head ref or source branch of the pull request in a workflow run. This property is only set when the event that triggers a workflow run is either `pull_request` or `pull_request_target`. For example, `feature-branch-1`. | -| `GITHUB_JOB` | 当前作业的 [job_id](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id)。 For example, `greeting_job`. | -| `GITHUB_PATH` | The path on the runner to the file that sets system `PATH` variables from workflow commands. This file is unique to the current step and changes for each step in a job. For example, `/home/runner/work/_temp/_runner_file_commands/add_path_899b9445-ad4a-400c-aa89-249f18632cf5`. 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path)”。 | -| `GITHUB_REF` | 触发工作流程的分支或标记参考。 For branches this is the format `refs/heads/`, for tags it is `refs/tags/`, and for pull requests it is `refs/pull//merge`. This variable is only set if a branch or tag is available for the event type. 例如 `refs/heads/feature-branch-1`。 | +| 环境变量 | 描述 | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `CI` | 始终设置为 `true`。 | +| `GITHUB_ACTION` | 当前运行的操作的名称，或步骤的 [`id`](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsid)。 例如，对于操作 `__repo-owner_name-of-action-repo`。

{% data variables.product.prodname_dotcom %} 将删除特殊字符，并在当前步骤运行没有 `ID`的脚本时使用名称 `__run`。 如果在同一作业中多次使用相同的脚本或操作，则名称将包含一个由序号前跟下划线组成的后缀。 例如，运行的第一个脚本名称 `__run`，则第二个脚本将命名为 `__run_2`。 同样，`actions/checkout` 第二次调用时将变成 `actionscheckout2`。 | +| `GITHUB_ACTION_PATH` | 操作所在的路径。 此属性仅在复合操作中受支持。 您可以使用此路径访问与操作位于同一存储库中的文件。 例如，`/home/runner/work/_actions/repo-owner/name-of-action-repo/v1`。 | +| `GITHUB_ACTION_REPOSITORY` | 对于执行操作的步骤，这是操作的所有者和存储库名称。 例如 `actions/checkout`。 | +| `GITHUB_ACTIONS` | 当 {% data variables.product.prodname_actions %} 运行工作流程时，始终设置为 `true`。 您可以使用此变量来区分测试是在本地运行还是通过 {% data variables.product.prodname_actions %} 运行。 | +| `GITHUB_ACTOR` | 发起工作流程的个人或应用程序的名称。 例如 `octocat`。 | +| `GITHUB_API_URL` | 返回 API URL。 例如：`{% data variables.product.api_url_code %}`。 | +| `GITHUB_BASE_REF` | 工作流程运行中拉取请求的基本引用或目标分支的名称。 这仅在触发工作流运行的事件 `pull_request` 或 `pull_request_target` 时才会设置。 例如 `main`。 | +| `GITHUB_ENV` | 运行器上从工作流程命令到设置环境变量的文件路径。 此文件对于当前步骤是唯一的，并且会针对作业中的每个步骤进行更改。 例如，`/home/runner/work/_temp/_runner_file_commands/set_env_87406d6e-4979-4d42-98e1-3dab1f48b13a`。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable)”。 | +| `GITHUB_EVENT_NAME` | 触发工作流程的事件的名称。 例如，`workflow_dispatch`。 | +| `GITHUB_EVENT_PATH` | 运行器上包含完整事件 web 挂钩负载的文件的路径。 例如 `/github/workflow/event.json`。 | +| `GITHUB_GRAPHQL_URL` | 返回 GraphQL API URL。 例如：`{% data variables.product.graphql_url_code %}`。 | +| `GITHUB_HEAD_REF` | 工作流程运行中拉取请求的头部引用或来源分支。 此属性仅在触发工作流程运行的事件为 `pull_request` 或 `pull_request_target` 时才设置。 例如，`feature-branch-1`。 | +| `GITHUB_JOB` | 当前作业的 [job_id](/actions/reference/workflow-syntax-for-github-actions#jobsjob_id)。 例如，`greeting_job`。 | +| `GITHUB_PATH` | 运行器上从工作流程命令到设置系统 `PATH` 变量的文件路径。 此文件对于当前步骤是唯一的，并且会针对作业中的每个步骤进行更改。 例如 `/home/runner/work/_temp/_runner_file_commands/add_path_899b9445-ad4a-400c-aa89-249f18632cf5`。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path)”。 | +| `GITHUB_REF` | 触发工作流程的分支或标记参考。 对于分支，这是格式 `refs/heads/`，对于标记是 `refs/tags/`，对于拉取请求是 `refs/pull//merge`。 此变量仅在分支或标记可用于事件类型时才会设置。 例如 `refs/heads/feature-branch-1`。 | {%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5338 %} | `GITHUB_REF_NAME` | {% data reusables.actions.ref_name-description %} For example, `feature-branch-1`.| | `GITHUB_REF_PROTECTED` | {% data reusables.actions.ref_protected-description %} | | `GITHUB_REF_TYPE` | {% data reusables.actions.ref_type-description %} {%- endif %} -| `GITHUB_REPOSITORY` | The owner and repository name. 例如 `octocat/Hello-World`。 | | `GITHUB_REPOSITORY_OWNER` | The repository owner's name. 例如 `octocat`。 | | `GITHUB_RETENTION_DAYS` | The number of days that workflow run logs and artifacts are kept. For example, `90`. | | `GITHUB_RUN_ATTEMPT` | A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. For example, `3`. | | `GITHUB_RUN_ID` | {% data reusables.actions.run_id_description %} For example, `1658821493`. | | `GITHUB_RUN_NUMBER` | {% data reusables.actions.run_number_description %} For example, `3`. | | `GITHUB_SERVER_URL`| The URL of the {% data variables.product.product_name %} server. For example: `https://{% data variables.product.product_url %}`. | `GITHUB_SHA` | The commit SHA that triggered the workflow. 例如 `ffac537e6cbbf934b08745a378932722df287a53`。 | | `GITHUB_WORKFLOW` | The name of the workflow. For example, `My test workflow`. If the workflow file doesn't specify a `name`, the value of this variable is the full path of the workflow file in the repository. | | `GITHUB_WORKSPACE` | The default working directory on the runner for steps, and the default location of your repository when using the [`checkout`](https://github.com/actions/checkout) action. 例如 `/home/runner/work/my-repo-name/my-repo-name`。 | +| `GITHUB_REPOSITORY` |所有者和存储库名称。 例如 `octocat/Hello-World`。 | | `GITHUB_REPOSITORY_OWNER` |存储库所有者的姓名。 例如 `octocat`。 | | `GITHUB_RETENTION_DAYS` |工作流程运行日志和构件的保留天数。 例如 `90`。 | | `GITHUB_RUN_ATTEMPT` | 在存储库中运行的特定工作流程的每次尝试的唯一编号。 对于工作流程运行的第一次尝试，此数字从 1 开始，并随着每次重新运行而递增。 例如 `3`。 | | `GITHUB_RUN_ID` | {% data reusables.actions.run_id_description %} 例如 `1658821493`。 | | `GITHUB_RUN_NUMBER` | {% data reusables.actions.run_number_description %} 例如 `3`。 | | `GITHUB_SERVER_URL`| {% data variables.product.product_name %} 服务器的 URL。 例如：`https://{% data variables.product.product_url %}`。 | `GITHUB_SHA` | 触发工作流程的提交 SHA。 此提交 SHA 的值取决于触发工作流程的事件。 更多信息请参阅“[触发工作流程的事件](/actions/using-workflows/events-that-trigger-workflows)”。 例如 `ffac537e6cbbf934b08745a378932722df287a53`。 | | `GITHUB_WORKFLOW` | 工作流程的名称。 例如 `My test workflow`。 如果工作流程文件未指定`名称`，则此变量的值是存储库中工作流程文件的完整路径。 | | `GITHUB_WORKSPACE` | 运行器上步骤的默认工作目录，以及使用[`检出`](https://github.com/actions/checkout)操作时存储库的默认位置。 例如 `/home/runner/work/my-repo-name/my-repo-name`。 | {%- if actions-runner-arch-envvars %} | `RUNNER_ARCH` | {% data reusables.actions.runner-arch-description %} {%- endif %} -| `RUNNER_NAME` | {% data reusables.actions.runner-name-description %} For example, `Hosted Agent` | | `RUNNER_OS` | {% data reusables.actions.runner-os-description %} For example, `Windows` | | `RUNNER_TEMP` | {% data reusables.actions.runner-temp-directory-description %} For example, `D:\a\_temp` | -{% ifversion not ghae %}| `RUNNER_TOOL_CACHE` | {% data reusables.actions.runner-tool-cache-description %} For example, `C:\hostedtoolcache\windows` |{% endif %} +| `RUNNER_NAME` | {% data reusables.actions.runner-name-description %} 例如 `Hosted Agent` | | `RUNNER_OS` | {% data reusables.actions.runner-os-description %} 例如 `Windows` | | `RUNNER_TEMP` | {% data reusables.actions.runner-temp-directory-description %} 例如 `D:\a\_temp` | +{% ifversion not ghae %}| `RUNNER_TOOL_CACHE` | {% data reusables.actions.runner-tool-cache-description %} 例如 `C:\hostedtoolcache\windows` |{% endif %} {% note %} **注:** -* If you need to use a workflow run's URL from within a job, you can combine these environment variables: `$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID` -* Most of the default environment variables have a corresponding, and similarly named, context property. For example, the value of the `GITHUB_REF` environment variable can be read during workflow processing using the {% raw %}`${{ github.ref }}`{% endraw %} context property. +* 如果需要在作业中使用工作流程运行的 URL，您可以组合这些环境变量：`$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID` +* 大多数默认环境变量都有一个对应且名称类似的上下文属性。 例如，在工作流程处理期间，可以使用 {% raw %}`${{ github.ref }}`{% endraw %} 上下文属性读取 `GITHUB_REF` 环境变量的值。 {% endnote %} -## Detecting the operating system +## 检测操作系统 -You can write a single workflow file that can be used for different operating systems by using the `RUNNER_OS` default environment variable and the corresponding context property {% raw %}`${{ runner.os }}`{% endraw %}. For example, the following workflow could be run successfully if you changed the operating system from `macos-latest` to `windows-latest` without having to alter the syntax of the environment variables, which differs depending on the shell being used by the runner. +通过使用默认环境变量和相应的上下文属性 {% raw %}`${{ runner.os }}`{% endraw %}，可以编写可用于不同操作系统的单个工作流程文件 `RUNNER_OS`。 例如，如果将操作系统从 `macos-latest` 更改为 `windows-latest` ，而不必更改环境变量的语法，则以下工作流程可以成功运行，这取决于运行器使用的 shell。 {% raw %} ```yaml @@ -182,11 +182,11 @@ jobs: ``` {% endraw %} -In this example, the two `if` statements check the `os` property of the `runner` context to determine the operating system of the runner. `if` conditionals are processed by {% data variables.product.prodname_actions %}, and only steps where the check resolves as `true` are sent to the runner. Here one of the checks will always be `true` and the other `false`, so only one of these steps is sent to the runner. Once the job is sent to the runner, the step is executed and the environment variable in the `echo` command is interpolated using the appropriate syntax (`$env:NAME` for PowerShell on Windows, and `$NAME` for bash and sh on Linux and MacOS). In this example, the statement `runs-on: macos-latest` means that the second step will be run. +在此示例中，两个 `if` 语句检查 `runner` 上下文的 `os` 属性，以确定运行器的操作系统。 `if` 条件由 {% data variables.product.prodname_actions %} 处理，并且只有将检查解析为 `true` 的步骤才会发送到运行器。 这里其中一个检查将始终为 `true`，而另一个检查为 `false`，因此只有其中一个步骤发送到运行器。 在作业发送到运行器后，将执行该步骤，并使用适当的语法 (在 Windows 上对 PowerShell 使用 `$env:NAME`，在 Linux 和 MacOS 上的对 bash 和 sh 使用 `$NAME`）对 `echo` 命令中的环境变量进行插值。 在此示例中，语句 `runs-on: macos-latest` 意味着将运行第二步。 -## Passing values between steps and jobs in a workflow +## 在工作流程中的步骤和作业之间传递值 - If you generate a value in one step of a job, you can use the value in subsequent steps of the same job by assigning the value to an existing or new environment variable and then writing this to the `GITHUB_ENV` environment file. The environment file can be used directly by an action, or from a shell command in the workflow file by using the `run` keyword. 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/reference/workflow-commands-for-github-actions/#setting-an-environment-variable)”。 + 如果在作业的某个步骤中生成值，则可以在同一作业的后续步骤中使用该值，方法是将该值分配给现有或新的环境变量，然后将其写入 `GITHUB_ENV` 环境文件。 环境文件可由操作直接使用，也可从工作流程文件中的 shell 命令使用 `run` 关键字。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/reference/workflow-commands-for-github-actions/#setting-an-environment-variable)”。 - If you want to pass a value from a step in one job in a workflow to a step in another job in the workflow, you can define the value as a job output. You can then reference this job output from a step in another job. 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idoutputs)”。 + 如果要将工作流程中一个作业的某个步骤中的值传递到工作流程中另一作业的某个步骤，可以将该值定义为作业输出。 然后，可以从另一个作业中的步骤引用此作业输出。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idoutputs)”。 diff --git a/translations/zh-CN/content/actions/learn-github-actions/expressions.md b/translations/zh-CN/content/actions/learn-github-actions/expressions.md index 55437616e6bd..68f1f300a7d4 100644 --- a/translations/zh-CN/content/actions/learn-github-actions/expressions.md +++ b/translations/zh-CN/content/actions/learn-github-actions/expressions.md @@ -1,7 +1,7 @@ --- title: Expressions shortTitle: Expressions -intro: You can evaluate expressions in workflows and actions. +intro: 您可以评估工作流程和操作中的表达式。 versions: fpt: '*' ghes: '*' @@ -13,9 +13,9 @@ miniTocMaxHeadingLevel: 3 {% data reusables.actions.enterprise-beta %} {% data reusables.actions.enterprise-github-hosted-runners %} -## About expressions +## 关于表达式 -You can use expressions to programmatically set environment variables in workflow files and access contexts. 表达式可以是文字值、上下文引用或函数的任意组合。 您可以使用运算符组合文字、上下文引用和函数。 For more information about contexts, see "[Contexts](/actions/learn-github-actions/contexts)." +您可以使用表达式程序化设置工作流程文件中的环境变量和访问上下文。 表达式可以是文字值、上下文引用或函数的任意组合。 您可以使用运算符组合文字、上下文引用和函数。 有关上下文的更多信息，请参阅“[上下文](/actions/learn-github-actions/contexts)”。 表达式通常在工作流程文件中与条件性 `if` 关键词一起用来确定步骤是否应该运行。 当 `if` 条件为 `true` 时，步骤将会运行。 @@ -50,12 +50,12 @@ env: 作为表达式的一部分，您可以使用 `boolean`、`null`、`number` 或 `string` 数据类型。 -| 数据类型 | 文字值 | -| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `布尔值` | `true` 或 `false` | -| `null` | `null` | -| `number` | JSON 支持的任何数字格式。 | -| `字符串` | You don't need to enclose strings in `{% raw %}${{{% endraw %}` and `{% raw %}}}{% endraw %}`. However, if you do, you must use single quotes (`'`) around the string. To use a literal single quote, escape the literal single quote using an additional single quote (`''`). Wrapping with double quotes (`"`) will throw an error. | +| 数据类型 | 文字值 | +| -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `布尔值` | `true` 或 `false` | +| `null` | `null` | +| `number` | JSON 支持的任何数字格式。 | +| `字符串` | 您不需要将字符串括在 `{% raw %}${{{% endraw %}` 和 `{% raw %}}}{% endraw %}` 中。 但是，如果这样做，则必须在字符串两边使用单引号 (`'`)。 要使用文字单引号，请使用额外的单引号转义文字单引号 (`''`)。 用双引号 (`"`) 括起来会引发错误。 | #### 示例 @@ -77,20 +77,20 @@ env: ## 运算符 -| 运算符 | 描述 | -| ------------------------- | --------------------- | -| `( )` | 逻辑分组 | -| `[ ]` | 索引 | -| `.` | Property de-reference | -| `!` | 非 | -| `<` | 小于 | -| `<=` | 小于或等于 | -| `>` | 大于 | -| `>=` | 大于或等于 | -| `==` | 等于 | -| `!=` | 不等于 | -| `&&` | 和 | -| \|\| | 或 | +| 运算符 | 描述 | +| ------------------------- | ------ | +| `( )` | 逻辑分组 | +| `[ ]` | 索引 | +| `.` | 属性取消引用 | +| `!` | 非 | +| `<` | 小于 | +| `<=` | 小于或等于 | +| `>` | 大于 | +| `>=` | 大于或等于 | +| `==` | 等于 | +| `!=` | 不等于 | +| `&&` | 和 | +| \|\| | 或 | {% data variables.product.prodname_dotcom %} 进行宽松的等式比较。 @@ -127,7 +127,7 @@ env: #### 使用数组的示例 -`contains(github.event.issue.labels.*.name, 'bug')` returns whether the issue related to the event has a label "bug". +`contains(github.event.issue.labels.*.name, 'bug')` 返回与事件相关的议题是否带有标签 "bug"。 #### 使用字符串的示例 @@ -252,7 +252,7 @@ jobs: `hashFiles(path)` -返回匹配 `path` 模式的文件集的单个哈希值。 您可以提供单一 `path` 模式，或以逗号分隔的多个 `path` 模式。 `path` 相对于 `GITHUB_WORKSPACE` 目录，只能包括 `GITHUB_WORKSPACE` 中的文件。 此函数为每个匹配的文件计算单独的 SHA-256 哈希， 然后使用这些哈希来计算文件集的最终 SHA-256 哈希。 If the `path` pattern does not match any files, this returns an empty string. 有关 SHA-256 的更多信息，请参阅“[SHA-2](https://en.wikipedia.org/wiki/SHA-2)”。 +返回匹配 `path` 模式的文件集的单个哈希值。 您可以提供单一 `path` 模式，或以逗号分隔的多个 `path` 模式。 `path` 相对于 `GITHUB_WORKSPACE` 目录，只能包括 `GITHUB_WORKSPACE` 中的文件。 此函数为每个匹配的文件计算单独的 SHA-256 哈希， 然后使用这些哈希来计算文件集的最终 SHA-256 哈希。 如果 `path` 模式与任何文件都不匹配，则返回空字符串。 有关 SHA-256 的更多信息，请参阅“[SHA-2](https://en.wikipedia.org/wiki/SHA-2)”。 您可以使用模式匹配字符来匹配文件名。 模式匹配在 Windows 上不区分大小写。 有关支持的模式匹配字符的更多信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/using-workflows/workflow-syntax-for-github-actions/#filter-pattern-cheat-sheet)”。 @@ -272,10 +272,10 @@ jobs: {% ifversion fpt or ghes > 3.3 or ghae-issue-5504 or ghec %} ## 状态检查函数 -您可以使用以下状态检查函数作为 `if` 条件中的表达式。 除非您包含其中一个函数，否则 `success()` 的默认状态检查将会应用。 For more information about `if` conditionals, see "[Workflow syntax for GitHub Actions](/articles/workflow-syntax-for-github-actions/#jobsjob_idif)" and "[Metadata syntax for GitHub Composite Actions](/actions/creating-actions/metadata-syntax-for-github-actions/#runsstepsif)". +您可以使用以下状态检查函数作为 `if` 条件中的表达式。 除非您包含其中一个函数，否则 `success()` 的默认状态检查将会应用。 有关 `if` 条件的更多信息，请参阅“[GitHub 操作的工作流程语法](/articles/workflow-syntax-for-github-actions/#jobsjob_idif)”和“[GitHub 复合操作的元数据语法](/actions/creating-actions/metadata-syntax-for-github-actions/#runsstepsif)”。 {% else %} -## Check Functions -您可以使用以下状态检查函数作为 `if` 条件中的表达式。 除非您包含其中一个函数，否则 `success()` 的默认状态检查将会应用。 For more information about `if` conditionals, see "[Workflow syntax for GitHub Actions](/articles/workflow-syntax-for-github-actions/#jobsjob_idif)". +## 检查函数 +您可以使用以下状态检查函数作为 `if` 条件中的表达式。 除非您包含其中一个函数，否则 `success()` 的默认状态检查将会应用。 有关 `if` 条件的更多信息，请参阅“[GitHub 操作的工作流程语法](/articles/workflow-syntax-for-github-actions/#jobsjob_idif)”。 {% endif %} ### success @@ -313,7 +313,7 @@ if: {% raw %}${{ cancelled() }}{% endraw %} ### failure -在作业的任何之前一步失败时返回 `true`。 If you have a chain of dependent jobs, `failure()` returns `true` if any ancestor job fails. +在作业的任何之前一步失败时返回 `true`。 如果您有相依作业链，`failure()` 在任何上层节点作业失败时返回 `true`。 #### 示例 @@ -325,11 +325,11 @@ steps: ``` {% ifversion fpt or ghes > 3.3 or ghae-issue-5504 or ghec %} -### Evaluate Status Explicitly +### 显式评估状态 -Instead of using one of the methods above, you can evaluate the status of the job or composite action that is executing the step directly: +您可以直接评估执行步骤的作业或复合操作的状态，而不是使用上述方法之一： -#### Example for workflow step +#### 工作流程步骤示例 ```yaml steps: @@ -338,9 +338,9 @@ steps: if: {% raw %}${{ job.status == 'failure' }}{% endraw %} ``` -This is the same as using `if: failure()` in a job step. +这与在作业步骤中使用 `if: failure()` 相同。 -#### Example for composite action step +#### 复合操作步骤的示例 ```yaml steps: @@ -349,7 +349,7 @@ steps: if: {% raw %}${{ github.action_status == 'failure' }}{% endraw %} ``` -This is the same as using `if: failure()` in a composite action step. +这与在复合操作步骤中使用 `if: failure()` 相同。 {% endif %} ## 对象过滤器 diff --git a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-azure-pipelines-to-github-actions.md b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-azure-pipelines-to-github-actions.md index b2c8c001b583..181dce8e657a 100644 --- a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-azure-pipelines-to-github-actions.md +++ b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-azure-pipelines-to-github-actions.md @@ -203,7 +203,7 @@ jobs: -For more information, see "[Expressions](/actions/learn-github-actions/expressions)." +更多信息请参阅“[表达式](/actions/learn-github-actions/expressions)”。 ## 作业之间的依赖关系 diff --git a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md index 4a086b1233f8..fa11f2af2a23 100644 --- a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md +++ b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md @@ -212,7 +212,7 @@ jobs: -For more information, see "[Expressions](/actions/learn-github-actions/expressions)." +更多信息请参阅“[表达式](/actions/learn-github-actions/expressions)”。 ## 作业之间的依赖关系 diff --git a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md index 0c067b5a8284..1852fad68d60 100644 --- a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md +++ b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md @@ -187,7 +187,7 @@ Travis CI 和 {% data variables.product.prodname_actions %} 可以将自定义 ### 存储密码 -{% data variables.product.prodname_actions %} 允许您存储密码并在作业中引用它们。 {% data variables.product.prodname_actions %} 组织可以限制哪些仓库能够访问组织机密。 Environment protection rules can require manual approval for a workflow to access environment secrets. 更多信息请参阅“[加密密码](/actions/reference/encrypted-secrets)”。 +{% data variables.product.prodname_actions %} 允许您存储密码并在作业中引用它们。 {% data variables.product.prodname_actions %} 组织可以限制哪些仓库能够访问组织机密。 环境保护规则可能需要手动批准工作流程才能访问环境秘密。 更多信息请参阅“[加密密码](/actions/reference/encrypted-secrets)”。 ### 在作业和工作流程之间共享文件 @@ -241,7 +241,7 @@ steps: ## 迁移条件和表达式的语法 -要在条件表达式下运行作业，Travis CI 和 {% data variables.product.prodname_actions %} 具有类似的 `if` 条件语法。 {% data variables.product.prodname_actions %} 允许您使用 `if` 条件使作业或步骤仅在满足条件时才运行。 For more information, see "[Expressions](/actions/learn-github-actions/expressions)." +要在条件表达式下运行作业，Travis CI 和 {% data variables.product.prodname_actions %} 具有类似的 `if` 条件语法。 {% data variables.product.prodname_actions %} 允许您使用 `if` 条件使作业或步骤仅在满足条件时才运行。 更多信息请参阅“[表达式](/actions/learn-github-actions/expressions)”。 此示例演示 `if` 条件如何控制是否执行步骤： diff --git a/translations/zh-CN/content/actions/security-guides/encrypted-secrets.md b/translations/zh-CN/content/actions/security-guides/encrypted-secrets.md index a20f8f2fb885..0af52dae703c 100644 --- a/translations/zh-CN/content/actions/security-guides/encrypted-secrets.md +++ b/translations/zh-CN/content/actions/security-guides/encrypted-secrets.md @@ -1,6 +1,6 @@ --- title: 加密机密 -intro: 'Encrypted secrets allow you to store sensitive information in your organization{% ifversion fpt or ghes or ghec %}, repository, or repository environments{% else %} or repository{% endif %}.' +intro: '加密密码可让您将敏感信息存储在您的组织{% ifversion fpt or ghes or ghec %}、仓库或者仓库环境{% else %} 或仓库{% endif %} 中。' redirect_from: - /github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets - /actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets @@ -19,7 +19,7 @@ versions: ## 关于加密密码 -Secrets are encrypted environment variables that you create in an organization, repository, or repository environment. 您创建的机密可用于 {% data variables.product.prodname_actions %} 工作流程。 在机密到达 {% data variables.product.prodname_dotcom %} 之前，{% data variables.product.prodname_dotcom %} 使用 [libsodium 密封盒](https://libsodium.gitbook.io/doc/public-key_cryptography/sealed_boxes)对机密加密，并且在您于工作流程中使用它们之前一直保持加密状态。 +机密是在组织、存储库或存储库环境中创建的加密环境变量。 您创建的机密可用于 {% data variables.product.prodname_actions %} 工作流程。 在机密到达 {% data variables.product.prodname_dotcom %} 之前，{% data variables.product.prodname_dotcom %} 使用 [libsodium 密封盒](https://libsodium.gitbook.io/doc/public-key_cryptography/sealed_boxes)对机密加密，并且在您于工作流程中使用它们之前一直保持加密状态。 {% data reusables.actions.secrets-org-level-overview %} @@ -39,15 +39,15 @@ Secrets are encrypted environment variables that you create in an organization, {% data reusables.codespaces.secrets-naming %} - For example, a secret created at the environment level must have a unique name in that environment, a secret created at the repository level must have a unique name in that repository, and a secret created at the organization level must have a unique name at that level. + 例如，在环境级别创建的机密必须在环境中具有唯一的名称，在仓库级别创建的机密必须在该仓库中具有唯一的名称，而在组织级别创建的机密必须在该级别具有独特的名称。 - {% data reusables.codespaces.secret-precedence %} Similarly, if an organization, repository, and environment all have a secret with the same name, the environment-level secret takes precedence. + {% data reusables.codespaces.secret-precedence %} 同样，如果组织、存储库和环境都具有同名的机密，则环境级机密优先。 为帮助确保 {% data variables.product.prodname_dotcom %} 在日志中编写密码，请勿将结构化数据用作密码的值。 例如，避免创建包含 JSON 或编码 Git blob 的密码。 ### 访问您的密码 -为使密码用于操作，必须将密码设置为工作流程文件中的输入或环境变量。 查看操作的自述文件以了解操作预期的输入和环境变量。 For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/articles/workflow-syntax-for-github-actions/#jobsjob_idstepsenv)." +为使密码用于操作，必须将密码设置为工作流程文件中的输入或环境变量。 查看操作的自述文件以了解操作预期的输入和环境变量。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/articles/workflow-syntax-for-github-actions/#jobsjob_idstepsenv)”。 如果您拥有编辑文件的权限，便可在工作流程文件中使用和读取加密密码。 更多信息请参阅“[{% data variables.product.prodname_dotcom %} 上的访问权限](/github/getting-started-with-github/access-permissions-on-github)”。 @@ -55,11 +55,11 @@ Secrets are encrypted environment variables that you create in an organization, 当工作流程运行排队时读取组织和仓库机密，在引用环境的作业开始时读取环境机密。 -您还可以使用 REST API 管理密码。 For more information, see "[Secrets](/rest/reference/actions#secrets)." +您还可以使用 REST API 管理密码。 更多信息请参阅“[机密](/rest/reference/actions#secrets)”。 ### 限制凭据权限 -生成凭据时，建议尽可能授予最低的权限。 For example, instead of using personal credentials, use [deploy keys](/developers/overview/managing-deploy-keys#deploy-keys) or a service account. 请考虑授予只读权限（如果这是所需的全部权限）并尽可能限制访问。 生成个人访问令牌 (PAT) 时，选择所需的最小范围。 +生成凭据时，建议尽可能授予最低的权限。 例如，不使用个人凭据，而使用[部署密钥](/developers/overview/managing-deploy-keys#deploy-keys)或服务帐户。 请考虑授予只读权限（如果这是所需的全部权限）并尽可能限制访问。 生成个人访问令牌 (PAT) 时，选择所需的最小范围。 {% note %} @@ -81,7 +81,7 @@ Secrets are encrypted environment variables that you create in an organization, 1. 输入密码的值。 1. 单击 **Add secret（添加密码）**。 -If your repository has environment secrets or can access secrets from the parent organization, then those secrets are also listed on this page. +如果您的存储库具有环境机密或可以访问上级组织的机密，则这些机密也会在此页面上列出。 {% endwebui %} @@ -209,11 +209,11 @@ gh secret list --org organization-name {% note %} -**Note:** {% data reusables.actions.forked-secrets %} +**注意：** {% data reusables.actions.forked-secrets %} {% endnote %} -要提供以密码作为输入或环境变量的操作，可以使用 `secrets` 上下文访问您在仓库中创建的密码。 For more information, see "[Contexts](/actions/learn-github-actions/contexts)" and "[Workflow syntax for {% data variables.product.prodname_actions %}](/github/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions)." +要提供以密码作为输入或环境变量的操作，可以使用 `secrets` 上下文访问您在仓库中创建的密码。 更多信息请参阅“[上下文](/actions/learn-github-actions/contexts)”和“[ {% data variables.product.prodname_actions %} 的工作流语法](/github/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions)”。 {% raw %} ```yaml @@ -226,7 +226,7 @@ steps: ``` {% endraw %} -尽可能避免使用命令行在进程之间传递密码。 Command-line processes may be visible to other users (using the `ps` command) or captured by [security audit events](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing). 为帮助保护密码，请考虑使用环境变量 `STDIN` 或目标进程支持的其他机制。 +尽可能避免使用命令行在进程之间传递密码。 命令行进程可能对其他用户可见（使用 `ps` 命令）或通过[安全审计事件](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing)获取。 为帮助保护密码，请考虑使用环境变量 `STDIN` 或目标进程支持的其他机制。 如果必须在命令行中传递密码，则将它们包含在适当的引用规则中。 密码通常包含可能意外影响 shell 的特殊字符。 要转义这些特殊字符，请引用环境变量。 例如： @@ -271,19 +271,19 @@ steps: ## 密码的限制 -You can store up to 1,000 organization secrets, 100 repository secrets, and 100 environment secrets. +最多可以存储 1,000 个组织机密、100 个存储库机密和 100 个环境机密。 在仓库中创建的工作流程可以访问以下数量的密钥： * 所有100个仓库密钥。 * 如果分配仓库访问超过 100 个组织密钥，则工作流程只能使用前 100 个组织密钥（按密钥名称字母顺序排序）。 -* All 100 environment secrets. +* 所有 100 个环境机密。 密码大小限于 64 KB。 要使用大于 64 KB 的密码，可以将加密的密码存储在仓库中，并将解密短语在 {% data variables.product.prodname_dotcom %} 上存储为密码。 例如，在将文件检入您在 {% data variables.product.prodname_dotcom %} 上的仓库之前，可以使用 `gpg` 在本地对您的凭据加密。 更多信息请参阅“[gpg manpage](https://www.gnupg.org/gph/de/manual/r1023.html)”。 {% warning %} -**Warning**: Be careful that your secrets do not get printed when your action runs. 使用此解决方法时，{% data variables.product.prodname_dotcom %} 不会编写日志中印出的密码。 +**警告**：请注意，在操作运行时不会打印您的机密。 使用此解决方法时，{% data variables.product.prodname_dotcom %} 不会编写日志中印出的密码。 {% endwarning %} @@ -347,30 +347,30 @@ You can store up to 1,000 organization secrets, 100 repository secrets, and 100 ``` {% endraw %} -## Storing Base64 binary blobs as secrets +## 将 Base64 二进制 blob 存储为机密 -You can use Base64 encoding to store small binary blobs as secrets. You can then reference the secret in your workflow and decode it for use on the runner. For the size limits, see ["Limits for secrets"](/actions/security-guides/encrypted-secrets#limits-for-secrets). +可以使用 Base64 编码将小型二进制 blob 存储为机密。 然后，您可以在工作流程中引用该机密，并对其进行解码以在运行器上使用。 有关大小限制，请参阅[机密限制](/actions/security-guides/encrypted-secrets#limits-for-secrets)。 {% note %} -**Note**: Note that Base64 only converts binary to text, and is not a substitute for actual encryption. +**注意**：请注意，Base64 只是将二进制转换为文本，不能替代实际加密。 {% endnote %} -1. Use `base64` to encode your file into a Base64 string. 例如： +1. 使用 `base64` 将文件编码为 Base64 字符串。 例如： ``` $ base64 -i cert.der -o cert.base64 ``` -1. Create a secret that contains the Base64 string. 例如： +1. 创建包含 Base64 字符串的机密。 例如： ``` $ gh secret set CERTIFICATE_BASE64 < cert.base64 ✓ Set secret CERTIFICATE_BASE64 for octocat/octorepo ``` -1. To access the Base64 string from your runner, pipe the secret to `base64 --decode`. 例如： +1. 要从运行器访问 Base64 字符串，请将机密传送到 `base64 --decode`。 例如： ```yaml name: Retrieve Base64 secret diff --git a/translations/zh-CN/content/actions/security-guides/index.md b/translations/zh-CN/content/actions/security-guides/index.md index d0beceb69037..a08ab9add819 100644 --- a/translations/zh-CN/content/actions/security-guides/index.md +++ b/translations/zh-CN/content/actions/security-guides/index.md @@ -1,7 +1,7 @@ --- -title: Security guides -shortTitle: Security guides -intro: 'Security hardening and good practices for {% data variables.product.prodname_actions %}.' +title: 安全指南 +shortTitle: 安全指南 +intro: '{% data variables.product.prodname_actions %} 的安全强化和良好实践。' versions: fpt: '*' ghes: '*' diff --git a/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md b/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md index 1504c6cea892..1a24c8609fc6 100644 --- a/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md +++ b/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md @@ -265,7 +265,7 @@ The attacker server can use the {% ifversion fpt or ghec %}{% data variables.pro {% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes or ghae %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which{% ifversion fpt or ghes > 3.1 or ghae or ghec %}, depending on its settings, can grant {% else %} grants {% endif %}write access to the repository. 尽管工作流程可以通过使用环境和必需的审查来控制对环境密钥的访问，但是这些工作流程不是在隔离的环境中运行，在自托管运行程器上运行时仍然容易遭受相同的风险。 -在组织或企业级别定义自托管运行器时， {% data variables.product.product_name %} 可将多个仓库中的工作流程安排到同一个运行器中。 因此，这些环境的安全危害可能会导致广泛的影响。 为了帮助缩小损害范围，可以通过将自托管运行器组织到单独的组中来创建边界。 更多信息请参阅“[使用组管理对自托管运行器的访问](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)”。 +在组织或企业级别定义自托管运行器时， {% data variables.product.product_name %} 可将多个仓库中的工作流程安排到同一个运行器中。 因此，这些环境的安全危害可能会导致广泛的影响。 为了帮助缩小损害范围，可以通过将自托管运行器组织到单独的组中来创建边界。 You can restrict what {% if restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories can access runner groups. 更多信息请参阅“[使用组管理对自托管运行器的访问](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)”。 您还应考虑自托管运行器机器的环境： - 配置为自托管运行器的计算机上存储哪些敏感信息？ 例如，私有 SSH 密钥、API 访问令牌等。 diff --git a/translations/zh-CN/content/actions/using-containerized-services/index.md b/translations/zh-CN/content/actions/using-containerized-services/index.md index 5fa792f1ea6e..2dbc10fa4c46 100644 --- a/translations/zh-CN/content/actions/using-containerized-services/index.md +++ b/translations/zh-CN/content/actions/using-containerized-services/index.md @@ -1,7 +1,7 @@ --- -title: Using containerized services -shortTitle: Containerized services -intro: 'You can use containerized services in your {% data variables.product.prodname_actions %} workflows.' +title: 使用容器化服务 +shortTitle: 容器化服务 +intro: '您可以在 {% data variables.product.prodname_actions %} 工作流程中使用容器化服务。' versions: fpt: '*' ghes: '*' diff --git a/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md b/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md index 993516dd1afb..91a3c010e7b3 100644 --- a/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md +++ b/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md @@ -162,7 +162,7 @@ jobs: ### 使用上下文创建缓存键 -缓存键可以包括 {% data variables.product.prodname_actions %} 支持的任何上下文、函数、文本和运算符。 For more information, see "[Expressions](/actions/learn-github-actions/expressions)." +缓存键可以包括 {% data variables.product.prodname_actions %} 支持的任何上下文、函数、文本和运算符。 更多信息请参阅“[表达式](/actions/learn-github-actions/expressions)”。 使用表达式创建 `key` 允许您在依赖项更改时自动创建新缓存。 例如，您可以使用计算 npm `package-lock.json` 文件哈希的表达式创建 `key`。 diff --git a/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md b/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md index 97ca0ddd5e40..8aadd5853c76 100644 --- a/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md +++ b/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md @@ -307,3 +307,5 @@ For information about using the REST API to query the audit log for an organizat ## 后续步骤 To continue learning about {% data variables.product.prodname_actions %}, see "[Events that trigger workflows](/actions/learn-github-actions/events-that-trigger-workflows)." + +{% if restrict-groups-to-workflows %}You can standardize deployments by creating a self-hosted runner group that can only execute a specific reusable workflow. For more information, see "[Managing access to self-hosted runners using groups](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)."{% endif %} diff --git a/translations/zh-CN/content/actions/using-workflows/triggering-a-workflow.md b/translations/zh-CN/content/actions/using-workflows/triggering-a-workflow.md index f43002d57cfa..90185da42906 100644 --- a/translations/zh-CN/content/actions/using-workflows/triggering-a-workflow.md +++ b/translations/zh-CN/content/actions/using-workflows/triggering-a-workflow.md @@ -187,7 +187,7 @@ jobs: gh pr comment $PR --body 'It looks like you edited `package*.json`, `.github/CODEOWNERS`, or `.github/workflows/**`. We do not allow contributions to these files. Please review our [contributing guidelines](https://github.com/octo-org/octo-repo/blob/main/CONTRIBUTING.md) for what contributions are accepted.' ``` -For more information about contexts, see "[Contexts](/actions/learn-github-actions/contexts)." For more information about event payloads, see "[Webhook events and payloads](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads)." +有关上下文的更多信息，请参阅“[上下文](/actions/learn-github-actions/contexts)”。 For more information about event payloads, see "[Webhook events and payloads](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads)." ## Further controlling how your workflow will run diff --git a/translations/zh-CN/content/actions/using-workflows/workflow-commands-for-github-actions.md b/translations/zh-CN/content/actions/using-workflows/workflow-commands-for-github-actions.md index 47e981c664e8..573e25e030c4 100644 --- a/translations/zh-CN/content/actions/using-workflows/workflow-commands-for-github-actions.md +++ b/translations/zh-CN/content/actions/using-workflows/workflow-commands-for-github-actions.md @@ -92,7 +92,7 @@ core.setOutput('SELECTED_COLOR', 'green'); 设置操作的输出参数。 -（可选）您也可以在操作的元数据文件中声明输出参数。 For more information, see "[Metadata syntax for {% data variables.product.prodname_actions %}](/articles/metadata-syntax-for-github-actions#outputs-for-docker-container-and-javascript-actions)." +（可选）您也可以在操作的元数据文件中声明输出参数。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的元数据语法](/articles/metadata-syntax-for-github-actions#outputs-for-docker-container-and-javascript-actions)”。 ### 示例 diff --git a/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md b/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md index d9571da87745..4c18a315cd55 100644 --- a/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md +++ b/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md @@ -42,7 +42,6 @@ topics: {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} -{% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.options-tab %} 4. 在“Dormancy threshold”，使用下拉菜单，然后单击所需的休眠阈值。 ![Dormancy threshold 下拉菜单](/assets/images/enterprise/site-admin-settings/dormancy-threshold-menu.png) diff --git a/translations/zh-CN/content/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on.md b/translations/zh-CN/content/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on.md index 8db7d648238e..07df1ce9960d 100644 --- a/translations/zh-CN/content/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on.md +++ b/translations/zh-CN/content/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on.md @@ -20,8 +20,8 @@ shortTitle: 使用 SAML 的 PAT {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.personal_access_tokens %} -3. Next to the token you'd like to authorize, click **Configure SSO**. ![Screenshot of the dropdown menu to configure SSO for a personal access token](/assets/images/help/settings/sso-allowlist-button.png) -4. To the right of the organization you'd like to authorize the token for, click **Authorize**. ![令牌授权按钮](/assets/images/help/settings/token-authorize-button.png) +3. 在要授权的令牌旁边，单击 **Configure SSO（配置 SSO）**。 ![用于为个人访问令牌配置 SSO 的下拉菜单的屏幕截图](/assets/images/help/settings/sso-allowlist-button.png) +4. 在要为其授权令牌的组织右侧，单击 **Authorize（授权）**。 ![令牌授权按钮](/assets/images/help/settings/token-authorize-button.png) ## 延伸阅读 diff --git a/translations/zh-CN/content/authentication/authenticating-with-saml-single-sign-on/index.md b/translations/zh-CN/content/authentication/authenticating-with-saml-single-sign-on/index.md index 9b5deea568bd..85ba86bd1489 100644 --- a/translations/zh-CN/content/authentication/authenticating-with-saml-single-sign-on/index.md +++ b/translations/zh-CN/content/authentication/authenticating-with-saml-single-sign-on/index.md @@ -1,6 +1,6 @@ --- title: 使用 SAML 单点登录进行身份验证 -intro: 'You can authenticate to {% data variables.product.product_name %} with SAML single sign-on (SSO){% ifversion ghec %} and view your active sessions{% endif %}.' +intro: '您可以使用 SAML 单点登录 (SSO) 向 {% data variables.product.product_name %} 进行身份验证{% ifversion ghec %}，并查看活动的会话{% endif %}。' redirect_from: - /articles/authenticating-to-a-github-organization-with-saml-single-sign-on - /articles/authenticating-with-saml-single-sign-on diff --git a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/about-ssh.md b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/about-ssh.md index afe2cb5ac990..a649ffb62839 100644 --- a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/about-ssh.md +++ b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/about-ssh.md @@ -1,6 +1,6 @@ --- -title: 关于 SSH -intro: '使用 SSH 协议可以连接远程服务器和服务并向它们验证。 利用 SSH 密钥可以连接 {% data variables.product.product_name %}，而无需在每次访问时都提供用户名和个人访问令牌。' +title: About SSH +intro: 'Using the SSH protocol, you can connect and authenticate to remote servers and services. With SSH keys, you can connect to {% data variables.product.product_name %} without supplying your username and personal access token at each visit.' redirect_from: - /articles/about-ssh - /github/authenticating-to-github/about-ssh @@ -13,23 +13,22 @@ versions: topics: - SSH --- +When you set up SSH, you will need to generate a new SSH key and add it to the ssh-agent. You must add the SSH key to your account on {% data variables.product.product_name %} before you use the key to authenticate. For more information, see "[Generating a new SSH key and adding it to the ssh-agent](/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)" and "[Adding a new SSH key to your {% data variables.product.prodname_dotcom %} account](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)." -设置 SSH 时，您需要生成新的 SSH 密钥并将其添加到 ssh 代理中。 使用密钥进行身份验证之前，您必须将 SSH 密钥添加到 {% data variables.product.product_name %} 上的帐户中。 更多信息请参阅“[生成新的 SSH 密钥并将其添加到 ssh 代理](/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)”和“[添加新的 SSH 密钥到 {% data variables.product.prodname_dotcom %} 帐户](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)”。 +You can further secure your SSH key by using a hardware security key, which requires the physical hardware security key to be attached to your computer when the key pair is used to authenticate with SSH. You can also secure your SSH key by adding your key to the ssh-agent and using a passphrase. For more information, see "[Working with SSH key passphrases](/github/authenticating-to-github/working-with-ssh-key-passphrases)." -您可以使用硬件安全密钥来进一步保护 SSH 密钥，当密钥对用于通过 SSH 进行身份验证时，需要将物理硬件安全密钥附加到计算机上。 您还可以通过将密钥添加到 ssh 代理并使用密码来保护您的 SSH 密钥。 更多信息请参阅“[使用 SSH 密钥密码](/github/authenticating-to-github/working-with-ssh-key-passphrases)”。 +{% ifversion fpt or ghec %}To use your SSH key with a repository owned by an organization that uses SAML single sign-on, you must authorize the key. For more information, see "[Authorizing an SSH key for use with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}{% endif %} -{% ifversion fpt or ghec %}要对使用 SAML 单点登录的组织所拥有的仓库使用 SSH 密钥，您必须授权密钥。 For more information, see "[Authorizing an SSH key for use with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}{% endif %} - -为了保持帐户安全，您可以定期检查您的 SSH 密钥列表，并撤销任何无效或已泄漏的密钥。 更多信息请参阅“[审查 SSH 密钥](/github/authenticating-to-github/reviewing-your-ssh-keys)”。 +To maintain account security, you can regularly review your SSH keys list and revoke any keys that are invalid or have been compromised. For more information, see "[Reviewing your SSH keys](/github/authenticating-to-github/reviewing-your-ssh-keys)." {% ifversion fpt or ghec %} -如果 SSH 密钥一年未使用，则作为安全预防措施，{% data variables.product.prodname_dotcom %} 会自动删除非活动的 SSH 密钥。 更多信息请参阅“[删除或缺失的 SSH 密钥](/articles/deleted-or-missing-ssh-keys)”。 +If you haven't used your SSH key for a year, then {% data variables.product.prodname_dotcom %} will automatically delete your inactive SSH key as a security precaution. For more information, see "[Deleted or missing SSH keys](/articles/deleted-or-missing-ssh-keys)." {% endif %} -If you're a member of an organization that provides SSH certificates, you can use your certificate to access that organization's repositories without adding the certificate to your account on {% data variables.product.product_name %}. You cannot use your certificate to access forks of the organization's repositories that are owned by your user account. 更多信息请参阅“[关于 SSH 认证中心](/articles/about-ssh-certificate-authorities)”。 +If you're a member of an organization that provides SSH certificates, you can use your certificate to access that organization's repositories without adding the certificate to your account on {% data variables.product.product_name %}. You cannot use your certificate to access forks of the organization's repositories that are owned by your user account. For more information, see "[About SSH certificate authorities](/articles/about-ssh-certificate-authorities)." -## 延伸阅读 +## Further reading -- "[检查现有 SSH 密钥](/articles/checking-for-existing-ssh-keys)" -- "[测试 SSH 连接](/articles/testing-your-ssh-connection)" -- "[SSH 故障排除](/articles/troubleshooting-ssh)" +- "[Checking for existing SSH keys](/articles/checking-for-existing-ssh-keys)" +- "[Testing your SSH connection](/articles/testing-your-ssh-connection)" +- "[Troubleshooting SSH](/articles/troubleshooting-ssh)" diff --git a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account.md b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account.md index 66c18a2774a9..6dbcd7c5cb3a 100644 --- a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account.md +++ b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account.md @@ -1,6 +1,6 @@ --- title: 新增 SSH 密钥到 GitHub 帐户 -intro: 'To configure your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} to use your new (or existing) SSH key, you''ll also need to add the key to your account.' +intro: '要在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上配置帐户以使用新的（或现有的）SSH 密钥，还需要将密钥添加到帐户。' redirect_from: - /articles/adding-a-new-ssh-key-to-your-github-account - /github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account @@ -15,11 +15,11 @@ topics: shortTitle: 添加新的 SSH 密钥 --- -Before adding a new SSH key to your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, you should have: +在将新的 SSH 密钥添加到 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户之前，您应该具有： * [检查现有 SSH 密钥](/articles/checking-for-existing-ssh-keys) * [生成新 SSH 密钥并添加到 ssh-agent](/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) -After adding a new SSH key to your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, you can reconfigure any local repositories to use SSH. 更多信息请参阅“[将远程 URL 从 HTTPS 转换为 SSH](/github/getting-started-with-github/managing-remote-repositories/#switching-remote-urls-from-https-to-ssh)”。 +在向您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户添加新 SSH 密钥后，您可以重新配置任何本地存储库以使用 SSH。 更多信息请参阅“[将远程 URL 从 HTTPS 转换为 SSH](/github/getting-started-with-github/managing-remote-repositories/#switching-remote-urls-from-https-to-ssh)”。 {% data reusables.ssh.key-type-support %} @@ -121,7 +121,7 @@ After adding a new SSH key to your account on {% ifversion ghae %}{% data variab {% data reusables.cli.cli-learn-more %} -Before you can use the {% data variables.product.prodname_cli %} to add an SSH key to your account, you must authenticate to the {% data variables.product.prodname_cli %}. For more information, see [`gh auth login`](https://cli.github.com/manual/gh_auth_login) in the {% data variables.product.prodname_cli %} documentation. +在使用 {% data variables.product.prodname_cli %} 将 SSH 密钥添加到帐户之前，必须向 {% data variables.product.prodname_cli %} 进行身份验证。 更多信息请参阅 {% data variables.product.prodname_cli %} 文档中的 [`gh auth login`](https://cli.github.com/manual/gh_auth_login)。 要将 SSH 密钥添加到您的 GitHub 帐户，请使用 `ssh-key add` 子命令，指定您公钥。 @@ -135,7 +135,7 @@ gh ssh-key add key-file gh ssh-key add key-file --title "personal laptop" ``` -If you generated your SSH key by following the instructions in "[Generating a new SSH key](/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)", you can add the key to your account with this command. +如果按照“[生成新的 SSH 密钥](/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)”中的说明生成了 SSH 密钥，则可以使用此命令将密钥添加到您的帐户。 ```shell gh ssh-key add ~/.ssh/id_ed25519.pub diff --git a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys.md b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys.md index eb55e54331a9..291407dc293b 100644 --- a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys.md +++ b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys.md @@ -1,6 +1,6 @@ --- -title: 检查现有 SSH 密钥 -intro: 在生成 SSH 密钥之前，您可以检查是否有任何现有的 SSH 密钥。 +title: Checking for existing SSH keys +intro: 'Before you generate an SSH key, you can check to see if you have any existing SSH keys.' redirect_from: - /articles/checking-for-existing-ssh-keys - /github/authenticating-to-github/checking-for-existing-ssh-keys @@ -12,7 +12,7 @@ versions: ghec: '*' topics: - SSH -shortTitle: 检查现有 SSH 密钥 +shortTitle: Check for existing SSH key --- {% data reusables.ssh.key-type-support %} @@ -25,7 +25,7 @@ shortTitle: 检查现有 SSH 密钥 # Lists the files in your .ssh directory, if they exist ``` -3. 检查目录列表以查看是否已经有 SSH 公钥。 By default, the {% ifversion ghae %}filename of a supported public key for {% data variables.product.product_name %} is *id_rsa.pub*.{% elsif fpt or ghes %}filenames of supported public keys for {% data variables.product.product_name %} are one of the following. +3. Check the directory listing to see if you already have a public SSH key. By default, the {% ifversion ghae %}filename of a supported public key for {% data variables.product.product_name %} is *id_rsa.pub*.{% elsif fpt or ghes %}filenames of supported public keys for {% data variables.product.product_name %} are one of the following. - *id_rsa.pub* - *id_ecdsa.pub* - *id_ed25519.pub*{% endif %} diff --git a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md index 527a8a9e9753..98e191c19ba9 100644 --- a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md +++ b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md @@ -1,6 +1,6 @@ --- -title: 生成新 SSH 密钥并添加到 ssh-agent -intro: 检查现有 SSH 密钥后，您可以生成新 SSH 密钥以用于身份验证，然后将其添加到 ssh-agent。 +title: Generating a new SSH key and adding it to the ssh-agent +intro: 'After you''ve checked for existing SSH keys, you can generate a new SSH key to use for authentication, then add it to the ssh-agent.' redirect_from: - /articles/adding-a-new-ssh-key-to-the-ssh-agent - /articles/generating-a-new-ssh-key @@ -14,24 +14,23 @@ versions: ghec: '*' topics: - SSH -shortTitle: 生成新 SSH 密钥 +shortTitle: Generate new SSH key --- +## About SSH key generation -## 关于 SSH 密钥生成 - -如果您还没有 SSH 密钥，则必须生成新 SSH 密钥用于身份验证。 如果不确定是否已经拥有 SSH 密钥，您可以检查现有密钥。 更多信息请参阅“[检查现有 SSH 密钥](/github/authenticating-to-github/checking-for-existing-ssh-keys)”。 +If you don't already have an SSH key, you must generate a new SSH key to use for authentication. If you're unsure whether you already have an SSH key, you can check for existing keys. For more information, see "[Checking for existing SSH keys](/github/authenticating-to-github/checking-for-existing-ssh-keys)." {% ifversion fpt or ghae or ghes > 3.1 or ghec %} -如果要使用硬件安全密钥向 {% data variables.product.product_name %} 验证，则必须为硬件安全密钥生成新的 SSH 密钥。 使用密钥对进行身份验证时，您必须将硬件安全密钥连接到计算机。 更多信息请参阅 [OpenSSH 8.2 发行说明](https://www.openssh.com/txt/release-8.2)。 +If you want to use a hardware security key to authenticate to {% data variables.product.product_name %}, you must generate a new SSH key for your hardware security key. You must connect your hardware security key to your computer when you authenticate with the key pair. For more information, see the [OpenSSH 8.2 release notes](https://www.openssh.com/txt/release-8.2). {% endif %} -如果不想在每次使用 SSH 密钥时重新输入密码，您可以将密钥添加到 SSH 代理，让它管理您的 SSH 密钥并记住您的密码。 +If you don't want to reenter your passphrase every time you use your SSH key, you can add your key to the SSH agent, which manages your SSH keys and remembers your passphrase. -## 生成新 SSH 密钥 +## Generating a new SSH key {% data reusables.command_line.open_the_multi_os_terminal %} -2. 粘贴下面的文本（替换为您的 {% data variables.product.product_name %} 电子邮件地址）。 +2. Paste the text below, substituting in your {% data variables.product.product_name %} email address. {% ifversion ghae %} ```shell @@ -43,7 +42,7 @@ shortTitle: 生成新 SSH 密钥 ``` {% note %} - **注：**如果您使用的是不支持 Ed25519 算法的旧系统，请使用以下命令： + **Note:** If you are using a legacy system that doesn't support the Ed25519 algorithm, use: ```shell $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com" ``` @@ -51,11 +50,11 @@ shortTitle: 生成新 SSH 密钥 {% endnote %} {% endif %} - 这将以提供的电子邮件地址为标签创建新 SSH 密钥。 + This creates a new SSH key, using the provided email as a label. ```shell > Generating public/private algorithm key pair. ``` -3. 提示您“Enter a file in which to save the key（输入要保存密钥的文件）”时，按 Enter 键。 这将接受默认文件位置。 +3. When you're prompted to "Enter a file in which to save the key," press Enter. This accepts the default file location. {% mac %} @@ -81,36 +80,36 @@ shortTitle: 生成新 SSH 密钥 {% endlinux %} -4. 在提示时输入安全密码。 更多信息请参阅“[使用 SSH 密钥密码](/articles/working-with-ssh-key-passphrases)”。 +4. At the prompt, type a secure passphrase. For more information, see ["Working with SSH key passphrases](/articles/working-with-ssh-key-passphrases)." ```shell > Enter passphrase (empty for no passphrase): [Type a passphrase] > Enter same passphrase again: [Type passphrase again] ``` -## 将 SSH 密钥添加到 ssh-agent +## Adding your SSH key to the ssh-agent -在向 ssh 代理添加新的 SSH 密钥以管理您的密钥之前，您应该检查现有 SSH 密钥并生成新的 SSH 密钥。 将 SSH 密钥添加到该代理时，应使用默认的 macOS `ssh-add` 命令，而不是使用通过 [macports](https://www.macports.org/), [homebrew](http://brew.sh/) 或某些其他外部来源安装的应用程序。 +Before adding a new SSH key to the ssh-agent to manage your keys, you should have checked for existing SSH keys and generated a new SSH key. When adding your SSH key to the agent, use the default macOS `ssh-add` command, and not an application installed by [macports](https://www.macports.org/), [homebrew](http://brew.sh/), or some other external source. {% mac %} {% data reusables.command_line.start_ssh_agent %} -2. 如果您使用的是 macOS Sierra 10.12.2 或更高版本，则需要修改 `~/.ssh/config` 文件以自动将密钥加载到 ssh-agent 中并在密钥链中存储密码。 +2. If you're using macOS Sierra 10.12.2 or later, you will need to modify your `~/.ssh/config` file to automatically load keys into the ssh-agent and store passphrases in your keychain. - * 首先，检查您的 `~/.ssh/config` 文件是否在默认位置。 + * First, check to see if your `~/.ssh/config` file exists in the default location. ```shell $ open ~/.ssh/config > The file /Users/you/.ssh/config does not exist. ``` - * 如果文件不存在，请创建该文件。 + * If the file doesn't exist, create the file. ```shell $ touch ~/.ssh/config ``` - * 打开您的 `~/.ssh/config` 文件，然后修改文件以包含以下行。 如果您的 SSH 密钥文件与示例代码具有不同的名称或路径，请修改文件名或路径以匹配您当前的设置。 + * Open your `~/.ssh/config` file, then modify the file to contain the following lines. If your SSH key file has a different name or path than the example code, modify the filename or path to match your current setup. ``` Host * @@ -121,20 +120,20 @@ shortTitle: 生成新 SSH 密钥 {% note %} - **注意：** 如果您选择不向密钥添加密码，应该省略 `UseKeychain` 行。 - + **Note:** If you chose not to add a passphrase to your key, you should omit the `UseKeychain` line. + {% endnote %} - + {% mac %} {% note %} - **注意：**如果您看到如下错误 + **Note:** If you see an error like this ``` /Users/USER/.ssh/config: line 16: Bad configuration option: usekeychain ``` - 向 `Host *` 部分添加一个额外的配置行： + add an additional config line to your `Host *` section: ``` Host * @@ -143,22 +142,22 @@ shortTitle: 生成新 SSH 密钥 {% endnote %} {% endmac %} - -3. 将 SSH 私钥添加到 ssh-agent 并将密码存储在密钥链中。 {% data reusables.ssh.add-ssh-key-to-ssh-agent %} + +3. Add your SSH private key to the ssh-agent and store your passphrase in the keychain. {% data reusables.ssh.add-ssh-key-to-ssh-agent %} ```shell $ ssh-add -K ~/.ssh/id_{% ifversion ghae %}rsa{% else %}ed25519{% endif %} ``` {% note %} - **注：**`-K` 选项位于 Apple 的 `ssh-add` 标准版本中，当您将 SSH 密钥添加到 ssh-agent 时，它会将密码存储在您的密钥链中。 如果选择不向密钥添加密码，请运行命令，而不使用 `-K` 选项。 - - 如果您没有安装 Apple 的标准版本，可能会收到错误消息。 有关解决此错误的详细信息，请参阅“[错误：ssh-add：非法选项 -- K](/articles/error-ssh-add-illegal-option-k)”。 + **Note:** The `-K` option is Apple's standard version of `ssh-add`, which stores the passphrase in your keychain for you when you add an SSH key to the ssh-agent. If you chose not to add a passphrase to your key, run the command without the `-K` option. - In MacOS Monterey (12.0), the `-K` and `-A` flags are deprecated and have been replaced by the `--apple-use-keychain` and `--apple-load-keychain` flags, respectively. + If you don't have Apple's standard version installed, you may receive an error. For more information on resolving this error, see "[Error: ssh-add: illegal option -- K](/articles/error-ssh-add-illegal-option-k)." + + In MacOS Monterey (12.0), the `-K` and `-A` flags are deprecated and have been replaced by the `--apple-use-keychain` and `--apple-load-keychain` flags, respectively. {% endnote %} -4. 将 SSH 密钥添加到 {% data variables.product.product_name %} 上的帐户。 更多信息请参阅“[将新的 SSH 密钥添加到 {% data variables.product.prodname_dotcom %} 帐户](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)”。 +4. Add the SSH key to your account on {% data variables.product.product_name %}. For more information, see "[Adding a new SSH key to your {% data variables.product.prodname_dotcom %} account](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)." {% endmac %} @@ -166,17 +165,17 @@ shortTitle: 生成新 SSH 密钥 {% data reusables.desktop.windows_git_bash %} -1. 确保 ssh-agent 正在运行。 您可以根据“[使用 SSH 密钥密码](/articles/working-with-ssh-key-passphrases)”中的“自动启动 ssh-agent”说明，或者手动启动它： +1. Ensure the ssh-agent is running. You can use the "Auto-launching the ssh-agent" instructions in "[Working with SSH key passphrases](/articles/working-with-ssh-key-passphrases)", or start it manually: ```shell # start the ssh-agent in the background $ eval "$(ssh-agent -s)" > Agent pid 59566 ``` -2. 将 SSH 私钥添加到 ssh-agent。 {% data reusables.ssh.add-ssh-key-to-ssh-agent %} +2. Add your SSH private key to the ssh-agent. {% data reusables.ssh.add-ssh-key-to-ssh-agent %} {% data reusables.ssh.add-ssh-key-to-ssh-agent-commandline %} -3. 将 SSH 密钥添加到 {% data variables.product.product_name %} 上的帐户。 更多信息请参阅“[将新的 SSH 密钥添加到 {% data variables.product.prodname_dotcom %} 帐户](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)”。 +3. Add the SSH key to your account on {% data variables.product.product_name %}. For more information, see "[Adding a new SSH key to your {% data variables.product.prodname_dotcom %} account](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)." {% endwindows %} @@ -184,37 +183,37 @@ shortTitle: 生成新 SSH 密钥 {% data reusables.command_line.start_ssh_agent %} -2. 将 SSH 私钥添加到 ssh-agent。 {% data reusables.ssh.add-ssh-key-to-ssh-agent %} +2. Add your SSH private key to the ssh-agent. {% data reusables.ssh.add-ssh-key-to-ssh-agent %} {% data reusables.ssh.add-ssh-key-to-ssh-agent-commandline %} -3. 将 SSH 密钥添加到 {% data variables.product.product_name %} 上的帐户。 更多信息请参阅“[将新的 SSH 密钥添加到 {% data variables.product.prodname_dotcom %} 帐户](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)”。 +3. Add the SSH key to your account on {% data variables.product.product_name %}. For more information, see "[Adding a new SSH key to your {% data variables.product.prodname_dotcom %} account](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)." {% endlinux %} {% ifversion fpt or ghae or ghes > 3.1 or ghec %} -## 为硬件安全密钥生成新的 SSH 密钥 +## Generating a new SSH key for a hardware security key -如果您使用 macOS 或 Linux， 在生成新的 SSH 密钥之前，您可能需要更新 SSH 客户端或安装新的 SSH 客户端。 更多信息请参阅“[错误：未知密钥类型](/github/authenticating-to-github/error-unknown-key-type)”。 +If you are using macOS or Linux, you may need to update your SSH client or install a new SSH client prior to generating a new SSH key. For more information, see "[Error: Unknown key type](/github/authenticating-to-github/error-unknown-key-type)." -1. 将硬件安全密钥插入计算机。 +1. Insert your hardware security key into your computer. {% data reusables.command_line.open_the_multi_os_terminal %} -3. 粘贴下面的文本，将电子邮件地址替换为您的 {% data variables.product.product_name %} 帐户的电子邮件地址。 +3. Paste the text below, substituting in the email address for your account on {% data variables.product.product_name %}. ```shell $ ssh-keygen -t {% ifversion ghae %}ecdsa{% else %}ed25519{% endif %}-sk -C "your_email@example.com" ``` - + {% ifversion not ghae %} {% note %} - **注：**如果命令失败，并且您收到错误 `invalid format` 或 `feature not supported`，则表明您可能在使用不支持 Ed25519 算法的硬件安全密钥。 请输入以下命令。 + **Note:** If the command fails and you receive the error `invalid format` or `feature not supported,` you may be using a hardware security key that does not support the Ed25519 algorithm. Enter the following command instead. ```shell $ ssh-keygen -t ecdsa-sk -C "your_email@example.com" ``` {% endnote %} {% endif %} -4. 出现提示时，请触摸硬件安全密钥上的按钮。 -5. 当提示您“Enter a file in which to save the key（输入要保存密钥的文件）”时，按 Enter 接受默认文件位置。 +4. When you are prompted, touch the button on your hardware security key. +5. When you are prompted to "Enter a file in which to save the key," press Enter to accept the default file location. {% mac %} @@ -240,19 +239,19 @@ shortTitle: 生成新 SSH 密钥 {% endlinux %} -6. 当提示您输入密码时，按 **Enter**。 +6. When you are prompted to type a passphrase, press **Enter**. ```shell > Enter passphrase (empty for no passphrase): [Type a passphrase] > Enter same passphrase again: [Type passphrase again] ``` -7. 将 SSH 密钥添加到 {% data variables.product.prodname_dotcom %} 上的帐户。 更多信息请参阅“[将新的 SSH 密钥添加到 {% data variables.product.prodname_dotcom %} 帐户](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)”。 +7. Add the SSH key to your account on {% data variables.product.prodname_dotcom %}. For more information, see "[Adding a new SSH key to your {% data variables.product.prodname_dotcom %} account](/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)." {% endif %} -## 延伸阅读 +## Further reading -- "[关于 SSH](/articles/about-ssh)" -- "[使用 SSH 密钥密码](/articles/working-with-ssh-key-passphrases)" +- "[About SSH](/articles/about-ssh)" +- "[Working with SSH key passphrases](/articles/working-with-ssh-key-passphrases)" {%- ifversion fpt or ghec %} - "[Authorizing an SSH key for use with SAML single sign-on](/articles/authorizing-an-ssh-key-for-use-with-saml-single-sign-on)"{% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %} {%- endif %} diff --git a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/testing-your-ssh-connection.md b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/testing-your-ssh-connection.md index 40509abe8e1c..5e1e94b81557 100644 --- a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/testing-your-ssh-connection.md +++ b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/testing-your-ssh-connection.md @@ -1,6 +1,6 @@ --- title: 测试 SSH 连接 -intro: 'After you''ve set up your SSH key and added it to your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, you can test your connection.' +intro: '设置 SSH 密钥并将其添加到您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户后，您可以测试连接。' redirect_from: - /articles/testing-your-ssh-connection - /github/authenticating-to-github/testing-your-ssh-connection diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-anonymized-urls.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-anonymized-urls.md index 89117323a035..a2e556736d30 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-anonymized-urls.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-anonymized-urls.md @@ -29,7 +29,7 @@ topics: {% tip %} -Windows users will either need to use the Git PowerShell (which is installed alongside [{% data variables.product.prodname_desktop %}](https://desktop.github.com/)) or download [curl for Windows](http://curl.haxx.se/download.html). +Windows 用户需要使用 Git PowerShell（随 [{% data variables.product.prodname_desktop %}](https://desktop.github.com/) 一起安装）或下载 [curl for Windows](http://curl.haxx.se/download.html)。 {% endtip %} diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-githubs-ip-addresses.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-githubs-ip-addresses.md index 1cea1c355f5f..d71c687fffa0 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-githubs-ip-addresses.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-githubs-ip-addresses.md @@ -27,9 +27,9 @@ shortTitle: GitHub 的 IP 地址 {% endnote %} -These IP addresses are used by {% data variables.product.prodname_dotcom %} to serve our content, deliver webhooks, and perform hosted {% data variables.product.prodname_actions %} builds. +{% data variables.product.prodname_dotcom %} 使用这些 IP 地址来提供我们的内容、提供 web 挂钩以及执行托管的 {% data variables.product.prodname_actions %} 构建。 -这些范围在 [CIDR 表示法](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation)中。 You can use an online conversion tool to convert from CIDR notation to IP address ranges, for example: [CIDR to IPv4 conversion site](https://www.ipaddressguide.com/cidr). +这些范围在 [CIDR 表示法](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation)中。 您可以使用在线转换工具从 CIDR 表示法转换为 IP 地址范围，例如：[CIDR 到 IPv4 转换站点](https://www.ipaddressguide.com/cidr)。 我们会不时更改我们的 IP 地址。 不建议按 IP 地址来创建允许名单，但如果您使用这些 IP 范围，强烈建议经常监控我们的 API。 diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/authorizing-github-apps.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/authorizing-github-apps.md index db78e6793bcf..c6949a25c911 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/authorizing-github-apps.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/authorizing-github-apps.md @@ -13,18 +13,21 @@ redirect_from: - /github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-github-apps --- -Third-party applications that need to verify your {% data variables.product.prodname_dotcom %} identity, or interact with the data on {% data variables.product.prodname_dotcom %} on your behalf, can ask you to authorize the {% data variables.product.prodname_github_app %} to do so. +Third-party applications that need to verify your {% data variables.product.prodname_dotcom %} identity, or interact with the data on {% data variables.product.prodname_dotcom %} on your behalf, can ask you to authorize the {% data variables.product.prodname_github_app %} to do so. When authorizing the {% data variables.product.prodname_github_app %}, you should ensure you trust the application, review who it's developed by, and review the kinds of information the application wants to access. During authorization, you'll be prompted to grant the {% data variables.product.prodname_github_app %} permission to: -* **Verify your {% data variables.product.prodname_dotcom %} identity**
When authorized, the {% data variables.product.prodname_github_app %} will be able to programmatically retrieve your public GitHub profile, as well as some private details (such as your email address), depending on the level of access requested. -* **Know which resources you can access**
When authorized, the {% data variables.product.prodname_github_app %} will be able to programmatically read the _private_ {% data variables.product.prodname_dotcom %} resources that you can access (such as private {% data variables.product.prodname_dotcom %} repositories) _where_ an installation of the {% data variables.product.prodname_github_app %} is also present. The application may use this, for example, so that it can show you an appropriate list of repositories. -* **Act on your behalf**
The application may need to perform tasks on {% data variables.product.prodname_dotcom %}, as you. This might include creating an issue, or commenting on a pull request. This ability to act on your behalf is limited to the {% data variables.product.prodname_dotcom %} resources where _both_ you and the {% data variables.product.prodname_github_app %} have access. In some cases, however, the application may never make any changes on your behalf. - +* **Verify your {% data variables.product.prodname_dotcom %} identity**
+ When authorized, the {% data variables.product.prodname_github_app %} will be able to programmatically retrieve your public GitHub profile, as well as some private details (such as your email address), depending on the level of access requested. +* **Know which resources you can access**
+ When authorized, the {% data variables.product.prodname_github_app %} will be able to programmatically read the _private_ {% data variables.product.prodname_dotcom %} resources that you can access (such as private {% data variables.product.prodname_dotcom %} repositories) _where_ an installation of the {% data variables.product.prodname_github_app %} is also present. The application may use this, for example, so that it can show you an appropriate list of repositories. +* **Act on your behalf**
+ The application may need to perform tasks on {% data variables.product.prodname_dotcom %}, as you. This might include creating an issue, or commenting on a pull request. This ability to act on your behalf is limited to the {% data variables.product.prodname_dotcom %} resources where _both_ you and the {% data variables.product.prodname_github_app %} have access. In some cases, however, the application may never make any changes on your behalf. + ## When does a {% data variables.product.prodname_github_app %} act on your behalf? -The situations in which a {% data variables.product.prodname_github_app %} acts on your behalf vary according to the purpose of the {% data variables.product.prodname_github_app %} and the context in which it is being used. +The situations in which a {% data variables.product.prodname_github_app %} acts on your behalf vary according to the purpose of the {% data variables.product.prodname_github_app %} and the context in which it is being used. For example, an integrated development environment (IDE) may use a {% data variables.product.prodname_github_app %} to interact on your behalf in order to push changes you have authored through the IDE back to repositories on {% data variables.product.prodname_dotcom %}. The {% data variables.product.prodname_github_app %} will achieve this through a [user-to-server request](/get-started/quickstart/github-glossary#user-to-server-request). @@ -36,7 +39,7 @@ When a {% data variables.product.prodname_github_app %} acts on your behalf in t The extent to which a {% data variables.product.prodname_github_app %} can know which resources you can access and act on your behalf, after you have authorized it, is limited by: -* The organizations or repositories on which the app is installed +* The organizations or repositories on which the app is installed * The permissions the app has requested * Your access to {% data variables.product.prodname_dotcom %} resources @@ -44,7 +47,7 @@ Let's use an example to explain this. {% data variables.product.prodname_dotcom %} user Alice logs into a third-party web application, ExampleApp, using their {% data variables.product.prodname_dotcom %} identity. During this process, Alice authorizes ExampleApp to perform actions on their behalf. -However, the activity ExampleApp is able to perform on Alice's behalf in {% data variables.product.prodname_dotcom %} is constrained by: the repositories on which ExampleApp is installed, the permissions ExampleApp has requested, and Alice's access to {% data variables.product.prodname_dotcom %} resources. +However, the activity ExampleApp is able to perform on Alice's behalf in {% data variables.product.prodname_dotcom %} is constrained by: the repositories on which ExampleApp is installed, the permissions ExampleApp has requested, and Alice's access to {% data variables.product.prodname_dotcom %} resources. This means that, in order for ExampleApp to create an issue on Alice's behalf, in a repository called Repo A, all of the following must be true: diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md index 85141c8ca2d2..ca7993442b7e 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/connecting-with-third-party-applications.md @@ -59,17 +59,17 @@ shortTitle: 第三方应用程序 {% endtip %} -| 数据类型 | 描述 | -| ------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 提交状态 | 您可以授权第三方应用程序报告您的提交状态。 提交状态访问权限允许应用程序确定对特定提交的构建是否成功。 应用程序无法访问您的代码，但能够读取和写入特定提交的状态信息。 | -| 部署 | 部署状态访问权限允许应用程序根据仓库的特定提交确定部署是否成功。 应用程序无法访问您的代码。 | -| Gist | [Gist](https://gist.github.com) 访问权限允许应用程序读取或写入{% ifversion not ghae %}公共和{% else %}内部和{% endif %}机密 Gist。 | -| 挂钩 | [Web 挂钩](/webhooks)访问权限允许应用程序读取或写入您管理的仓库中的挂钩配置。 | -| 通知 | 通知访问权限允许应用程序读取您的 {% data variables.product.product_name %} 通知，如议题和拉取请求的评论。 但应用程序仍然无法访问仓库中的任何内容。 | -| 组织和团队 | 组织和团队访问权限允许应用程序访问并管理组织和团队成员资格。 | -| 个人用户数据 | 用户数据包括您的用户个人资料中的信息，例如您的姓名、电子邮件地址和地点。 | -| 仓库 | 仓库信息包括贡献者的姓名、您创建的分支以及仓库中的实际文件。 An application can request access to all of your repositories of any visibility level. 更多信息请参阅“[关于仓库](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility)”。 | -| 仓库删除 | 应用程序可以申请删除您管理的仓库，但无法访问您的代码。 | +| 数据类型 | 描述 | +| ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| 提交状态 | 您可以授权第三方应用程序报告您的提交状态。 提交状态访问权限允许应用程序确定对特定提交的构建是否成功。 应用程序无法访问您的代码，但能够读取和写入特定提交的状态信息。 | +| 部署 | 部署状态访问权限允许应用程序根据仓库的特定提交确定部署是否成功。 应用程序无法访问您的代码。 | +| Gist | [Gist](https://gist.github.com) 访问权限允许应用程序读取或写入{% ifversion not ghae %}公共和{% else %}内部和{% endif %}机密 Gist。 | +| 挂钩 | [Web 挂钩](/webhooks)访问权限允许应用程序读取或写入您管理的仓库中的挂钩配置。 | +| 通知 | 通知访问权限允许应用程序读取您的 {% data variables.product.product_name %} 通知，如议题和拉取请求的评论。 但应用程序仍然无法访问仓库中的任何内容。 | +| 组织和团队 | 组织和团队访问权限允许应用程序访问并管理组织和团队成员资格。 | +| 个人用户数据 | 用户数据包括您的用户个人资料中的信息，例如您的姓名、电子邮件地址和地点。 | +| 仓库 | 仓库信息包括贡献者的姓名、您创建的分支以及仓库中的实际文件。 应用程序可以请求访问任何可见性级别的所有存储库。 更多信息请参阅“[关于仓库](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility)”。 | +| 仓库删除 | 应用程序可以申请删除您管理的仓库，但无法访问您的代码。 | ## 申请更新的权限 diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token.md index a9636c5a7076..c0f1c336dd82 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token.md @@ -1,6 +1,6 @@ --- -title: 创建个人访问令牌 -intro: 您应该通过命令行或 API 创建个人访问令牌来代替密码。 +title: Creating a personal access token +intro: You should create a personal access token to use in place of a password with the command line or with the API. redirect_from: - /articles/creating-an-oauth-token-for-command-line-use - /articles/creating-an-access-token-for-command-line-use @@ -17,65 +17,68 @@ versions: topics: - Identity - Access management -shortTitle: 创建 PAT +shortTitle: Create a PAT --- {% note %} -**注意：** 如果您在命令行上使用 {% data variables.product.prodname_cli %} 向 {% data variables.product.product_name %} 验证，您可以跳过生成个人访问令牌，并通过网页浏览器进行身份验证。 有关使用 {% data variables.product.prodname_cli %} 进行身份验证的详细信息，请参阅 [`gh auth login`](https://cli.github.com/manual/gh_auth_login)。 +**Note:** If you use {% data variables.product.prodname_cli %} to authenticate to {% data variables.product.product_name %} on the command line, you can skip generating a personal access token and authenticate via the web browser instead. For more information about authenticating with {% data variables.product.prodname_cli %}, see [`gh auth login`](https://cli.github.com/manual/gh_auth_login). {% endnote %} -在使用[GitHub API 或](/rest/overview/other-authentication-methods#via-oauth-and-personal-access-tokens)命令[行](#using-a-token-on-the-command-line)时，可使用个人访问令牌 (PAT) 代替密码向 {% data variables.product.product_name %} 进行身份验证。 +Personal access tokens (PATs) are an alternative to using passwords for authentication to {% data variables.product.product_name %} when using the [GitHub API](/rest/overview/other-authentication-methods#via-oauth-and-personal-access-tokens) or the [command line](#using-a-token-on-the-command-line). -{% ifversion fpt or ghec %}如果要使用 PAT 访问使用 SAML SSO 的组织所拥有的资源，则必须授权 PAT。 For more information, see "[About authentication with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)" and "[Authorizing a personal access token for use with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}{% endif %} +{% ifversion fpt or ghec %}If you want to use a PAT to access resources owned by an organization that uses SAML SSO, you must authorize the PAT. For more information, see "[About authentication with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)" and "[Authorizing a personal access token for use with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}{% endif %} {% ifversion fpt or ghec %}{% data reusables.user-settings.removes-personal-access-tokens %}{% endif %} -没有指定范围的令牌只能访问公共信息。 要使用令牌从命令行访问仓库，请选择 `repo（仓库）`。 For more information, see "[Available scopes](/apps/building-oauth-apps/scopes-for-oauth-apps#available-scopes)". +A token with no assigned scopes can only access public information. To use your token to access repositories from the command line, select `repo`. For more information, see "[Available scopes](/apps/building-oauth-apps/scopes-for-oauth-apps#available-scopes)". -## 创建令牌 +## Creating a token -{% ifversion fpt or ghec %}1. [验证您的电子邮件地址](/github/getting-started-with-github/verifying-your-email-address)（如果尚未验证）。{% endif %} +{% ifversion fpt or ghec %}1. [Verify your email address](/github/getting-started-with-github/verifying-your-email-address), if it hasn't been verified yet.{% endif %} {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.personal_access_tokens %} {% data reusables.user-settings.generate_new_token %} -5. 给令牌一个描述性名称。 ![Token description field](/assets/images/help/settings/token_description.png){% ifversion fpt or ghes > 3.2 or ghae-issue-4374 or ghec %} -6. 要使令牌过期，请选择 **Expiration（到期）**下拉菜单，然后单击默认值或使用日历选择器。 ![Token expiration field](/assets/images/help/settings/token_expiration.png){% endif %} -7. 选择要授予此令牌的作用域或权限。 要使用令牌从命令行访问仓库，请选择 **repo（仓库）**。 +5. Give your token a descriptive name. + ![Token description field](/assets/images/help/settings/token_description.png){% ifversion fpt or ghes > 3.2 or ghae-issue-4374 or ghec %} +6. To give your token an expiration, select the **Expiration** drop-down menu, then click a default or use the calendar picker. + ![Token expiration field](/assets/images/help/settings/token_expiration.png){% endif %} +7. Select the scopes, or permissions, you'd like to grant this token. To use your token to access repositories from the command line, select **repo**. {% ifversion fpt or ghes or ghec %} - ![选择令牌作用域](/assets/images/help/settings/token_scopes.gif) + ![Selecting token scopes](/assets/images/help/settings/token_scopes.gif) {% elsif ghae %} - ![选择令牌作用域](/assets/images/enterprise/github-ae/settings/access-token-scopes-for-ghae.png) + ![Selecting token scopes](/assets/images/enterprise/github-ae/settings/access-token-scopes-for-ghae.png) {% endif %} -8. 单击 **Generate token（生成令牌）**。 ![生成令牌按钮](/assets/images/help/settings/generate_token.png) +8. Click **Generate token**. + ![Generate token button](/assets/images/help/settings/generate_token.png) {% ifversion fpt or ghec %} - ![新建的令牌](/assets/images/help/settings/personal_access_tokens.png) + ![Newly created token](/assets/images/help/settings/personal_access_tokens.png) {% elsif ghes > 3.1 or ghae %} - ![新建的令牌](/assets/images/help/settings/personal_access_tokens_ghe.png) + ![Newly created token](/assets/images/help/settings/personal_access_tokens_ghe.png) {% else %} - ![新建的令牌](/assets/images/help/settings/personal_access_tokens_ghe_legacy.png) + ![Newly created token](/assets/images/help/settings/personal_access_tokens_ghe_legacy.png) {% endif %} {% warning %} - **警告：** 像对待密码一样对待您的令牌，确保其机密性。 使用 API 时，应将令牌用作环境变量，而不是将其硬编码到程序中。 + **Warning:** Treat your tokens like passwords and keep them secret. When working with the API, use tokens as environment variables instead of hardcoding them into your programs. {% endwarning %} {% ifversion fpt or ghec %}9. To use your token to authenticate to an organization that uses SAML single sign-on, authorize the token. For more information, see "[Authorizing a personal access token for use with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}{% endif %} -## 在命令行上使用令牌 +## Using a token on the command line {% data reusables.command_line.providing-token-as-password %} -个人访问令牌只能用于 HTTPS Git 操作。 如果您的仓库使用 SSH 远程 URL，则需要[将远程 URL 从 SSH 切换到 HTTPS](/github/getting-started-with-github/managing-remote-repositories/#switching-remote-urls-from-ssh-to-https)。 +Personal access tokens can only be used for HTTPS Git operations. If your repository uses an SSH remote URL, you will need to [switch the remote from SSH to HTTPS](/github/getting-started-with-github/managing-remote-repositories/#switching-remote-urls-from-ssh-to-https). -如果没有提示您输入用户名和密码，说明您的凭据可能已缓存在计算机上。 您可以[在密钥链中更新您的凭据](/github/getting-started-with-github/updating-credentials-from-the-macos-keychain)，用令牌替换您的旧密码。 +If you are not prompted for your username and password, your credentials may be cached on your computer. You can [update your credentials in the Keychain](/github/getting-started-with-github/updating-credentials-from-the-macos-keychain) to replace your old password with the token. -您可以使用 Git 客户端缓存 PAT，而不必为每个 HTTPS Git 操作手动输入 PAT。 Git 会将您的凭据临时存储在内存中，直到过期为止。 您还可以将令牌存储在 Git 可以在每个请求之前读取的纯文本文件中。 更多信息请参阅“[在 Git 中缓存 {% data variables.product.prodname_dotcom %} 凭据](/github/getting-started-with-github/caching-your-github-credentials-in-git)”。 +Instead of manually entering your PAT for every HTTPS Git operation, you can cache your PAT with a Git client. Git will temporarily store your credentials in memory until an expiry interval has passed. You can also store the token in a plain text file that Git can read before every request. For more information, see "[Caching your {% data variables.product.prodname_dotcom %} credentials in Git](/github/getting-started-with-github/caching-your-github-credentials-in-git)." -## 延伸阅读 +## Further reading -- “[关于向 GitHub 验证身份](/github/authenticating-to-github/about-authentication-to-github){% ifversion fpt or ghae-issue-4374 or ghes > 3.2 or ghec %}” -- "[令牌到期和撤销](/github/authenticating-to-github/keeping-your-account-and-data-secure/token-expiration-and-revocation)"{% endif %} +- "[About authentication to GitHub](/github/authenticating-to-github/about-authentication-to-github)"{% ifversion fpt or ghae-issue-4374 or ghes > 3.2 or ghec %} +- "[Token expiration and revocation](/github/authenticating-to-github/keeping-your-account-and-data-secure/token-expiration-and-revocation)"{% endif %} diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/creating-a-strong-password.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/creating-a-strong-password.md index de1b76ed8b4c..7830c8cd0ea1 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/creating-a-strong-password.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/creating-a-strong-password.md @@ -1,6 +1,6 @@ --- title: 创建强密码 -intro: 'Secure your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} with a strong and unique password using a password manager.' +intro: '使用密码管理器以强大而唯一的密码保护您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户。' redirect_from: - /articles/what-is-a-strong-password - /articles/creating-a-strong-password @@ -16,13 +16,13 @@ topics: shortTitle: 创建强密码 --- -You must choose or generate a password for your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} that is at least: +您必须在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上为您的帐户选择或生成一个密码，该密码至少是： - {% ifversion ghes %}七{% else %}八{% endif %}个字符且包含数字和小写字母，或 - 至少 15 个字符，任意字符组合 为确保您的帐户安全，我们建议您遵循以下最佳实践： - 使用 [LastPass](https://lastpass.com/) 或 [1Password](https://1password.com/) 等密码管理器生成至少 15 个字符的密码。 -- 为 {% data variables.product.product_name %} 生成唯一的密码。 If you use your {% data variables.product.product_name %} password elsewhere and that service is compromised, then attackers or other malicious actors could use that information to access your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}. +- 为 {% data variables.product.product_name %} 生成唯一的密码。 如果您在其他地方使用 {% data variables.product.product_name %} 密码，并且该服务遭到入侵，则攻击者或其他恶意行为者可能会使用该信息访问您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户。 - 为您的帐户配置双重身份验证。 更多信息请参阅“[关于双重身份验证](/articles/about-two-factor-authentication)”。 - 不与任何人分享您的密码，即使是潜在协作者。 在 {% data variables.product.product_name %} 上每个人都应使用自己的个人帐户。 有关协作方式的更多信息，请参阅：“[邀请协作者参与个人仓库](/articles/inviting-collaborators-to-a-personal-repository)”、“[关于协作开发模式](/articles/about-collaborative-development-models/)”或“[与组织中的团体协作](/organizations/collaborating-with-groups-in-organizations/)”。 diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/index.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/index.md index 9e3789a14416..905cca9f042e 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/index.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/index.md @@ -1,6 +1,6 @@ --- title: 保护帐户和数据安全 -intro: 'To protect your personal information, you should keep both your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} and any associated data secure.' +intro: '为了保护您的个人信息，应该确保您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户和任何相关数据的安全。' redirect_from: - /articles/keeping-your-account-and-data-secure - /github/authenticating-to-github/keeping-your-account-and-data-secure diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md index fbfb3ee3462f..9d6c307b8818 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md @@ -19,7 +19,7 @@ shortTitle: 部署密钥 {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} -3. In the "Security" section of the sidebar, click **{% octicon "key" aria-label="The key icon" %} Deploy keys**. +3. 在边栏的“Security（安全性）”部分中，单击 **{% octicon "key" aria-label="The key icon" %} Deploy keys（部署密钥）**。 {% else %} 3. 在左侧边栏中，单击 **Deploy keys（部署密钥）**。 ![部署密钥设置](/assets/images/help/settings/settings-sidebar-deploy-keys.png) {% endif %} diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md index 1caa26c03295..cd383b80fa7c 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md @@ -23,7 +23,7 @@ shortTitle: 安全日志 {% data reusables.user-settings.access_settings %} {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} -1. In the "Archives" section of the sidebar, click **{% octicon "log" aria-label="The log icon" %} Security log**. +1. 在边栏的“Archives（存档）”部分中，单击 **{% octicon "log" aria-label="The log icon" %} 安全日志**。 {% else %} 1. 在用户设置侧边栏中，单击 **Security log（安全日志）**。 ![安全日志选项卡](/assets/images/help/settings/audit-log-tab.png) {% endif %} @@ -46,12 +46,12 @@ shortTitle: 安全日志 | [`codespaces`](#codespaces-category-actions) | 包含与 {% data variables.product.prodname_codespaces %} 相关的所有活动。 更多信息请参阅“[关于 {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/about-codespaces)”。 | | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | 包含与签署 {% data variables.product.prodname_marketplace %} 开发者协议相关的所有活动。 | | [`marketplace_listing`](#marketplace_listing-category-actions) | 包含与 {% data variables.product.prodname_marketplace %} 中列出的应用程序相关的所有活动。{% endif %} -| [`oauth_access`](#oauth_access-category-actions) | Contains all activities related to [{% data variables.product.prodname_oauth_apps %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps) you've connected with.{% ifversion fpt or ghec %} +| [`oauth_access`](#oauth_access-category-actions) | 包含与您已连接的 [{% data variables.product.prodname_oauth_apps %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps) 相关的所有活动。{% ifversion fpt or ghec %} | [`payment_method`](#payment_method-category-actions) | 包含与 {% data variables.product.prodname_dotcom %} 订阅支付相关的所有活动。{% endif %} | [`profile_picture`](#profile_picture-category-actions) | 包含与头像相关的所有活动。 | | [`project`](#project-category-actions) | 包含与项目板相关的所有活动。 | | [`public_key`](#public_key-category-actions) | 包含与[公共 SSH 密钥](/articles/adding-a-new-ssh-key-to-your-github-account)相关的所有活动。 | -| [`repo`](#repo-category-actions) | Contains all activities related to the repositories you own.{% ifversion fpt or ghec %} +| [`repo`](#repo-category-actions) | 包含与您拥有的仓库相关的所有活动。{% ifversion fpt or ghec %} | [`sponsors`](#sponsors-category-actions) | 包含与 {% data variables.product.prodname_sponsors %}和赞助者按钮相关的所有事件（请参阅“[关于 {% data variables.product.prodname_sponsors %}](/sponsors/getting-started-with-github-sponsors/about-github-sponsors)”和“[在仓库中显示赞助者按钮](/articles/displaying-a-sponsor-button-in-your-repository)”）{% endif %}{% ifversion ghes or ghae %} | [`团队`](#team-category-actions) | 包含与您所在团队相关的所有活动。{% endif %}{% ifversion not ghae %} | [`two_factor_authentication`](#two_factor_authentication-category-actions) | 包含与[双重身份验证](/articles/securing-your-account-with-two-factor-authentication-2fa)相关的所有活动。{% endif %} @@ -109,10 +109,10 @@ shortTitle: 安全日志 ### `oauth_authority` 类别操作 -| 操作 | 描述 | -| --------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `create` | 当您[授予 {% data variables.product.prodname_oauth_app %} 访问权限](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps)时触发。 | -| `destroy` | Triggered when you [revoke an {% data variables.product.prodname_oauth_app %}'s access to your account](/articles/reviewing-your-authorized-integrations){% ifversion fpt or ghae-issue-4374 or ghes > 3.2 or ghec %} and when [authorizations are revoked or expire](/github/authenticating-to-github/keeping-your-account-and-data-secure/token-expiration-and-revocation).{% else %}.{% endif %} +| 操作 | 描述 | +| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `create` | 当您[授予 {% data variables.product.prodname_oauth_app %} 访问权限](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps)时触发。 | +| `destroy` | 当您 [撤销 {% data variables.product.prodname_oauth_app %}对您帐户的访问](/articles/reviewing-your-authorized-integrations){% ifversion fpt or ghae-issue-4374 or ghes > 3.2 or ghec %} 时，以及当 [授权被吊销或过期](/github/authenticating-to-github/keeping-your-account-and-data-secure/token-expiration-and-revocation)时触发。{% else %}.{% endif %} {% ifversion fpt or ghec %} @@ -146,33 +146,33 @@ shortTitle: 安全日志 ### `public_key` 类操作 -| 操作 | 描述 | -| -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `create` | Triggered when you [add a new public SSH key to your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}](/articles/adding-a-new-ssh-key-to-your-github-account). | -| `delete` | Triggered when you [remove a public SSH key to your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}](/articles/reviewing-your-ssh-keys). | +| 操作 | 描述 | +| -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `create` | 当您 [向您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户添加新的公有 SSH 密钥时触发](/articles/adding-a-new-ssh-key-to-your-github-account)。 | +| `delete` | 当您 [从您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户删除公有 SSH 密钥时触发](/articles/reviewing-your-ssh-keys)。 | ### `repo` 类操作 -| 操作 | 描述 | -| ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `access` | 当您拥有的仓库[从“私有”切换到“公共”](/articles/making-a-private-repository-public)（反之亦然）时触发。 | -| `add_member` | Triggered when a {% data variables.product.product_name %} user is {% ifversion fpt or ghec %}[invited to have collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% else %}[given collaboration access](/articles/inviting-collaborators-to-a-personal-repository){% endif %} to a repository. | -| `add_topic` | 当仓库所有者向仓库[添加主题](/articles/classifying-your-repository-with-topics)时触发。 | +| 操作 | 描述 | +| ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `access` | 当您拥有的仓库[从“私有”切换到“公共”](/articles/making-a-private-repository-public)（反之亦然）时触发。 | +| `add_member` | 当 {% data variables.product.product_name %} 用户{% ifversion fpt or ghec %}[被邀请协作使用](/articles/inviting-collaborators-to-a-personal-repository){% else %}[被授权协作使用](/articles/inviting-collaborators-to-a-personal-repository){% endif %}仓库时触发。 | +| `add_topic` | 当仓库所有者向仓库[添加主题](/articles/classifying-your-repository-with-topics)时触发。 | | `archived` | 当仓库所有者[存档仓库](/articles/about-archiving-repositories)时触发。{% ifversion ghes %} -| `config.disable_anonymous_git_access` | 当公共仓库中[禁用匿名 Git 读取权限](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)时触发。 | -| `config.enable_anonymous_git_access` | 当公共仓库中[启用匿名 Git 读取权限](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)时触发。 | -| `config.lock_anonymous_git_access` | 当仓库的[匿名 Git 读取权限设置被锁定](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access)时触发。 | +| `config.disable_anonymous_git_access` | 当公共仓库中[禁用匿名 Git 读取权限](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)时触发。 | +| `config.enable_anonymous_git_access` | 当公共仓库中[启用匿名 Git 读取权限](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)时触发。 | +| `config.lock_anonymous_git_access` | 当仓库的[匿名 Git 读取权限设置被锁定](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access)时触发。 | | `config.unlock_anonymous_git_access` | 当仓库的[匿名 Git 读取权限设置被解锁](/enterprise/{{ currentVersion }}/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access)时触发。{% endif %} -| `create` | 在[创建新仓库](/articles/creating-a-new-repository)时触发。 | +| `create` | 在[创建新仓库](/articles/creating-a-new-repository)时触发。 | | `destroy` | 当[仓库被删除](/articles/deleting-a-repository)时触发。{% ifversion fpt or ghec %} -| `禁用` | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %}{% ifversion fpt or ghec %} +| `禁用` | 当仓库被禁用（例如，因[资金不足](/articles/unlocking-a-locked-account)）时触发。{% endif %}{% ifversion fpt or ghec %} | `启用` | 在重新启用仓库时触发。{% endif %} -| `remove_member` | 从[仓库中删除 {% data variables.product.product_name %} 用户的协作者身份](/articles/removing-a-collaborator-from-a-personal-repository)时触发。 | -| `remove_topic` | 当仓库所有者从仓库中删除主题时触发。 | -| `rename` | 当[仓库被重命名](/articles/renaming-a-repository)时触发。 | -| `转让` | 当[仓库被转让](/articles/how-to-transfer-a-repository)时触发。 | -| `transfer_start` | 在仓库转让即将发生时触发。 | -| `unarchived` | 当仓库所有者取消存档仓库时触发。 | +| `remove_member` | 从[仓库中删除 {% data variables.product.product_name %} 用户的协作者身份](/articles/removing-a-collaborator-from-a-personal-repository)时触发。 | +| `remove_topic` | 当仓库所有者从仓库中删除主题时触发。 | +| `rename` | 当[仓库被重命名](/articles/renaming-a-repository)时触发。 | +| `转让` | 当[仓库被转让](/articles/how-to-transfer-a-repository)时触发。 | +| `transfer_start` | 在仓库转让即将发生时触发。 | +| `unarchived` | 当仓库所有者取消存档仓库时触发。 | {% ifversion fpt or ghec %} ### `sponsors` 类操作 @@ -236,17 +236,17 @@ shortTitle: 安全日志 ### `user` 类操作 -| 操作 | 描述 | -| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------- | -| `add_email` | 当您 | -| {% ifversion not ghae %}[add a new email address](/articles/changing-your-primary-email-address){% else %}add a new email address{% endif %}.{% ifversion fpt or ghec %} | | -| `codespaces_trusted_repo_access_granted` | 当您[允许为某个仓库创建的代码空间访问您的用户帐户拥有的其他仓库]时触发(/github/developing-online-with-codespaces/managing-access-and-security-for-codespaces)。 | -| `codespaces_trusted_repo_access_revoked` | 当您[禁止为某个仓库创建的代码空间访问您的用户帐户拥有的其他仓库]时触发(/github/developing-online-with-codespaces/managing-access-and-security-for-codespaces)。 |{% endif %} -| `create` | 在创建新帐户时触发。{% ifversion not ghae %} -| `change_password` | 当您更改密码时触发。 | -| `forgot_password` | 在您要求[重置密码](/articles/how-can-i-reset-my-password)时触发。{% endif %} -| `hide_private_contributions_count` | 当您[在个人资料中隐藏私有贡献](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)时触发。 | -| `login` | Triggered when you log in to {% data variables.product.product_location %}.{% ifversion ghes or ghae %} +| 操作 | 描述 | +| ----------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | +| `add_email` | 当您 | +| {% ifversion not ghae %}[添加新电子邮件地址](/articles/changing-your-primary-email-address){% else %}添加新电子邮件地址{% endif %}时触发。{% ifversion fpt or ghec %} | | +| `codespaces_trusted_repo_access_granted` | 当您[允许为某个仓库创建的代码空间访问您的用户帐户拥有的其他仓库]时触发(/github/developing-online-with-codespaces/managing-access-and-security-for-codespaces)。 | +| `codespaces_trusted_repo_access_revoked` | 当您[禁止为某个仓库创建的代码空间访问您的用户帐户拥有的其他仓库]时触发(/github/developing-online-with-codespaces/managing-access-and-security-for-codespaces)。 |{% endif %} +| `create` | 在创建新帐户时触发。{% ifversion not ghae %} +| `change_password` | 当您更改密码时触发。 | +| `forgot_password` | 在您要求[重置密码](/articles/how-can-i-reset-my-password)时触发。{% endif %} +| `hide_private_contributions_count` | 当您[在个人资料中隐藏私有贡献](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile)时触发。 | +| `login` | 当您登录到 {% data variables.product.product_location %} 时触发。{% ifversion ghes or ghae %} `mandatory_message_viewed` | 当您查看必读消息时触发（更多信息请参阅“[自定义用户消息](/admin/user-management/customizing-user-messages-for-your-enterprise)” | |{% endif %}| | `failed_login` | 当您未能成功登录时触发。 | `remove_email` | 当您删除电子邮件地址时触发。 | `rename` | Triggered when you rename your account.{% ifversion fpt or ghec %} | `report_content` | Triggered when you [report an issue or pull request, or a comment on an issue, pull request, or commit](/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam).{% endif %} | `show_private_contributions_count` | Triggered when you [publicize private contributions on your profile](/articles/publicizing-or-hiding-your-private-contributions-on-your-profile).{% ifversion not ghae %} | `two_factor_requested` | Triggered when {% data variables.product.product_name %} asks you for [your two-factor authentication code](/articles/accessing-github-using-two-factor-authentication).{% endif %} diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-ssh-keys.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-ssh-keys.md index 8eb2f692b708..64104f6d0d7f 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-ssh-keys.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-ssh-keys.md @@ -1,6 +1,6 @@ --- title: 审查 SSH 密钥 -intro: 'To keep your credentials secure, you should regularly audit your SSH keys, deploy keys, and review authorized applications that access your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}.' +intro: '为了保证您的凭据安全，您应该定期检查您的 SSH 密钥、部署密钥 并审核已授权的应用程序，以访问您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户。' redirect_from: - /articles/keeping-your-application-access-tokens-safe - /articles/keeping-your-ssh-keys-and-application-access-tokens-safe diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation.md index af4277a8df5d..fb0d87c36c4d 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation.md @@ -1,6 +1,6 @@ --- -title: Token expiration and revocation -intro: 'Your tokens can expire and can also be revoked by you, applications you have authorized, and {% data variables.product.product_name %} itself.' +title: 令牌过期和吊销 +intro: '您的令牌可能会过期，也可以由您、您授权的应用程序以及 {% data variables.product.product_name %} 自行吊销。' versions: fpt: '*' ghes: '*' @@ -9,55 +9,55 @@ versions: topics: - Identity - Access management -shortTitle: Token expiration +shortTitle: 令牌过期 redirect_from: - /github/authenticating-to-github/keeping-your-account-and-data-secure/token-expiration-and-revocation --- -When a token {% ifversion fpt or ghae-issue-4374 or ghes > 3.2 or ghec %}has expired or {% endif %} has been revoked, it can no longer be used to authenticate Git and API requests. It is not possible to restore an expired or revoked token, you or the application will need to create a new token. +当令牌 {% ifversion fpt or ghae-issue-4374 or ghes > 3.2 or ghec %}已过期或 {% endif %} 已被吊销时，它不能再用于对 Git 和 API 请求进行身份验证。 无法还原过期或已吊销的令牌，您或应用程序将需要创建新令牌。 -This article explains the possible reasons your {% data variables.product.product_name %} token might be revoked or expire. +本文介绍了 {% data variables.product.product_name %} 令牌可能被吊销或过期的可能原因。 {% note %} -**Note:** When a personal access token or OAuth token expires or is revoked, you may see an `oauth_authorization.destroy` action in your security log. 更多信息请参阅“[查看安全日志](/github/authenticating-to-github/keeping-your-account-and-data-secure/reviewing-your-security-log)”。 +**注意：** 当个人访问令牌或 OAuth 令牌过期或被吊销时，您可能会在安全日志中看到 `oauth_authorization.destroy` 操作。 更多信息请参阅“[查看安全日志](/github/authenticating-to-github/keeping-your-account-and-data-secure/reviewing-your-security-log)”。 {% endnote %} {% ifversion fpt or ghae-issue-4374 or ghes > 3.2 or ghec %} -## Token revoked after reaching its expiration date +## 令牌在到达其到期日期后被吊销 -When you create a personal access token, we recommend that you set an expiration for your token. Upon reaching your token's expiration date, the token is automatically revoked. 更多信息请参阅“[创建个人访问令牌](/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token)”。 +创建个人访问令牌时，建议为令牌设置过期时间。 到达令牌的到期日期后，令牌将自动吊销。 更多信息请参阅“[创建个人访问令牌](/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token)”。 {% endif %} {% ifversion fpt or ghec %} -## Token revoked when pushed to a public repository or public gist +## 令牌在推送到公共存储库或公共 Gist 时被吊销 -If a valid OAuth token, {% data variables.product.prodname_github_app %} token, or personal access token is pushed to a public repository or public gist, the token will be automatically revoked. +如果将有效的 OAuth 令牌、{% data variables.product.prodname_github_app %} 令牌或个人访问令牌推送到公共存储库或公共 gist，则该令牌将自动吊销。 -OAuth tokens and personal access tokens pushed to public repositories and public gists will only be revoked if the token has scopes. +推送到公共存储库和公共 gist 的 OAuth 令牌和个人访问令牌只有在令牌具有作用域时才会被吊销。 {% endif %} {% ifversion fpt or ghec %} -## Token expired due to lack of use +## 令牌因未使用而过期 -{% data variables.product.product_name %} will automatically revoke an OAuth token or personal access token when the token hasn't been used in one year. +当 OAuth 令牌或个人访问令牌一年内未使用时，{% data variables.product.product_name %} 会自动将其吊销。 {% endif %} -## Token revoked by the user +## 用户吊销令牌 -You can revoke your authorization of a {% data variables.product.prodname_github_app %} or {% data variables.product.prodname_oauth_app %} from your account settings which will revoke any tokens associated with the app. For more information, see "[Reviewing your authorized integrations](/github/authenticating-to-github/keeping-your-account-and-data-secure/reviewing-your-authorized-integrations)" and "[Reviewing your authorized applications (OAuth)](/github/authenticating-to-github/keeping-your-account-and-data-secure/reviewing-your-authorized-applications-oauth)." +您可以从帐户设置中撤销对 {% data variables.product.prodname_github_app %} 或 {% data variables.product.prodname_oauth_app %} 的授权，这将吊销与应用程序关联的任何令牌。 更多信息请参阅“[审查授权的集成](/github/authenticating-to-github/keeping-your-account-and-data-secure/reviewing-your-authorized-integrations)”和“[审查授权的应用程序 (OAuth)](/github/authenticating-to-github/keeping-your-account-and-data-secure/reviewing-your-authorized-applications-oauth)”。 -Once an authorization is revoked, any tokens associated with the authorization will be revoked as well. To re-authorize an application, follow the instructions from the third-party application or website to connect your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} again. +撤销授权后，与授权关联的任何令牌也将被吊销。 要重新授权应用程序，请按照第三方应用程序或网站上的说明再次连接您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户。 -## Token revoked by the {% data variables.product.prodname_oauth_app %} +## {% data variables.product.prodname_oauth_app %} 吊销令牌 -The owner of an {% data variables.product.prodname_oauth_app %} can revoke an account's authorization of their app, this will also revoke any tokens associated with the authorization. For more information about revoking authorizations of your OAuth app, see "[Delete an app authorization](/rest/reference/apps#delete-an-app-authorization)." +{% data variables.product.prodname_oauth_app %} 的所有者可以撤销帐户对其应用程序的授权，这也会吊销与授权关联的任何令牌。 有关撤销 OAuth 应用程序的授权的详细信息，请参阅“[删除应用程序授权](/rest/reference/apps#delete-an-app-authorization)”。 -## Token revoked due to excess of tokens for an {% data variables.product.prodname_oauth_app %} with the same scope +## 令牌由于具有相同作用域的 {% data variables.product.prodname_oauth_app %} 的令牌过多而被吊销 {% data reusables.apps.oauth-token-limit %} -## User token revoked due to {% data variables.product.prodname_github_app %} configuration +## 用户令牌因配置 {% data variables.product.prodname_github_app %} 而被吊销 -User-to-server tokens created by a {% data variables.product.prodname_github_app %} will expire after eight hours by default. Owners of {% data variables.product.prodname_github_apps %} can configure their apps so that user-to-server tokens do not expire. For more information about changing how your {% data variables.product.prodname_dotcom %} App's user-to-server tokens behave, see "[Activating optional features for apps](/developers/apps/getting-started-with-apps/activating-optional-features-for-apps)." +默认情况下，由 {% data variables.product.prodname_github_app %} 创建的用户到服务器令牌将在八小时后过期。 {% data variables.product.prodname_github_apps %} 的所有者可以配置其应用，以便用户到服务器的令牌不会过期。 有关更改 {% data variables.product.prodname_dotcom %} 应用程序的用户到服务器令牌的行为方式的详细信息，请参阅“[激活应用程序的可选功能](/developers/apps/getting-started-with-apps/activating-optional-features-for-apps)”。 diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md index c7d46d23c6b1..3ed800b59536 100644 --- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md +++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md @@ -22,9 +22,9 @@ shortTitle: 更新访问凭据 ## 请求新密码 1. 要请求新密码，请访问 {% ifversion fpt or ghec %}https://{% data variables.product.product_url %}/password_reset{% else %}`https://{% data variables.product.product_url %}/password_reset`{% endif %}。 -2. Enter the email address associated with your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, then click **Send password reset email.** The email will be sent to the backup email address if you have one configured. ![密码重置电子邮件请求对话框](/assets/images/help/settings/password-recovery-email-request.png) +2. 输入与您在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}上的帐户关联的电子邮件地址，然后单击“**Send password reset email（发送密码重置电子邮件）**。如果您配置了备份电子邮件地址，则电子邮件将发送到备份电子邮件地址。 ![密码重置电子邮件请求对话框](/assets/images/help/settings/password-recovery-email-request.png) 3. 我们将向您发送一封电子邮件，其中含有可让您重置密码的链接。 您必须在收到电子邮件后的 3 小时内单击此链接。 如果您没有收到来自我们的电子邮件，请确保检查垃圾邮件文件夹。 -4. 如果您启用了双重身份验证，将提示您获得 2FA 凭据。 Type your authentication code or one of your recovery codes and click **Verify**. If you have added a security key to your account, you can insert the key and click **Use security key** instead of typing an authentication code. ![双重身份验证提示](/assets/images/help/2fa/2fa-password-reset.png) +4. 如果您启用了双重身份验证，将提示您获得 2FA 凭据。 键入您的身份验证代码或恢复代码之一，然后单击 **Verify（验证）**。 如果您已向帐户添加了安全密钥，则可以插入该密钥，然后单击 **Use security key（使用安全密钥）**，而无需键入身份验证码。 ![双重身份验证提示](/assets/images/help/2fa/2fa-password-reset.png) 5. 键入新密码，确认新密码，然后单击 **Change password（更改密码）**。 有关创建强密码的帮助，请参阅“[创建强密码](/articles/creating-a-strong-password)” {% ifversion fpt or ghec %}![Password recovery box](/assets/images/help/settings/password-recovery-page.png){% else %} ![密码恢复框](/assets/images/enterprise/settings/password-recovery-page.png){% endif %} @@ -57,7 +57,7 @@ shortTitle: 更新访问凭据 {% ifversion not ghae %} -If you have reset your account password and would also like to trigger a sign-out from the GitHub Mobile app, you can revoke your authorization of the "GitHub iOS" or "GitHub Android" OAuth App. For additional information, see "[Reviewing your authorized integrations](/authentication/keeping-your-account-and-data-secure/reviewing-your-authorized-integrations)." +如果您已重置帐户密码，并且还希望触发从 GitHub Mobile 应用注销，则可以撤销对“GitHub iOS”或“GitHub Android”OAuth 应用的授权。 有关其他信息，请参阅“[>审查授权的集成](/authentication/keeping-your-account-and-data-secure/reviewing-your-authorized-integrations)”。 {% endif %} diff --git a/translations/zh-CN/content/authentication/managing-commit-signature-verification/adding-a-new-gpg-key-to-your-github-account.md b/translations/zh-CN/content/authentication/managing-commit-signature-verification/adding-a-new-gpg-key-to-your-github-account.md index e37e98f1a96e..594f1bf7ad1e 100644 --- a/translations/zh-CN/content/authentication/managing-commit-signature-verification/adding-a-new-gpg-key-to-your-github-account.md +++ b/translations/zh-CN/content/authentication/managing-commit-signature-verification/adding-a-new-gpg-key-to-your-github-account.md @@ -1,6 +1,6 @@ --- title: 新增 GPG 密钥到 GitHub 帐户 -intro: 'To configure your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} to use your new (or existing) GPG key, you''ll also need the key to your account.' +intro: '要在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上配置帐户以使用新的（或现有的）GPG 密钥，还需要将密钥添加到帐户。' redirect_from: - /articles/adding-a-new-gpg-key-to-your-github-account - /github/authenticating-to-github/adding-a-new-gpg-key-to-your-github-account @@ -16,7 +16,7 @@ topics: shortTitle: 添加新的 GPG 密钥 --- -Before adding a new GPG key to your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, you should have: +在将新的 GPG 密钥添加到 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户之前，您应该具有： - [检查现有 GPG 密钥](/articles/checking-for-existing-gpg-keys) - [生成并复制新 GPG 密钥](/articles/generating-a-new-gpg-key) diff --git a/translations/zh-CN/content/authentication/managing-commit-signature-verification/associating-an-email-with-your-gpg-key.md b/translations/zh-CN/content/authentication/managing-commit-signature-verification/associating-an-email-with-your-gpg-key.md index b1405dbf052f..b4ab100a3407 100644 --- a/translations/zh-CN/content/authentication/managing-commit-signature-verification/associating-an-email-with-your-gpg-key.md +++ b/translations/zh-CN/content/authentication/managing-commit-signature-verification/associating-an-email-with-your-gpg-key.md @@ -18,7 +18,7 @@ shortTitle: 将电子邮件与 GPG 密钥关联 {% note %} -If you're using a GPG key that matches your committer identity and your verified email address associated with your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, then you can begin signing commits and signing tags. +如果您使用与您的提交者身份以及 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}上帐户关联的已验证电子邮件地址相匹配的 GPG 密钥，则可以开始对提交和标签进行签名。 {% endnote %} diff --git a/translations/zh-CN/content/authentication/managing-commit-signature-verification/checking-for-existing-gpg-keys.md b/translations/zh-CN/content/authentication/managing-commit-signature-verification/checking-for-existing-gpg-keys.md index 310d430bf1f7..70ad53b76dc3 100644 --- a/translations/zh-CN/content/authentication/managing-commit-signature-verification/checking-for-existing-gpg-keys.md +++ b/translations/zh-CN/content/authentication/managing-commit-signature-verification/checking-for-existing-gpg-keys.md @@ -28,12 +28,12 @@ shortTitle: 现有 GPG 密钥 {% data reusables.gpg.list-keys-with-note %} 3. 检查命令输出以查看是否有 GPG 密钥对。 * 如果没有 GPG 密钥对，或者您不想使用任何可用于签名提交和标记的密钥对，则[生成新的 GPG 密钥](/articles/generating-a-new-gpg-key)。 - * If there's an existing GPG key pair and you want to use it to sign commits and tags, you can display the public key using the following command, substituting in the GPG key ID you'd like to use. 在此例中，GPG 密钥 ID 是 `3AA5C34371567BD2`： + * 如果存在现有的 GPG 密钥对，并且您希望使用它来对提交和标记进行签名，则可以使用以下命令显示公钥，并替换要使用的 GPG 密钥 ID。 在此例中，GPG 密钥 ID 是 `3AA5C34371567BD2`： ```shell $ gpg --armor --export 3AA5C34371567BD2 # Prints the GPG key ID, in ASCII armor format ``` - You can then [add your GPG key to your GitHub account](/articles/adding-a-new-gpg-key-to-your-github-account). + 然后，您可以[将 GPG 密钥添加到您的 GitHub 帐户](/articles/adding-a-new-gpg-key-to-your-github-account)。 ## 延伸阅读 diff --git a/translations/zh-CN/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md b/translations/zh-CN/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md index a4d69a3dbefe..491f8141a087 100644 --- a/translations/zh-CN/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md +++ b/translations/zh-CN/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md @@ -21,7 +21,7 @@ shortTitle: 将您的签名密钥告诉 Git ## 将您的 GPG 密钥告知 Git -If you're using a GPG key that matches your committer identity and your verified email address associated with your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, then you can begin signing commits and signing tags. +如果您使用与您的提交者身份以及 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}上帐户关联的已验证电子邮件地址相匹配的 GPG 密钥，则可以开始对提交和标签进行签名。 {% note %} @@ -45,7 +45,7 @@ If you're using a GPG key that matches your committer identity and your verified $ if [ -r ~/.bash_profile ]; then echo 'export GPG_TTY=$(tty)' >> ~/.bash_profile; \ else echo 'export GPG_TTY=$(tty)' >> ~/.profile; fi ``` -1. Optionally, to prompt you to enter a PIN or passphrase when required, install `pinentry-mac`. For example, using [Homebrew](https://brew.sh/): +1. （可选）若要在需要时提示您输入 PIN 或密码，请安装 `pinentry-mac`。 例如，使用 [Homebrew](https://brew.sh/)： ```shell $ brew install pinentry-mac $ echo "pinentry-program $(which pinentry-mac)" >> ~/.gnupg/gpg-agent.conf @@ -60,7 +60,7 @@ If you're using a GPG key that matches your committer identity and your verified ## 将您的 GPG 密钥告知 Git -If you're using a GPG key that matches your committer identity and your verified email address associated with your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, then you can begin signing commits and signing tags. +如果您使用与您的提交者身份以及 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}上帐户关联的已验证电子邮件地址相匹配的 GPG 密钥，则可以开始对提交和标签进行签名。 {% note %} @@ -83,7 +83,7 @@ If you're using a GPG key that matches your committer identity and your verified ## 将您的 GPG 密钥告知 Git -If you're using a GPG key that matches your committer identity and your verified email address associated with your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}, then you can begin signing commits and signing tags. +如果您使用与您的提交者身份以及 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}上帐户关联的已验证电子邮件地址相匹配的 GPG 密钥，则可以开始对提交和标签进行签名。 {% note %} diff --git a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/about-two-factor-authentication.md b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/about-two-factor-authentication.md index 88a912626766..e5954069a7e1 100644 --- a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/about-two-factor-authentication.md +++ b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/about-two-factor-authentication.md @@ -14,12 +14,12 @@ topics: shortTitle: 关于 2FA --- -对于 {% data variables.product.product_name %}，第二种身份验证形式是应用程序在移动设备上生成的代码{% ifversion fpt or ghec %}或发送的短信 (SMS){% endif %}。 After you enable 2FA, {% data variables.product.product_name %} generates an authentication code any time someone attempts to sign into your account on {% data variables.product.product_location %}. 别人登录您的帐户的唯一方式是知道您的密码，并且获取您的手机上的验证码。 +对于 {% data variables.product.product_name %}，第二种身份验证形式是应用程序在移动设备上生成的代码{% ifversion fpt or ghec %}或发送的短信 (SMS){% endif %}。 在启用 2FA 后，只要有人尝试登录您在 {% data variables.product.product_name %} 上的帐户，{% data variables.product.product_location %} 就会生成验证码。 别人登录您的帐户的唯一方式是知道您的密码，并且获取您的手机上的验证码。 {% data reusables.two_fa.after-2fa-add-security-key %} {% ifversion fpt or ghec %} -In addition to security keys, you can also use {% data variables.product.prodname_mobile %} for 2FA after configuring a TOTP mobile app or text messages. {% data variables.product.prodname_mobile %} uses public-key cryptography to secure your account, allowing you to use any mobile device that you've used to signed in to {% data variables.product.prodname_mobile %} as your second factor. +除了安全密钥之外，您还可以在配置 TOTP 移动应用程序或短信后使用 {% data variables.product.prodname_mobile %} 进行双重身份验证。 {% data variables.product.prodname_mobile %} 使用公钥加密来保护您的帐户，允许您使用用于登录 {% data variables.product.prodname_mobile %} 的任何移动设备作为第二重身份验证。 {% endif %} 您还可以配置其他恢复方法，以防无法访问双重身份验证凭据。 有关设置 2FA 的更多信息，请参阅“[配置双重身份验证](/articles/configuring-two-factor-authentication)”和“[配置双重身份验证恢复方法](/articles/configuring-two-factor-authentication-recovery-methods)”。 diff --git a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md index c8684fcf250e..9a2cc9207866 100644 --- a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md +++ b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md @@ -1,6 +1,6 @@ --- -title: 使用双重身份验证访问 GitHub -intro: '启用 2FA 后，在登录到 {% data variables.product.product_name %} 时需要提供 2FA 验证码以及密码。' +title: Accessing GitHub using two-factor authentication +intro: 'With 2FA enabled, you''ll be asked to provide your 2FA authentication code, as well as your password, when you sign in to {% data variables.product.product_name %}.' redirect_from: - /articles/providing-your-2fa-security-code - /articles/providing-your-2fa-authentication-code @@ -14,35 +14,35 @@ versions: ghec: '*' topics: - 2FA -shortTitle: 使用 2FA 访问 GitHub +shortTitle: Access GitHub with 2FA --- +With two-factor authentication enabled, you'll need to provide an authentication code when accessing {% data variables.product.product_name %} through your browser. If you access {% data variables.product.product_name %} using other methods, such as the API or the command line, you'll need to use an alternative form of authentication. For more information, see "[About authentication to {% data variables.product.prodname_dotcom %}](/github/authenticating-to-github/about-authentication-to-github)." -启用双重身份验证后，您在通过浏览器访问 {% data variables.product.product_name %} 时需要提供验证码。 如果使用其他方法访问 {% data variables.product.product_name %}，如 API 或命令行，则需要使用其他形式的身份验证。 更多信息请参阅“[关于 {% data variables.product.prodname_dotcom %} 向验证身份](/github/authenticating-to-github/about-authentication-to-github)”。 +## Providing a 2FA code when signing in to the website -## 登录网站时提供 2FA 码 +After you sign in to {% data variables.product.product_name %} using your password, you'll be prompted to provide an authentication code from {% ifversion fpt or ghec %}a text message or{% endif %} your TOTP app. -在使用密码登录 {% data variables.product.product_name %} 后，系统会提示您提供{% ifversion fpt or ghec %}短信或{% endif %} TOTP 应用程序中的验证码。 +{% data variables.product.product_name %} will only ask you to provide your 2FA authentication code again if you've logged out, are using a new device, or your session expires. -{% data variables.product.product_name %} 仅在您注销后、使用新设备或会话过期时才会要求您再次提供 2FA 验证码。 +### Generating a code through a TOTP application -### 通过 TOTP 应用程序生成代码 +If you chose to set up two-factor authentication using a TOTP application on your smartphone, you can generate an authentication code for {% data variables.product.product_name %} at any time. In most cases, just launching the application will generate a new code. You should refer to your application's documentation for specific instructions. -如果选择使用 TOTP 应用程序在智能手机上设置双重身份验证，可随时为 {% data variables.product.product_name %} 生成验证码。 大多数情况下，只有启动应用程序才会生成新代码。 具体说明请参阅应用程序的文档。 - -如果在配置双重身份验证后删除移动应用程序，则需要提供恢复代码才可访问您的帐户。 更多信息请参阅“[丢失双重身份验证凭据时恢复帐户](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)” +If you delete the mobile application after configuring two-factor authentication, you'll need to provide your recovery code to get access to your account. For more information, see "[Recovering your account if you lose your two-factor authentication credentials](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)" {% ifversion fpt or ghec %} -### 接收短信 +### Receiving a text message -如果设置通过短信进行双重身份验证，{% data variables.product.product_name %} 将通过短信向您发送验证码。 +If you set up two-factor authentication via text messages, {% data variables.product.product_name %} will send you a text message with your authentication code. ### Verifying with {% data variables.product.prodname_mobile %} If you have installed and signed in to {% data variables.product.prodname_mobile %}, you may choose to authenticate with {% data variables.product.prodname_mobile %} for two-factor authentication. 1. Sign in to {% data variables.product.product_name %} with your browser, using your username and password. -2. If you have added a security key to your account, you'll first be prompted to insert and use a security key. To skip using a security key, click **Authenticate with {% data variables.product.prodname_mobile %}**. ![Two-factor authentication challenge on {% data variables.product.product_name %} with "Authenticate with {% data variables.product.prodname_mobile %}" highlighted](/assets/images/help/2fa/2fa-select-mobile.png) +2. If you have added a security key to your account, you'll first be prompted to insert and use a security key. To skip using a security key, click **Authenticate with {% data variables.product.prodname_mobile %}**. + ![Two-factor authentication challenge on {% data variables.product.product_name %} with "Authenticate with {% data variables.product.prodname_mobile %}" highlighted](/assets/images/help/2fa/2fa-select-mobile.png) 3. {% data variables.product.product_name %} will send you a push notification to verify your sign in attempt. Opening the push notification or opening the {% data variables.product.prodname_mobile %} app will display a prompt, asking you to approve or reject this sign in attempt. {% note %} @@ -57,35 +57,35 @@ If you have installed and signed in to {% data variables.product.prodname_mobile {% endif %} -## 通过命令行使用双重身份验证 +## Using two-factor authentication with the command line -在启用 2FA 后，您在命令行上访问 {% data variables.product.product_name %} 时必须使用个人访问令牌或 SSH 密钥，而不是密码。 +After you've enabled 2FA, you must use a personal access token or SSH key instead of your password when accessing {% data variables.product.product_name %} on the command line. -### 在命令行上使用 HTTPS 验证 +### Authenticating on the command line using HTTPS -启用 2FA 后，必须创建个人访问令牌以用作在命令行上使用 HTTPS URL 向 {% data variables.product.product_name %} 验证时的密码。 +After you've enabled 2FA, you must create a personal access token to use as a password when authenticating to {% data variables.product.product_name %} on the command line using HTTPS URLs. -当命令行上提供用户名和密码时，使用您的 {% data variables.product.product_name %} 用户名和个人访问令牌。 命令行提示不会指出在要求密码时您应输入个人访问令牌。 +When prompted for a username and password on the command line, use your {% data variables.product.product_name %} username and personal access token. The command line prompt won't specify that you should enter your personal access token when it asks for your password. -更多信息请参阅“[创建个人访问令牌](/github/authenticating-to-github/creating-a-personal-access-token)”。 +For more information, see "[Creating a personal access token](/github/authenticating-to-github/creating-a-personal-access-token)." -### 在命令行上使用 SSH 验证 +### Authenticating on the command line using SSH -启用 2FA 不会更改您在命令行上使用 SSH URL 向 {% data variables.product.product_name %} 验证的方式。 有关设置和使用 SSH 密钥的更多信息，请参阅“[通过 SSH 连接 {% data variables.product.prodname_dotcom %}](/articles/connecting-to-github-with-ssh/)”。 +Enabling 2FA doesn't change how you authenticate to {% data variables.product.product_name %} on the command line using SSH URLs. For more information about setting up and using an SSH key, see "[Connecting to {% data variables.product.prodname_dotcom %} with SSH](/articles/connecting-to-github-with-ssh/)." -## 使用双重身份验证通过 Subversion 访问仓库 +## Using two-factor authentication to access a repository using Subversion -通过 Subversion 访问仓库时，必须提供个人人访问令牌，而不是输入密码。 更多信息请参阅“[创建个人访问令牌](/github/authenticating-to-github/creating-a-personal-access-token)”。 +When you access a repository via Subversion, you must provide a personal access token instead of entering your password. For more information, see "[Creating a personal access token](/github/authenticating-to-github/creating-a-personal-access-token)." -## 疑难解答 +## Troubleshooting -如果失去对双重身份验证凭据的访问，您可以使用恢复代码或其他恢复方式（如已设置）重新获取对帐户的访问。 更多信息请参阅“[丢失 2FA 凭据时恢复帐户](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)”。 +If you lose access to your two-factor authentication credentials, you can use your recovery codes or another recovery method (if you've set one up) to regain access to your account. For more information, see "[Recovering your account if you lose your 2FA credentials](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)." -如果身份验证失败多次，您可能要与移动提供商同步手机的时钟。 通常，这需要在手机的时钟上选中 "Set automatically"（自动设置）选项，而不是提供自己的时区。 +If your authentication fails several times, you may wish to synchronize your phone's clock with your mobile provider. Often, this involves checking the "Set automatically" option on your phone's clock, rather than providing your own time zone. -## 延伸阅读 +## Further reading -- "[关于双重身份验证](/articles/about-two-factor-authentication)" -- "[配置双重身份验证](/articles/configuring-two-factor-authentication)" -- "[配置双重身份验证恢复方法](/articles/configuring-two-factor-authentication-recovery-methods)" -- "[丢失双重身份验证凭据时恢复帐户](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)" +- "[About two-factor authentication](/articles/about-two-factor-authentication)" +- "[Configuring two-factor authentication](/articles/configuring-two-factor-authentication)" +- "[Configuring two-factor authentication recovery methods](/articles/configuring-two-factor-authentication-recovery-methods)" +- "[Recovering your account if you lose your two-factor authentication credentials](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)" diff --git a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/changing-two-factor-authentication-delivery-methods-for-your-mobile-device.md b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/changing-two-factor-authentication-delivery-methods-for-your-mobile-device.md index eed532fe7e1f..713c07094df8 100644 --- a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/changing-two-factor-authentication-delivery-methods-for-your-mobile-device.md +++ b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/changing-two-factor-authentication-delivery-methods-for-your-mobile-device.md @@ -16,7 +16,7 @@ shortTitle: 更改 2FA 递送方式 {% note %} -**Note:** Changing your primary method for two-factor authentication invalidates your current two-factor authentication setup, including your recovery codes. Keep your new set of recovery codes safe. Changing your primary method for two-factor authentication does not affect your fallback SMS configuration, if configured. For more information, see "[Configuring two-factor authentication recovery methods](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#setting-a-fallback-authentication-number)." +**注意：** 更改双重身份验证的主要方法会使您当前的双重身份验证设置（包括恢复代码）失效。 确保新恢复代码集的安全。 更改双重身份验证的主要方法不会影响回退 SMS 配置（如果已配置）。 更多信息请参阅“[配置双重身份验证恢复方法](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#setting-a-fallback-authentication-number)”。 {% endnote %} diff --git a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md index 86b80e2357fd..3bfbd78f85d4 100644 --- a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md +++ b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md @@ -1,6 +1,6 @@ --- -title: 配置双重身份验证 -intro: 您可以选择多个选项，以向帐户添加第二个身份验证源。 +title: Configuring two-factor authentication +intro: You can choose among multiple options to add a second source of authentication to your account. redirect_from: - /articles/configuring-two-factor-authentication-via-a-totp-mobile-app - /articles/configuring-two-factor-authentication-via-text-message @@ -14,30 +14,29 @@ versions: ghec: '*' topics: - 2FA -shortTitle: 配置 2FA +shortTitle: Configure 2FA --- +You can configure two-factor authentication using a mobile app{% ifversion fpt or ghec %} or via text message{% endif %}. You can also add a security key. -您可以使用移动应用程序{% ifversion fpt or ghec %} 或通过短信{% endif %}配置双重身份验证。 您也可以添加安全密钥。 - -我们强力建议使用基于时间的一次性密码 (TOTP) 应用程序来配置 2FA。{% ifversion fpt or ghec %} TOTP 应用程序比 SMS 更可靠，特别是对于美国以外的地区。{% endif %} TOTP 应用程序支持在云中安全备份您的验证码，在无法访问设备的情况下也可以进行恢复。 +We strongly recommend using a time-based one-time password (TOTP) application to configure 2FA.{% ifversion fpt or ghec %} TOTP applications are more reliable than SMS, especially for locations outside the United States.{% endif %} TOTP apps support the secure backup of your authentication codes in the cloud and can be restored if you lose access to your device. {% warning %} -**警告：** -- 如果您是要求双重身份验证的组织中的成员{% ifversion fpt or ghec %}、帐单管理员{% endif %}或其私有仓库的外部协作者，则必须离开该组织后才能在 {% data variables.product.product_location %} 上禁用 2FA。 -- 如果禁用 2FA，您将自动失去对该组织以及您在该组织私有仓库中所拥有的任何私有复刻的访问权限。 要恢复对该组织和复刻的访问权限，请重新启用双重身份验证并联系组织所有者。 +**Warning:** +- If you're a member{% ifversion fpt or ghec %}, billing manager,{% endif %} or outside collaborator to a private repository of an organization that requires two-factor authentication, you must leave the organization before you can disable 2FA on {% data variables.product.product_location %}. +- If you disable 2FA, you will automatically lose access to the organization and any private forks you have of the organization's private repositories. To regain access to the organization and your forks, re-enable two-factor authentication and contact an organization owner. {% endwarning %} {% ifversion fpt or ghec %} -If you're a member of an {% data variables.product.prodname_emu_enterprise %}, you cannot configure 2FA for your {% data variables.product.prodname_managed_user %} account. 2FA should be configured through your identity provider. +If you're a member of an {% data variables.product.prodname_emu_enterprise %}, you cannot configure 2FA for your {% data variables.product.prodname_managed_user %} account. 2FA should be configured through your identity provider. {% endif %} -## 使用 TOTP 移动应用程序配置双重身份验证 +## Configuring two-factor authentication using a TOTP mobile app -基于时间的一次性密码 (TOTP) 应用程序可自动生成在特定时间后变化的验证码。 我们建议使用基于云的 TOTP 应用程序，例如： +A time-based one-time password (TOTP) application automatically generates an authentication code that changes after a certain period of time. We recommend using cloud-based TOTP apps such as: - [1Password](https://support.1password.com/one-time-passwords/) - [Authy](https://authy.com/guides/github/) - [LastPass Authenticator](https://lastpass.com/auth/) @@ -45,82 +44,92 @@ If you're a member of an {% data variables.product.prodname_emu_enterprise %}, y {% tip %} -**提示**：要在多个设备上通过 TOTP 配置身份验证，请在设置过程中，同时使用每个设备扫描 QR 码。 如果已启用 2FA，但您要添加其他设备，则必须从安全设置中重新配置 2FA。 +**Tip**: To configure authentication via TOTP on multiple devices, during setup, scan the QR code using each device at the same time. If 2FA is already enabled and you want to add another device, you must re-configure 2FA from your security settings. {% endtip %} -1. 下载 TOTP 应用程序。 +1. Download a TOTP app. {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.security %} {% data reusables.two_fa.enable-two-factor-authentication %} {%- ifversion fpt or ghes > 3.1 %} -5. 在“Two-factor authentication（双重身份验证）”下选择 **Set up using an app（使用应用程序设置）**并点击 **Continue（继续）**。 -6. 在“Authentication verification（身份验证）”下，执行以下操作之一： - - 使用移动设备的应用程序扫描 QR 码。 扫描完成后，应用程序会显示六位数代码，您可以在 {% data variables.product.product_name %} 输入该代码。 - - 如果无法扫描 QR 码，请单击 **enter this text code（输入此文本代码）**以查看可复制的代码，然后在 TOTP app 上手动输入。 ![单击输入此代码](/assets/images/help/2fa/2fa_wizard_app_click_code.png) -7. The TOTP mobile application saves your account on {% data variables.product.product_location %} and generates a new authentication code every few seconds. 在 {% data variables.product.product_name %} 上，请在“Enter the six-digit code from the application（从应用程序输入六位数代码）”下的字段中输入代码。 如果您的恢复代码未自动显示，请单击 **Continue（继续）**。 ![TOTP 输入代码字段](/assets/images/help/2fa/2fa_wizard_app_enter_code.png) +5. Under "Two-factor authentication", select **Set up using an app** and click **Continue**. +6. Under "Authentication verification", do one of the following: + - Scan the QR code with your mobile device's app. After scanning, the app displays a six-digit code that you can enter on {% data variables.product.product_name %}. + - If you can't scan the QR code, click **enter this text code** to see a code that you can manually enter in your TOTP app instead. + ![Click enter this code](/assets/images/help/2fa/2fa_wizard_app_click_code.png) +7. The TOTP mobile application saves your account on {% data variables.product.product_location %} and generates a new authentication code every few seconds. On {% data variables.product.product_name %}, type the code into the field under "Enter the six-digit code from the application". If your recovery codes are not automatically displayed, click **Continue**. +![TOTP enter code field](/assets/images/help/2fa/2fa_wizard_app_enter_code.png) {% data reusables.two_fa.save_your_recovery_codes_during_2fa_setup %} {%- else %} -5. 在双重身份验证页面上，单击 **Set up using an app（使用应用程序设置）**。 -6. 将恢复代码保存在安全的位置。 在失去访问权限时，恢复代码可帮助您恢复帐户登录。 - - 要在设备上保存恢复代码，请单击 **Download（下载）**。 - - 要保存恢复代码的硬拷贝，请单击 **Print（打印）**。 - - 要复制恢复代码以存储在密码管理器中，请单击**复制**。 ![可选择下载、打印或复制代码的恢复代码列表](/assets/images/help/2fa/download-print-or-copy-recovery-codes-before-continuing.png) -7. 保存双重身份验证恢复代码后，单击 **Next（下一步）**。 -8. 在双重身份验证页面上，执行以下操作之一： - - 使用移动设备的应用程序扫描 QR 码。 扫描完成后，应用程序会显示六位数代码，您可以在 {% data variables.product.product_name %} 输入该代码。 - - 如果无法扫描 QR 码，请单击 **enter this text code（输入此文本代码）**以查看可复制的代码，然后在 {% data variables.product.product_name %} 上手动输入。 ![单击输入此代码](/assets/images/help/2fa/totp-click-enter-code.png) -9. The TOTP mobile application saves your account on {% data variables.product.product_location %} and generates a new authentication code every few seconds. 在 {% data variables.product.product_name %} 中的 2FA 页面上，键入代码并单击 **Enable（启用）**。 ![TOTP 启用字段](/assets/images/help/2fa/totp-enter-code.png) +5. On the Two-factor authentication page, click **Set up using an app**. +6. Save your recovery codes in a safe place. Your recovery codes can help you get back into your account if you lose access. + - To save your recovery codes on your device, click **Download**. + - To save a hard copy of your recovery codes, click **Print**. + - To copy your recovery codes for storage in a password manager, click **Copy**. + ![List of recovery codes with option to download, print, or copy the codes](/assets/images/help/2fa/download-print-or-copy-recovery-codes-before-continuing.png) +7. After saving your two-factor recovery codes, click **Next**. +8. On the Two-factor authentication page, do one of the following: + - Scan the QR code with your mobile device's app. After scanning, the app displays a six-digit code that you can enter on {% data variables.product.product_name %}. + - If you can't scan the QR code, click **enter this text code** to see a code you can copy and manually enter on {% data variables.product.product_name %} instead. + ![Click enter this code](/assets/images/help/2fa/totp-click-enter-code.png) +9. The TOTP mobile application saves your account on {% data variables.product.product_location %} and generates a new authentication code every few seconds. On {% data variables.product.product_name %}, on the 2FA page, type the code and click **Enable**. + ![TOTP Enable field](/assets/images/help/2fa/totp-enter-code.png) {%- endif %} {% data reusables.two_fa.test_2fa_immediately %} {% ifversion fpt or ghec %} -## 使用短信配置双重身份验证 +## Configuring two-factor authentication using text messages -如果无法使用 TOTP 移动应用程序进行身份验证，您可以使用短信进行身份验证。 也可以提供后备设备的号码作为第二号码。 在无法访问主设备和恢复代码时，可通过备用短信号码恢复帐户登录。 +If you're unable to authenticate using a TOTP mobile app, you can authenticate using SMS messages. You can also provide a second number for a fallback device. If you lose access to both your primary device and your recovery codes, a backup SMS number can get you back in to your account. -在使用此方法之前，请确保您可以接收短信。 运营商可能会收取短信费用。 +Before using this method, be sure that you can receive text messages. Carrier rates may apply. {% warning %} -**警告：**我们**强烈建议**使用 TOTP 应用程序进行双重身份验证，而不是使用 SMS。 {% data variables.product.product_name %} 并非支持向每个国家/地区的手机发送短信。 通过短信配置身份验证之前，请查看 {% data variables.product.product_name %} 支持通过 SMS 验证的国家/地区列表。 更多信息请参阅“[支持 SMS 身份验证的国家/地区](/articles/countries-where-sms-authentication-is-supported)”。 +**Warning:** We **strongly recommend** using a TOTP application for two-factor authentication instead of SMS. {% data variables.product.product_name %} doesn't support sending SMS messages to phones in every country. Before configuring authentication via text message, review the list of countries where {% data variables.product.product_name %} supports authentication via SMS. For more information, see "[Countries where SMS authentication is supported](/articles/countries-where-sms-authentication-is-supported)". {% endwarning %} {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.security %} {% data reusables.two_fa.enable-two-factor-authentication %} -4. 在“Two-factor authentication（双重身份验证）”下选择 **Set up using SMS（使用 SMS 设置）**并点击 **Continue（继续）**。 -5. 在“Authentication verification（身份验证）”下，选择您的国家/地区代码并键入您的手机号码，包括区号。 确认信息无误后，单击 **Send authentication code（发送验证码）**。 +4. Under "Two-factor authentication", select **Set up using SMS** and click **Continue**. +5. Under "Authentication verification", select your country code and type your mobile phone number, including the area code. When your information is correct, click **Send authentication code**. - ![2FA SMS 屏幕](/assets/images/help/2fa/2fa_wizard_sms_send.png) + ![2FA SMS screen](/assets/images/help/2fa/2fa_wizard_sms_send.png) -6. 您将收到含安全码的短信。 在 {% data variables.product.product_name %} 上，请在“Enter the six-digit code sent to your phone（输入发送到手机的六位数代码）”下的字段中输入代码，然后单击 **Continue（继续）**。 +6. You'll receive a text message with a security code. On {% data variables.product.product_name %}, type the code into the field under "Enter the six-digit code sent to your phone" and click **Continue**. - ![2FA SMS 继续字段](/assets/images/help/2fa/2fa_wizard_sms_enter_code.png) + ![2FA SMS continue field](/assets/images/help/2fa/2fa_wizard_sms_enter_code.png) {% data reusables.two_fa.save_your_recovery_codes_during_2fa_setup %} {% data reusables.two_fa.test_2fa_immediately %} {% endif %} -## 使用安全密钥配置双重身份验证 +## Configuring two-factor authentication using a security key {% data reusables.two_fa.after-2fa-add-security-key %} -在大多数设备和浏览器上，您可以通过 USB 或 NFC 使用物理安全密钥。 某些浏览器可以使用设备上的指纹读取器、面部识别或密码/PIN 作为安全密钥。 +On most devices and browsers, you can use a physical security key over USB or NFC. Some browsers can use the fingerprint reader, facial recognition, or password/PIN on your device as a security key. -安全密钥验证是 TOTP 应用程序{% ifversion fpt or ghec %} 或短信{% endif %}验证的*备用*选择。 如果您丢失了安全密钥，仍可以使用手机的代码进行登录。 +Authentication with a security key is *secondary* to authentication with a TOTP application{% ifversion fpt or ghec %} or a text message{% endif %}. If you lose your security key, you'll still be able to use your phone's code to sign in. -1. 必须已通过 TOTP 移动应用程序{% ifversion fpt or ghec %} 或通过 SMS{% endif %} 配置了 2FA。 -2. 确保您的计算机中已插入 WebAuthn 兼容安全密钥。 +1. You must have already configured 2FA via a TOTP mobile app{% ifversion fpt or ghec %} or via SMS{% endif %}. +2. Ensure that you have a WebAuthn compatible security key inserted into your computer. {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.security %} -5. 在“Security keys（安全密钥）”旁边，单击 **添加**。 ![添加安全密钥选项](/assets/images/help/2fa/add-security-keys-option.png) -6. 在“Security keys（安全密钥）”下，单击 **Register new security key（注册新安全密钥）**。 ![注册新安全密钥](/assets/images/help/2fa/security-key-register.png) -7. 键入安全密钥的昵称，然后单击 **Add（添加）**。 ![为安全密钥提供昵称](/assets/images/help/2fa/security-key-nickname.png) -8. 按照安全密钥的文档激活安全密钥。 ![提示安全密钥](/assets/images/help/2fa/security-key-prompt.png) -9. 确认您已下载并且能够访问恢复代码。 如果尚未下载，或者要生成另一组代码，请下载代码并将其保存在安全位置。 如果无法访问自己的帐户，您可以使用恢复代码来恢复帐户访问。 更多信息请参阅“[丢失 2FA 凭据时恢复帐户](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)”。 ![下载恢复代码按钮](/assets/images/help/2fa/2fa-recover-during-setup.png) +5. Next to "Security keys", click **Add**. + ![Add security keys option](/assets/images/help/2fa/add-security-keys-option.png) +6. Under "Security keys", click **Register new security key**. + ![Registering a new security key](/assets/images/help/2fa/security-key-register.png) +7. Type a nickname for the security key, then click **Add**. + ![Providing a nickname for a security key](/assets/images/help/2fa/security-key-nickname.png) +8. Activate your security key, following your security key's documentation. + ![Prompt for a security key](/assets/images/help/2fa/security-key-prompt.png) +9. Confirm that you've downloaded and can access your recovery codes. If you haven't already, or if you'd like to generate another set of codes, download your codes and save them in a safe place. If you lose access to your account, you can use your recovery codes to get back into your account. For more information, see "[Recovering your account if you lose your 2FA credentials](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)." + ![Download recovery codes button](/assets/images/help/2fa/2fa-recover-during-setup.png) {% data reusables.two_fa.test_2fa_immediately %} {% ifversion fpt or ghec %} @@ -137,10 +146,10 @@ Once you have configured a TOTP application, or SMS, you can also use {% data va After signing in, you can now use your device for 2FA. {% endif %} -## 延伸阅读 +## Further reading -- "[关于双重身份验证](/articles/about-two-factor-authentication)" -- "[配置双重身份验证恢复方法](/articles/configuring-two-factor-authentication-recovery-methods)" -- “[使用双重身份验证访问 {% data variables.product.prodname_dotcom %}](/articles/accessing-github-using-two-factor-authentication)”。 -- “[丢失 2FA 凭据时恢复帐户](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)” -- “[创建个人访问令牌](/github/authenticating-to-github/creating-a-personal-access-token)”。 +- "[About two-factor authentication](/articles/about-two-factor-authentication)" +- "[Configuring two-factor authentication recovery methods](/articles/configuring-two-factor-authentication-recovery-methods)" +- "[Accessing {% data variables.product.prodname_dotcom %} using two-factor authentication](/articles/accessing-github-using-two-factor-authentication)" +- "[Recovering your account if you lose your 2FA credentials](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)" +- "[Creating a personal access token](/github/authenticating-to-github/creating-a-personal-access-token)" diff --git a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/countries-where-sms-authentication-is-supported.md b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/countries-where-sms-authentication-is-supported.md index 8a5b94c5b26a..10a3c48032ee 100644 --- a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/countries-where-sms-authentication-is-supported.md +++ b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/countries-where-sms-authentication-is-supported.md @@ -67,69 +67,69 @@ shortTitle: 支持短信的国家/地区
  • 冰岛
  • 印度
  • 印度尼西亚
    • -
  • Ireland
    • -
  • Israel
    • -
  • Italy
    • -
  • Ivory Coast
    • -
  • Jamaica
    • -
  • Japan
    • -
  • Jordan
    • -
  • Kazakhstan
    • -
  • Kuwait
    • -
  • Latvia
    • -
  • Libya
    • -
  • Liechtenstein
    • -
  • Lithuania
    • -
  • Luxembourg
    • -
  • Madagascar
    • -
  • Malawi
    • -
  • Malaysia
    • -
  • Maldives
    • -
  • Mali
    • -
  • Malta
    • -
  • Mauritius
    • -
  • Mexico
    • -
  • Monaco
    • -
  • Montenegro
    • -
  • Montserrat
    • -
  • Mozambique
    • -
  • Namibia
    • -
  • Netherlands
    • -
  • Netherlands Antilles
    • -
  • New Zealand
    • -
  • Nigeria
    • -
  • Norway
    • -
  • Philippines
    • -
  • Poland
    • -
  • Portugal
    • -
  • Qatar
    • -
  • Romania
    • -
  • Rwanda
    • -
  • Senegal
    • -
  • Serbia
    • -
  • Seychelles
    • -
  • Singapore
    • -
  • Slovakia
    • -
  • Slovenia
    • -
  • South Africa
    • -
  • South Korea
    • -
  • Spain
    • -
  • Sri Lanka
    • -
  • St Lucia
    • -
  • Sudan
    • -
  • Sweden
    • -
  • Switzerland
    • -
  • Taiwan
    • -
  • Tanzania
    • -
  • Togo
    • -
  • Trinidad and Tobago
    • -
  • Turks and Caicos Islands
    • -
  • Uganda
    • -
  • United Arab Emirates
    • -
  • United Kingdom
    • +
  • 爱尔兰
    • +
  • 以色列
    • +
  • 意大利
    • +
  • 象牙海岸
    • +
  • 牙买加
    • +
  • 日本
    • +
  • 约旦
    • +
  • 哈萨克斯坦
    • +
  • 科威特
    • +
  • 拉脱维亚
    • +
  • 利比亚
    • +
  • 列支敦士登
    • +
  • 立陶宛
    • +
  • 卢森堡
    • +
  • 马达加斯加
    • +
  • 马拉维
    • +
  • 马来西亚
    • +
  • 马尔代夫
    • +
  • 马里
    • +
  • 马耳他
    • +
  • 毛里求斯
    • +
  • 墨西哥
    • +
  • 摩纳哥
    • +
  • 黑山
    • +
  • 蒙特塞拉特
    • +
  • 莫桑比克
    • +
  • 纳米比亚
    • +
  • 荷兰
    • +
  • 荷属安的列斯
    • +
  • 新西兰
    • +
  • 尼日利亚
    • +
  • 挪威
    • +
  • 菲律宾
    • +
  • 波兰
    • +
  • 葡萄牙
    • +
  • 卡塔尔
    • +
  • 罗马尼亚
    • +
  • 卢旺达
    • +
  • 塞内加尔
    • +
  • 塞尔维亚
    • +
  • 塞舌尔
    • +
  • 新加坡
    • +
  • 斯洛伐克
    • +
  • 斯洛文尼亚
    • +
  • 南非
    • +
  • 韩国
    • +
  • 西班牙
    • +
  • 斯里兰卡
    • +
  • 圣卢西亚
    • +
  • 苏丹
    • +
  • 瑞典
    • +
  • 瑞士
    • +
  • 台湾
    • +
  • 坦桑尼亚
    • +
  • 多哥
    • +
  • 特立尼达和多巴哥
    • +
  • 特克斯和凯科斯群岛
    • +
  • 乌干达
    • +
  • 阿拉伯联合酋长国
    • +
  • 英国
  • 美国
    • -
  • Uzbekistan
    • -
  • Venezuela
    • +
  • 乌兹别克斯坦
    • +
  • 委内瑞拉
    • ## 延伸阅读 diff --git a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/index.md b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/index.md index cf48e124cbb7..a4bdcb689456 100644 --- a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/index.md +++ b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/index.md @@ -1,6 +1,6 @@ --- title: 使用双重身份验证 (2FA) 保护您的帐户 -intro: 'You can set up your account on {% data variables.product.product_location %} to require an authentication code in addition to your password when you sign in.' +intro: '您可以将您在 {% data variables.product.product_location %} 上的帐户设置为在登录时除了密码以外还需要验证码。' redirect_from: - /categories/84/articles - /categories/two-factor-authentication-2fa diff --git a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md index bf6ba3db750b..af8bdefb7244 100644 --- a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md +++ b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md @@ -23,7 +23,6 @@ shortTitle: 使用 2FA 找回帐户 **警告**： - {% data reusables.two_fa.support-may-not-help %} -- {% data reusables.accounts.you-must-know-your-password %} {% endwarning %} @@ -33,16 +32,22 @@ shortTitle: 使用 2FA 找回帐户 使用您的恢复代码之一自动重新进入您的帐户。 您可能已将恢复代码保存到密码管理器或计算机的下载文件夹中。 恢复代码的默认文件名为 `github-recovery-codes.txt`。 有关恢复代码的更多信息，请参阅“[配置双因素身份验证恢复方法](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#downloading-your-two-factor-authentication-recovery-codes)”。 -{% data reusables.two_fa.username-password %} +1. 输入您的用户名和密码以提示身份验证。 + + {% warning %} + + **警告**：{% data reusables.accounts.you-must-know-your-password %} + + {% endwarning %} {% ifversion fpt or ghec %} -1. Under "Having problems?", click **Use a recovery code or request a reset**. +1. 在“Having Problems?（有问题？）”下，单击 **Use a recovery code or request a reset（使用恢复代码或请求重置）**。 - ![Screenshot of link to use a recovery code](/assets/images/help/2fa/2fa-recovery-code-link.png) + ![使用恢复代码的链接的屏幕截图](/assets/images/help/2fa/2fa-recovery-code-link.png) {%- else %} 1. 在 2FA 页面上的“Don't have your phone?（没有您的电话？）”下，单击 **Enter a two-factor recovery code（输入双因素恢复代码）**。 - ![Screenshot of link to use a recovery code](/assets/images/help/2fa/2fa_recovery_dialog_box.png){% endif %} + ![使用恢复代码的链接的屏幕截图](/assets/images/help/2fa/2fa_recovery_dialog_box.png){% endif %} 1. 输入恢复代码之一，然后单击 **Verify（验证）**。 ![输入恢复代码的字段和验证按钮](/assets/images/help/2fa/2fa-type-verify-recovery-code.png) @@ -60,11 +65,11 @@ shortTitle: 使用 2FA 找回帐户 {% ifversion fpt or ghec %} ## 使用经过验证的设备、SSH 令牌或个人访问令牌进行身份验证 -If you know your password for {% data variables.product.product_location %} but don't have the two-factor authentication credentials or your two-factor authentication recovery codes, you can have a one-time password sent to your verified email address to begin the verification process and regain access to your account. +如果您知道 {% data variables.product.product_location %} 的密码但无法访问双重身份验证凭据，或没有双重身份验证恢复代码，则可以将一次性密码发送到经验证的电子邮件地址，以开始验证过程，重新获得对帐户的访问权限。 {% note %} -**Note**: For security reasons, regaining access to your account by authenticating with a one-time password can take up to three business days. {% data variables.product.company_short %} will not review additional requests submitted during this time. +**注**：出于安全原因，使用一次性密码验证来重新获得帐户访问权限可能需要最长三个工作日。 在此期间，{% data variables.product.company_short %} 不会审核提交的其他请求。 {% endnote %} @@ -74,33 +79,33 @@ If you know your password for {% data variables.product.product_location %} but {% warning %} - **Warning**: {% data reusables.accounts.you-must-know-your-password %} + **警告**：{% data reusables.accounts.you-must-know-your-password %} {% endwarning %} -1. Under "Having problems?", click **Use a recovery code or request a reset**. +1. 在“Having Problems?（有问题？）”下，单击 **Use a recovery code or request a reset（使用恢复代码或请求重置）**。 - ![Screenshot of link if you don't have your 2fa device or recovery codes](/assets/images/help/2fa/no-access-link.png) -1. To the right of "Locked out?", click **Try recovering your account**. + ![没有 2fa 设备或恢复码时的链接的屏幕截图](/assets/images/help/2fa/no-access-link.png) +1. 在“Locked out?（已锁定？）”的右侧，单击 **Try recovering your account（尝试恢复您的帐户）**。 - ![Screenshot of link to try recovering your account](/assets/images/help/2fa/try-recovering-your-account-link.png) + ![用于尝试恢复帐户的链接的屏幕截图](/assets/images/help/2fa/try-recovering-your-account-link.png) 1. 单击 **I understand, get started（我理解，开始）**请求重置身份验证设置。 - ![Screenshot of button to start reset of authentication settings](/assets/images/help/2fa/reset-auth-settings.png) -1. Click **Send one-time password** to send a one-time password to all eligible addresses associated with your account. Only verified emails are eligible for account recovery. If you've restricted password resets to your primary and/or backup addresses, these addresses are the only addresses eligible for account recovery. + ![用于开始重置身份验证设置的按钮的屏幕截图](/assets/images/help/2fa/reset-auth-settings.png) +1. 单击 **Send one-time password（发送一次性密码）**向与您的帐户关联的所有合格地址发送一次性密码。 只有经过验证的电子邮件才有资格进行帐户恢复。 如果您已将密码重置限制为主地址和/或备用地址，则这些地址是唯一有资格恢复帐户的地址。 - ![Screenshot of button to send one-time password](/assets/images/help/2fa/send-one-time-password.png) -1. Under "One-time password", type the temporary password from the recovery email {% data variables.product.prodname_dotcom %} sent. + ![用于发送一次性密码的按钮的屏幕截图](/assets/images/help/2fa/send-one-time-password.png) +1. 在“One-time password（一次性密码）”下，键入恢复电子邮件 {% data variables.product.prodname_dotcom %} 发送的临时密码。 - ![Screenshot of field to type one-time password](/assets/images/help/2fa/one-time-password-field.png) + ![用于键入一次性密码的字段的屏幕截图](/assets/images/help/2fa/one-time-password-field.png) 1. 单击 **Verify email address（验证电子邮件地址）**。 - ![Screenshot of button to verify email address](/assets/images/help/2fa/verify-email-address.png) + ![用于验证电子邮件地址的按钮的屏幕截图](/assets/images/help/2fa/verify-email-address.png) 1. 选择替代验证因素。 - 如果您之前已经使用当前设备登录此帐户，并且想使用该设备进行验证，请单击 **Verify with this device（使用此设备进行验证）**。 - 如果您之前已在此帐户上设置 SSH 密钥，并且想使用此 SSH 密钥进行验证，请单击 **SSH key（SSH 密钥）**。 - 如果您之前已经设置个人访问令牌，并且想使用个人访问令牌进行验证，请单击 **Personal access token（个人访问令牌）**。 - ![Screenshot of buttons for alternative verification](/assets/images/help/2fa/alt-verifications.png) -1. A member of {% data variables.contact.github_support %} will review your request and email you within three business days. 如果您的请求获得批准，您将收到一个完成帐户恢复过程的链接。 如果您的请求被拒绝，电子邮件将说明就任何其他问题联系支持的方式。 + ![用于替代验证的按钮的屏幕截图](/assets/images/help/2fa/alt-verifications.png) +1. {% data variables.contact.github_support %} 的成员将在三个工作日内审查您的请求并给您发送电子邮件。 如果您的请求获得批准，您将收到一个完成帐户恢复过程的链接。 如果您的请求被拒绝，电子邮件将说明就任何其他问题联系支持的方式。 {% endif %} diff --git a/translations/zh-CN/content/authentication/troubleshooting-ssh/error-key-already-in-use.md b/translations/zh-CN/content/authentication/troubleshooting-ssh/error-key-already-in-use.md index e0e2260bfc97..8901939e46c3 100644 --- a/translations/zh-CN/content/authentication/troubleshooting-ssh/error-key-already-in-use.md +++ b/translations/zh-CN/content/authentication/troubleshooting-ssh/error-key-already-in-use.md @@ -25,7 +25,7 @@ $ ssh -T -ai ~/.ssh/id_rsa git@{% data variables.command_line.codeblock > provide shell access. ``` -The *username* in the response is the account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} that the key is currently attached to. 如果响应类似于 "username/repo"，则表示密钥已作为[*部署密钥*](/guides/managing-deploy-keys#deploy-keys)附加到仓库。 +响应中的 *username* 是 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上密钥当前附加到的帐户。 如果响应类似于 "username/repo"，则表示密钥已作为[*部署密钥*](/guides/managing-deploy-keys#deploy-keys)附加到仓库。 要强制 SSH 仅使用命令行上提供的密钥，请使用 `-o` 添加 `IdentiesOnly=yes` 选项： diff --git a/translations/zh-CN/content/authentication/troubleshooting-ssh/error-permission-denied-publickey.md b/translations/zh-CN/content/authentication/troubleshooting-ssh/error-permission-denied-publickey.md index bb216e8d9551..314e5f4242a0 100644 --- a/translations/zh-CN/content/authentication/troubleshooting-ssh/error-permission-denied-publickey.md +++ b/translations/zh-CN/content/authentication/troubleshooting-ssh/error-permission-denied-publickey.md @@ -15,9 +15,9 @@ topics: shortTitle: Permission denied (publickey) --- -## Should the `sudo` command or elevated privileges be used with Git? +## `sudo` 命令或提升权限应该与 Git 一起使用吗？ -You should not be using the `sudo` command or elevated privileges, such as administrator permissions, with Git. 如果有*很好的原因*必须使用 `sudo`，请确保对每个命令使用它（可能使用 `su` 获取 shell 作为该点的根更好）。 如果[生成 SSH 密钥](/articles/generating-an-ssh-key)而不使用 `sudo`，则尝试使用 `sudo git push` 而不使用生成的相同密钥。 +您不应将 `sudo` 命令或提升的权限（如管理员权限）与 Git 一起使用。 如果有*很好的原因*必须使用 `sudo`，请确保对每个命令使用它（可能使用 `su` 获取 shell 作为该点的根更好）。 如果[生成 SSH 密钥](/articles/generating-an-ssh-key)而不使用 `sudo`，则尝试使用 `sudo git push` 而不使用生成的相同密钥。 ## 检查是否连接到正确的服务器 @@ -100,7 +100,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} {% tip %} -**Tip**: On most systems the default private keys (`~/.ssh/id_rsa` and `~/.ssh/identity`) are automatically added to the SSH authentication agent. 应无需运行 `ssh-add path/to/key`，除非在生成密钥时覆盖文件名。 +**提示**：在大多数系统中，默认私钥（`~/.ssh/id_rsa` 和 `~/.ssh/identity`）会自动添加到 SSH 身份验证代理中。 应无需运行 `ssh-add path/to/key`，除非在生成密钥时覆盖文件名。 {% endtip %} diff --git a/translations/zh-CN/content/authentication/troubleshooting-ssh/using-ssh-over-the-https-port.md b/translations/zh-CN/content/authentication/troubleshooting-ssh/using-ssh-over-the-https-port.md index cb74b3406142..3b0faba80609 100644 --- a/translations/zh-CN/content/authentication/troubleshooting-ssh/using-ssh-over-the-https-port.md +++ b/translations/zh-CN/content/authentication/troubleshooting-ssh/using-ssh-over-the-https-port.md @@ -33,7 +33,7 @@ $ ssh -T -p 443 git@ssh.github.com 如果您能在端口 443 上通过 SSH 连接到 `git@ssh.{% data variables.command_line.backticks %}`，则可以覆盖您的 SSH 设置以强制与 {% data variables.product.product_location %} 的任何连接均通过该服务器和端口运行。 -To set this in your SSH confifguration file, edit the file at `~/.ssh/config`, and add this section: +要在 SSH 配置文件中设置此设置，请在 `~/.ssh/config` 编辑该文件，并添加以下部分： ``` Host {% data variables.command_line.codeblock %} diff --git a/translations/zh-CN/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md b/translations/zh-CN/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md index fd21658b25a8..7c799b17c307 100644 --- a/translations/zh-CN/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md +++ b/translations/zh-CN/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md @@ -70,7 +70,7 @@ shortTitle: GitHub Actions 的计费 ## 计算分钟和存储支出 -{% data reusables.dotcom_billing.pricing_cal %} +{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_actions %} 在月末，{% data variables.product.prodname_dotcom %} 会计算您使用的超过帐户自带限额的分钟数和存储空间费用。 diff --git a/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md b/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md index 0804b4a76f25..7e830ad709dc 100644 --- a/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md +++ b/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md @@ -38,7 +38,7 @@ topics: 如果您通过微软企业协议购买 {% data variables.product.prodname_enterprise %} ， 您可以将您的 Azure 订阅ID 连接到您的企业账户，以启用并支付您的 {% data variables.product.prodname_codespaces %} 使用费用。 更多信息请参阅“[将 Azure 订阅连接到您的企业](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)”。 {% endif %} -{% data reusables.dotcom_billing.pricing_cal %} +{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_codespaces %} ### {% data variables.product.prodname_codespaces %} 预构建的计费 diff --git a/translations/zh-CN/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md b/translations/zh-CN/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md index 27867b71cbbe..d9247cd9649e 100644 --- a/translations/zh-CN/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md +++ b/translations/zh-CN/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md @@ -51,7 +51,9 @@ Storage usage is shared with build artifacts produced by {% data variables.produ {% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.25 USD per GB of storage and $0.50 USD per GB of data transfer. -For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD. {% data reusables.dotcom_billing.pricing_cal %} +For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD. + +{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_packages %} At the end of the month, {% data variables.product.prodname_dotcom %} rounds your data transfer to the nearest GB. diff --git a/translations/zh-CN/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md b/translations/zh-CN/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md index 1c40c8ccba6b..ccef24154c61 100644 --- a/translations/zh-CN/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md +++ b/translations/zh-CN/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md @@ -75,7 +75,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr | Name | Description | |----|----| -| `$schema` | **Required.** The URI of the SARIF JSON schema for version 2.1.0. For example, `https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json`. | +| `$schema` | **Required.** The URI of the SARIF JSON schema for version 2.1.0. For example, `https://json.schemastore.org/sarif-2.1.0.json`. | | `version` | **Required.** {% data variables.product.prodname_code_scanning_capc %} only supports SARIF version `2.1.0`. | `runs[]` | **Required.** A SARIF file contains an array of one or more runs. Each run represents a single run of an analysis tool. For more information about a `run`, see the [`run` object](#run-object). @@ -192,7 +192,7 @@ This SARIF output file has example values to show the minimum required propertie ```json { - "$schema": "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json", + "$schema": "https://json.schemastore.org/sarif-2.1.0.json", "version": "2.1.0", "runs": [ { @@ -250,7 +250,7 @@ This SARIF output file has example values to show all supported SARIF properties {% ifversion fpt or ghes > 3.1 or ghae or ghec %} ```json { - "$schema": "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json", + "$schema": "https://json.schemastore.org/sarif-2.1.0.json", "version": "2.1.0", "runs": [ { @@ -503,7 +503,7 @@ This SARIF output file has example values to show all supported SARIF properties {% else %} ```json { - "$schema": "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json", + "$schema": "https://json.schemastore.org/sarif-2.1.0.json", "version": "2.1.0", "runs": [ { diff --git a/translations/zh-CN/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli.md b/translations/zh-CN/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli.md index 51e2c68ed19e..f12d96790a5b 100644 --- a/translations/zh-CN/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli.md +++ b/translations/zh-CN/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli.md @@ -1,7 +1,7 @@ --- -title: Migrating from the CodeQL runner to CodeQL CLI -shortTitle: Migrating from the CodeQL runner -intro: 'You can use the {% data variables.product.prodname_codeql_cli %} to complete the same tasks as with the {% data variables.product.prodname_codeql_runner %}.' +title: 从 CodeQL 运行器迁移到 CodeQL CLI +shortTitle: 从 CodeQL 运行器迁移 +intro: '您可以使用 {% data variables.product.prodname_codeql_cli %} 完成与 {% data variables.product.prodname_codeql_runner %} 相同的任务。' product: '{% data reusables.gated-features.code-scanning %}' versions: fpt: '*' @@ -14,26 +14,26 @@ topics: - CodeQL --- -# Migrating from the {% data variables.product.prodname_codeql_runner %} to the {% data variables.product.prodname_codeql_cli %} +# 从 {% data variables.product.prodname_codeql_runner %} 迁移到 {% data variables.product.prodname_codeql_cli %} -The {% data variables.product.prodname_codeql_runner %} is being deprecated. You can use the {% data variables.product.prodname_codeql_cli %} version 2.6.2 and greater instead. This document describes how to migrate common workflows from the {% data variables.product.prodname_codeql_runner %} to the {% data variables.product.prodname_codeql_cli %}. +{% data variables.product.prodname_codeql_runner %} 将被弃用。 您可以改用 {% data variables.product.prodname_codeql_cli %} 版本 2.6.2 及更高版本。 本文档介绍如何将常见工作流程从 {% data variables.product.prodname_codeql_runner %} 迁移到 {% data variables.product.prodname_codeql_cli %}。 ## 安装 -Download the **{% data variables.product.prodname_codeql %} bundle** from the [`github/codeql-action` repository](https://github.com/github/codeql-action/releases). This bundle contains the {% data variables.product.prodname_codeql_cli %} and the standard {% data variables.product.prodname_codeql %} queries and libraries. +从 [`github/codeql-action` 存储库](https://github.com/github/codeql-action/releases)下载 **{% data variables.product.prodname_codeql %} 捆绑包**。 此捆绑包中包含 {% data variables.product.prodname_codeql_cli %} 以及标准 {% data variables.product.prodname_codeql %} 查询和库。 -For more information on setting up the {% data variables.product.prodname_codeql_cli %}, see "[Installing {% data variables.product.prodname_codeql_cli %} in your CI system](/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system)." +有关设置 {% data variables.product.prodname_codeql_cli %} 的更多信息，请参阅“[在 CI 系统中安装 {% data variables.product.prodname_codeql_cli %}](/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system)”。 -## Overview of workflow changes +## 工作流程更改概述 -A typical workflow that uses the {% data variables.product.prodname_codeql_runner %} to analyze a codebase has the following steps. -- `codeql-runner- init` to start creating {% data variables.product.prodname_codeql %} databases and read the configuration. -- For compiled languages: set environment variables produced by the `init` step. -- For compiled languages: run autobuild or manual build steps. -- `codeql-runner- analyze` to finish creating {% data variables.product.prodname_codeql %} databases, run queries to analyze each {% data variables.product.prodname_codeql %} database, summarize the results in a SARIF file, and upload the results to {% data variables.product.prodname_dotcom %}. +使用 {% data variables.product.prodname_codeql_runner %} 分析代码库的典型工作流程具有以下步骤。 +- `codeql-runner- init` 开始创建 {% data variables.product.prodname_codeql %} 数据库并读取配置。 +- 对于编译的语言：设置由 `init` 步骤产生的环境变量。 +- 对于编译的语言：运行自动构建或手动构建步骤。 +- `codeql-runner- analyze` 以完成 {% data variables.product.prodname_codeql %} 数据库的创建，运行查询以分析每个 {% data variables.product.prodname_codeql %} 数据库，将结果汇总到 SARIF 文件中，并将结果上传到 {% data variables.product.prodname_dotcom %}。 -A typical workflow that uses the {% data variables.product.prodname_codeql_cli %} to analyze a codebase has the following steps. -- `codeql database create` to create {% data variables.product.prodname_codeql %} databases. +使用 {% data variables.product.prodname_codeql_cli %} 分析代码库的典型工作流程具有以下步骤。 +- `codeql database create` 以创建 {% data variables.product.prodname_codeql %} 数据库。 - For compiled languages: Optionally provide a build command. - `codeql database analyze` to run queries to analyze each {% data variables.product.prodname_codeql %} database and summarize the results in a SARIF file. This command must be run once for each language or database. - `codeql github upload-results` to upload the resulting SARIF files to {% data variables.product.prodname_dotcom %}, to be displayed as code scanning alerts. This command must be run once for each language or SARIF file. @@ -81,9 +81,9 @@ echo "$TOKEN" | codeql github upload-results --repository=my-org/example-repo \ --sarif=/temp/example-repo-js.sarif --github-auth-stdin ``` -### Single non-compiled language (JavaScript) using a different query suite (security-and-quality) +### 使用不同查询套件 (security-and-quality) 的单个非编译语言 (JavaScript) -A similar approach can be taken for compiled languages, or multiple languages. +对于编译语言或多种语言，可以采用类似的方法。 Runner: ```bash @@ -111,9 +111,9 @@ echo "$TOKEN" | codeql github upload-results --repository=my-org/example-repo \ --sarif=/temp/example-repo-js.sarif --github-auth-stdin ``` -### Single non-compiled language (JavaScript) using a custom configuration file +### 使用自定义配置文件的单个非编译语言 (JavaScript) -A similar approach can be taken for compiled languages, or multiple languages. +对于编译语言或多种语言，可以采用类似的方法。 Runner: ```bash @@ -142,7 +142,7 @@ echo "$TOKEN" | codeql github upload-results --repository=my-org/example-repo \ --sarif=/temp/example-repo-js.sarif --github-auth-stdin ``` -### Single compiled language using autobuild (Java) +### 使用自动构建的单一编译语言 (Java) Runner: ```bash @@ -176,7 +176,7 @@ echo "$TOKEN" | codeql github upload-results --repository=my-org/example-repo \ --sarif=/temp/example-repo-java.sarif --github-auth-stdin ``` -### Single compiled language using a custom build command (Java) +### 使用自定义构建命令的单一编译语言 (Java) Runner: ```bash @@ -209,9 +209,9 @@ echo "$TOKEN" | codeql github upload-results --repository=my-org/example-repo \ --sarif=/temp/example-repo-java.sarif --github-auth-stdin ``` -### Single compiled language using indirect build tracing (C# on Windows within Azure DevOps) +### 使用间接构建跟踪的单一编译语言（Azure DevOps 中的 Windows 上的 C#） -Indirect build tracing for a compiled language enables {% data variables.product.prodname_codeql %} to detect all build steps between the `init` and `analyze` steps, when the code cannot be built using the autobuilder or an explicit build command line. This is useful when using preconfigured build steps from your CI system, such as the `VSBuild` and `MSBuild` tasks in Azure DevOps. +当无法使用自动构建器或显式构建命令行构建代码时，已编译语言的间接构建跟踪可让 {% data variables.product.prodname_codeql %} 检测 `init` 与 `analyze` 之间的所有构建步骤。 这在使用 CI 系统中预配置的构建步骤（如 azure DevOps 中的 `VSBuild` 和 `MSBuild` 任务）时非常有用。 Runner: ```yaml @@ -331,9 +331,9 @@ CLI: ``` -### Multiple languages using autobuild (C++, Python) +### 使用自动构建的多种语言（C++、Python） -This example is not strictly possible with the {% data variables.product.prodname_codeql_runner %}. Only one language (the compiled language with the most files) will be analyzed. +此示例在 {% data variables.product.prodname_codeql_runner %} 中并非严格可行。 将仅分析一种语言（文件最多的编译语言）。 Runner: ```bash @@ -373,7 +373,7 @@ for language in cpp python; do done ``` -### Multiple languages using a custom build command (C++, Python) +### 使用自定义构建命令的多种语言（C++、Python） Runner: ```bash diff --git a/translations/zh-CN/content/code-security/guides.md b/translations/zh-CN/content/code-security/guides.md index 04143a7d96f5..c82c4b7f45fe 100644 --- a/translations/zh-CN/content/code-security/guides.md +++ b/translations/zh-CN/content/code-security/guides.md @@ -31,6 +31,7 @@ includeGuides: - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/tracking-code-scanning-alerts-in-issues-using-task-lists - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-alerts + - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository @@ -38,6 +39,7 @@ includeGuides: - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow + - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/viewing-code-scanning-logs - /code-security/code-scanning/integrating-with-code-scanning/about-integration-with-code-scanning - /code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning - /code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github @@ -45,6 +47,7 @@ includeGuides: - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-runner-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system + - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-runner-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/troubleshooting-codeql-runner-in-your-ci-system - /code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities @@ -58,6 +61,8 @@ includeGuides: - /code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory - /code-security/repository-security-advisories/withdrawing-a-repository-security-advisory - /code-security/security-overview/about-the-security-overview + - /code-security/security-overview/filtering-alerts-in-the-security-overview + - /code-security/security-overview/viewing-the-security-overview - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates diff --git a/translations/zh-CN/content/code-security/index.md b/translations/zh-CN/content/code-security/index.md index e6128a1dfb9e..624ad70c9972 100644 --- a/translations/zh-CN/content/code-security/index.md +++ b/translations/zh-CN/content/code-security/index.md @@ -8,17 +8,17 @@ featuredLinks: guides: - /code-security/getting-started/securing-your-repository - /code-security/getting-started/securing-your-organization - - '{% ifversion fpt %}/code-security/repository-security-advisories/creating-a-repository-security-advisory{% endif %}' - - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif%}' + - '{% ifversion fpt or ghec %}/code-security/repository-security-advisories/creating-a-repository-security-advisory{% endif %}' + - '{% ifversion ghes or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif%}' guideCards: - - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates{% endif %}' - - '{% ifversion fpt %}/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/enabling-and-disabling-dependabot-version-updates{% endif %}' - - '{% ifversion fpt %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif %}' - - '{% ifversion ghes %}/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository{% endif %}' - - '{% ifversion ghes %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}' - - '{% ifversion ghes or ghae %}/code-security/secret-security/configuring-secret-scanning-for-your-repositories{% endif %}' - - '{% ifversion ghae %}/code-security/secure-coding/integrating-with-code-scanning/uploading-a-sarif-file-to-github{% endif %}' - - '{% ifversion ghae %}/code-security/secure-coding/using-codeql-code-scanning-with-your-existing-ci-system{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/enabling-and-disabling-dependabot-version-updates{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif %}' + - '{% ifversion ghes < 3.3 %}/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository{% endif %}' + - '{% ifversion ghes < 3.3 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}' + - '{% ifversion ghes < 3.3 or ghae %}/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories{% endif %}' + - '{% ifversion ghae %}/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github{% endif %}' + - '{% ifversion ghae %}/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system{% endif %}' popular: - '{% ifversion ghes %}/admin/release-notes{% endif %}' - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies @@ -26,11 +26,11 @@ featuredLinks: - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot - - '{% ifversion ghae %}/code-security/secret-security/about-secret-scanning{% endif %}' + - '{% ifversion ghae %}/code-security/secret-scanning/about-secret-scanning{% endif %}' - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies - - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages{% endif %}' - - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow{% endif %}' - - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/running-codeql-code-scanning-in-a-container{% endif %}' + - '{% ifversion ghes < 3.3 or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages{% endif %}' + - '{% ifversion ghes < 3.3 or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow{% endif %}' + - '{% ifversion ghes < 3.3 or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/running-codeql-code-scanning-in-a-container{% endif %}' changelog: label: security-and-compliance versions: diff --git a/translations/zh-CN/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/zh-CN/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index 630748e2d339..ee55d288848b 100644 --- a/translations/zh-CN/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/translations/zh-CN/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -54,7 +54,7 @@ topics: 1. 查看漏洞的详细信息以及包含自动安全更新的拉取请求（如果有）。 1. （可选）如果还没有针对该警报的 {% data variables.product.prodname_dependabot_security_updates %} 更新，要创建拉取请求以解决该漏洞，请单击 **Create {% data variables.product.prodname_dependabot %} security update（创建 Dependabot 安全更新）**。 ![创建 {% data variables.product.prodname_dependabot %} 安全更新按钮](/assets/images/help/repository/create-dependabot-security-update-button-ungrouped.png) 1. 当您准备好更新依赖项并解决漏洞时，合并拉取请求。 {% data variables.product.prodname_dependabot %} 提出的每个拉取请求都包含可用于控制 {% data variables.product.prodname_dependabot %} 的命令的相关信息。 更多信息请参阅“[管理依赖项更新的拉取请求](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)”。 -1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" dropdown, and click a reason for dismissing the alert.{% if reopen-dependabot-alerts %} Unfixed dismissed alerts can be reopened later.{% endif %} ![选择通过 "Dismiss（忽略）"下拉菜单忽略警报的原因](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png) +1. （可选）如果警报正在修复、不正确或位于未使用的代码中，请选择“"Dismiss（忽略）”下拉列表，然后单击关闭警报的原因。{% if reopen-dependabot-alerts %} 未修复的已消除警报可以稍后重新打开。{% endif %} ![选择通过 "Dismiss（忽略）"下拉菜单忽略警报的原因](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png) {% elsif ghes = 3.3 %} {% data reusables.repositories.navigate-to-repo %} @@ -85,14 +85,14 @@ topics: {% if reopen-dependabot-alerts %} -## Viewing and updating closed alerts +## 查看和更新已关闭的警报 {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} {% data reusables.repositories.sidebar-dependabot-alerts %} -1. To just view closed alerts, click **Closed**. ![Screenshot showing the "Closed" option](/assets/images/help/repository/dependabot-alerts-closed.png) -1. Click the alert that you would like to view or update. ![Screenshot showing a highlighted dependabot alert](/assets/images/help/repository/dependabot-alerts-select-closed-alert.png) -2. Optionally, if the alert was dismissed and you wish to reopen it, click **Reopen**. ![Screenshot showing the "Reopen" button](/assets/images/help/repository/reopen-dismissed-alert.png) +1. 要仅查看已关闭的警报，请单击 **Closed（已关闭）**。 ![显示"已关闭"选项的屏幕截图](/assets/images/help/repository/dependabot-alerts-closed.png) +1. 单击要查看或更新的警报。 ![显示突出显示的 dependabot 警报的屏幕截图](/assets/images/help/repository/dependabot-alerts-select-closed-alert.png) +2. （可选）如果警报已消除，并且您希望重新打开它，请单击 **Reopen（重新打开）**。 ![显示"重新打开"按钮的屏幕截图](/assets/images/help/repository/reopen-dismissed-alert.png) {% endif %} diff --git a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review.md b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review.md index 0e7e9cfcaaba..85377a49ac72 100644 --- a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review.md +++ b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review.md @@ -27,11 +27,12 @@ redirect_from: 如果拉取请求针对仓库的默认分支并且包含对包清单或锁定文件的更改，您可以显示依赖项审查以查看更改的内容。 依赖项审查包括对锁定文件中间接依赖项的更改详情，并告诉您任何已添加或更新的依赖项是否包含已知漏洞。 -{% ifversion fpt or ghec %} -依赖项审查适用于： +{% ifversion fpt %} +依赖项审查在所有产品的所有公共存储库中都可用，并且无法禁用。 依赖项审查在使用 GitHub Enterprise Cloud 并拥有 {% data variables.product.prodname_GH_advanced_security %} 许可证的组织拥有的私有存储库中可用。 更多信息请参阅 [{% data variables.product.prodname_ghe_cloud %} 文档](/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review)。 + +{% elsif ghec %} +依赖项审查包含在公共存储库的 {% data variables.product.product_name %} 中。 要在组织拥有的私有存储库中使用依赖项审查，您必须具有 {% data variables.product.prodname_GH_advanced_security %} 许可证并启用依赖关系图。 更多信息请参阅“[探索仓库的依赖项](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository)”。 -* 所有公共仓库。 -* 由具有 {% data variables.product.prodname_advanced_security %} 许可的组织所拥有并且启用了依赖关系图的私有仓库。 更多信息请参阅“[探索仓库的依赖项](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository)”。 {% elsif ghes or ghae %} 为 {% data variables.product.product_location %} 启用依赖关系图并为组织或仓库启用{% data variables.product.prodname_advanced_security %} 时，依赖项审查可用。 {% endif %} @@ -44,6 +45,8 @@ redirect_from: 依赖项审查支持与依赖关系图相同的语言和包管理生态系统。 更多信息请参阅“[关于依赖关系图](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)”。 +{% ifversion ghec or ghes or ghae %} ## 启用依赖项审查 -启用依赖关系图时，依赖项审查功能可用。 {% ifversion fpt or ghec %}更多信息请参阅“[启用依赖关系图](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph#enabling-the-dependency-graph)”。{% endif %}{% ifversion ghes or ghae %}更多信息请参阅“[为企业启用依赖关系图](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise)”。{% endif %} +启用依赖关系图时，依赖项审查功能可用。 {% ifversion ghec %}更多信息请参阅“[启用依赖关系图](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph#enabling-the-dependency-graph)”。{% endif %}{% ifversion ghes or ghae %}更多信息请参阅“[为企业启用依赖关系图](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise)”。{% endif %} +{% endif %} diff --git a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md index cf334a885059..5f87b3153288 100644 --- a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md +++ b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md @@ -1,7 +1,7 @@ --- -title: 为组织启用 Codespaces -shortTitle: 启用 Codespaces -intro: '您可以控制组织中的哪些用户可以使用 {% data variables.product.prodname_codespaces %}。' +title: Enabling Codespaces for your organization +shortTitle: Enable Codespaces +intro: 'You can control which users in your organization can use {% data variables.product.prodname_codespaces %}.' product: '{% data reusables.gated-features.codespaces %}' permissions: 'To manage user permissions for {% data variables.product.prodname_codespaces %} for an organization, you must be an organization owner.' redirect_from: @@ -17,49 +17,49 @@ topics: --- -## 关于为组织启用 {% data variables.product.prodname_codespaces %} +## About enabling {% data variables.product.prodname_codespaces %} for your organization -组织所有者可以控制组织中的哪些用户可以创建和使用代码空间。 +Organization owners can control which users in your organization can create and use codespaces. -要在组织中使用 Codespaces，必须执行以下操作： +To use codespaces in your organization, you must do the following: -- 确保用户他们要在其中使用代码空间的存储库[至少具有写入权限](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)。 -- [为组织中的用户启用 {% data variables.product.prodname_codespaces %}](#enable-codespaces-for-users-in-your-organization)。 您可以选择允许所选用户使用 {% data variables.product.prodname_codespaces %} ，也可以选择仅允许特定用户使用。 -- [设置支出限制](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces) -- 确保您的组织未启用 IP 地址允许列表。 更多信息请参阅“[管理组织允许的 IP 地址](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)”。 +- Ensure that users have [at least write access](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) to the repositories where they want to use a codespace. +- [Enable {% data variables.product.prodname_codespaces %} for users in your organization](#enable-codespaces-for-users-in-your-organization). You can choose to allow {% data variables.product.prodname_codespaces %} for selected users or only for specific users. +- [Set a spending limit](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces) +- Ensure that your organization does not have an IP address allow list enabled. For more information, see "[Managing allowed IP addresses for your organization](/{% ifversion fpt %}enterprise-cloud@latest/{% endif %}organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} -默认情况下，代码空间只能访问从中创建它的存储库。 如果您希望组织中的代码空间能够访问代码空间创建者可以访问的其他组织仓库，请参阅“[管理 {% data variables.product.prodname_codespaces %} 的访问和安全](/codespaces/managing-codespaces-for-your-organization/managing-access-and-security-for-your-organizations-codespaces)”。 +By default, a codespace can only access the repository from which it was created. If you want codespaces in your organization to be able to access other organization repositories that the codespace creator can access, see "[Managing access and security for {% data variables.product.prodname_codespaces %}](/codespaces/managing-codespaces-for-your-organization/managing-access-and-security-for-your-organizations-codespaces)." -## 为组织中的用户启用 {% data variables.product.prodname_codespaces %} +## Enable {% data variables.product.prodname_codespaces %} for users in your organization {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.click-codespaces %} -1. 在“User permissions（用户权限）”下，选择以下选项之一： +1. Under "User permissions", select one of the following options: - * **Selected users（所选用户）**选择特定组织成员使用 {% data variables.product.prodname_codespaces %}。 - * **允许所有成员**以允许所有组织成员使用 {% data variables.product.prodname_codespaces %}。 - * **允许所有成员和外部协作者**以允许所有组织成员以及外部协作者使用 {% data variables.product.prodname_codespaces %}。 + * **Selected users** to select specific organization members to use {% data variables.product.prodname_codespaces %}. + * **Allow for all members** to allow all your organization members to use {% data variables.product.prodname_codespaces %}. + * **Allow for all members and outside collaborators** to allow all your organization members as well as outside collaborators to use {% data variables.product.prodname_codespaces %}. - !["用户权限"单选按钮](/assets/images/help/codespaces/org-user-permission-settings-outside-collaborators.png) + ![Radio buttons for "User permissions"](/assets/images/help/codespaces/org-user-permission-settings-outside-collaborators.png) {% note %} - **注意：** 当您选择 **Allow for all members and outside collaborators（允许所有成员和外部协作者）**时，所有已添加到特定存储库的外部协作者都可以创建和使用 {% data variables.product.prodname_codespaces %}。 您的组织将对外部协作者发生的所有使用付费。 有关管理外部协作者的详细信息，请参阅“[关于外部协作者](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization#about-outside-collaborators)”。 + **Note:** When you select **Allow for all members and outside collaborators**, all outside collaborators who have been added to specific repositories can create and use {% data variables.product.prodname_codespaces %}. Your organization will be billed for all usage incurred by outside collaborators. For more information on managing outside collaborators, see "[About outside collaborators](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization#about-outside-collaborators)." {% endnote %} -1. 单击 **Save（保存）**。 +1. Click **Save**. -## 为组织禁用 {% data variables.product.prodname_codespaces %} +## Disabling {% data variables.product.prodname_codespaces %} for your organization {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.click-codespaces %} -1. 在“User permissions（用户权限）”下，选择 **Disabled（已禁用）**。 +1. Under "User permissions", select **Disabled**. -## 设置支出限制 +## Setting a spending limit -{% data reusables.codespaces.codespaces-spending-limit-requirement %} +{% data reusables.codespaces.codespaces-spending-limit-requirement %} -有关管理和更改帐户支出限制的信息，请参阅“[管理 {% data variables.product.prodname_codespaces %} 的支出限制](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces)”。 +For information on managing and changing your account's spending limit, see "[Managing your spending limit for {% data variables.product.prodname_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces)." diff --git a/translations/zh-CN/content/developers/apps/building-github-apps/managing-allowed-ip-addresses-for-a-github-app.md b/translations/zh-CN/content/developers/apps/building-github-apps/managing-allowed-ip-addresses-for-a-github-app.md index 6999000a4522..d0e1dd45920b 100644 --- a/translations/zh-CN/content/developers/apps/building-github-apps/managing-allowed-ip-addresses-for-a-github-app.md +++ b/translations/zh-CN/content/developers/apps/building-github-apps/managing-allowed-ip-addresses-for-a-github-app.md @@ -1,34 +1,35 @@ --- -title: 管理 GitHub 应用程序允许的 IP 地址 -intro: '您可以将 IP 允许列表添加到您的 {% data variables.product.prodname_github_app %}，以防止您的应用被组织自己的允许列表阻止。' +title: Managing allowed IP addresses for a GitHub App +intro: 'You can add an IP allow list to your {% data variables.product.prodname_github_app %} to prevent your app from being blocked by an organization''s own allow list.' versions: fpt: '*' ghae: '*' ghec: '*' topics: - GitHub Apps -shortTitle: 管理允许的 IP 地址 +shortTitle: Manage allowed IP addresses --- -## 关于 {% data variables.product.prodname_github_apps %} 的 IP 地址允许列表 +## About IP address allow lists for {% data variables.product.prodname_github_apps %} -企业和组织所有者可以通过配置 IP 地址允许列表来限制对资产的访问。 此列表指定允许连接的 IP 地址。 更多信息请参阅“[在企业中实施安全设置策略](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)”。 +Enterprise and organization owners can restrict access to assets by configuring an IP address allow list. This list specifies the IP addresses that are allowed to connect. For more information, see "[Enforcing policies for security settings in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)." -当组织拥有允许列表时，通过 {% data variables.product.prodname_github_app %} 连接的第三方应用程序将被拒绝访问，除非以下两个条件成立： +When an organization has an allow list, third-party applications that connect via a {% data variables.product.prodname_github_app %} will be denied access unless both of the following are true: -* {% data variables.product.prodname_github_app %} 的创建者为应用程序配置了允许列表，其中指定了其应用程序运行的 IP 地址。 有关如何操作的详细信息，请参阅下文。 -* 组织所有者选择允许将 {% data variables.product.prodname_github_app %} 允许列表中的地址添加到自己的允许列表中。 更多信息请参阅“[管理组织允许的 IP 地址](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#allowing-access-by-github-apps)”。 +* The creator of the {% data variables.product.prodname_github_app %} has configured an allow list for the application that specifies the IP addresses at which their application runs. See below for details of how to do this. +* The organization owner has chosen to permit the addresses in the {% data variables.product.prodname_github_app %}'s allow list to be added to their own allow list. For more information, see "[Managing allowed IP addresses for your organization](/{% ifversion fpt %}enterprise-cloud@latest/{% endif %}organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} {% data reusables.apps.ip-allow-list-only-apps %} -## 将 IP 地址允许列表添加到 {% data variables.product.prodname_github_app %} +## Adding an IP address allow list to a {% data variables.product.prodname_github_app %} {% data reusables.apps.settings-step %} {% data reusables.user-settings.developer_settings %} {% data reusables.user-settings.github_apps %} {% data reusables.user-settings.modify_github_app %} -1. 向下滚动到“IP 允许列表”部分。 ![GitHub 应用程序的基本信息部分](/assets/images/github-apps/github-apps-allow-list-empty.png) +1. Scroll down to the "IP allow list" section. +![Basic information section for your GitHub App](/assets/images/github-apps/github-apps-allow-list-empty.png) {% data reusables.identity-and-permissions.ip-allow-lists-add-ip %} {% data reusables.identity-and-permissions.ip-allow-lists-add-description %} - 该说明供您参考，并未在安装 {% data variables.product.prodname_github_app %} 的组织允许列表中使用。 相反，组织允许列表将包括“按名称 GitHub 应用程序管理”作为说明。 + The description is for your reference and is not used in the allow list of organizations where the {% data variables.product.prodname_github_app %} is installed. Instead, organization allow lists will include "Managed by the NAME GitHub App" as the description. {% data reusables.identity-and-permissions.ip-allow-lists-add-entry %} diff --git a/translations/zh-CN/content/developers/webhooks-and-events/events/issue-event-types.md b/translations/zh-CN/content/developers/webhooks-and-events/events/issue-event-types.md index 4eae8a91a49a..b1f56edc5870 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/events/issue-event-types.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/events/issue-event-types.md @@ -322,7 +322,7 @@ GitHub 尝试自动更改拉取请求的基本分支已成功。 ## head_ref_force_pushed -The pull request's HEAD branch was force pushed. +拉取请求的 HEAD 分支已强制推送。 ### 可用性 diff --git a/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line.md deleted file mode 100644 index d9ad171cd48f..000000000000 --- a/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ /dev/null @@ -1,165 +0,0 @@ ---- -title: Adding an existing project to GitHub using the command line -intro: 'Putting your existing work on {% data variables.product.product_name %} can let you share and collaborate in lots of great ways.' -redirect_from: - - /articles/add-an-existing-project-to-github - - /articles/adding-an-existing-project-to-github-using-the-command-line - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - - /github/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line -versions: - fpt: '*' - ghes: '*' - ghae: '*' - ghec: '*' -shortTitle: Add a project locally ---- - -## About adding existing projects to {% data variables.product.product_name %} - -{% tip %} - -**Tip:** If you're most comfortable with a point-and-click user interface, try adding your project with {% data variables.product.prodname_desktop %}. For more information, see "[Adding a repository from your local computer to GitHub Desktop](/desktop/guides/contributing-to-projects/adding-a-repository-from-your-local-computer-to-github-desktop)" in the *{% data variables.product.prodname_desktop %} Help*. - -{% endtip %} - -{% data reusables.repositories.sensitive-info-warning %} - -## Adding a project to {% data variables.product.product_name %} with {% data variables.product.prodname_cli %} - -{% data variables.product.prodname_cli %} is an open source tool for using {% data variables.product.prodname_dotcom %} from your computer's command line. {% data variables.product.prodname_cli %} can simplify the process of adding an existing project to {% data variables.product.product_name %} using the command line. To learn more about {% data variables.product.prodname_cli %}, see "[About {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)." - -1. In the command line, navigate to the root directory of your project. -1. Initialize the local directory as a Git repository. - - ```shell - git init -b main - ``` - -1. Stage and commit all the files in your project - - ```shell - git add . && git commit -m "initial commit" - ``` - -1. To create a repository for your project on GitHub, use the `gh repo create` subcommand. When prompted, select **Push an existing local repository to GitHub** and enter the desired name for your repository. If you want your project to belong to an organization instead of your user account, specify the organization name and project name with `organization-name/project-name`. - -1. Follow the interactive prompts. To add the remote and push the repository, confirm yes when asked to add the remote and push the commits to the current branch. - -1. Alternatively, to skip all the prompts, supply the path to the repository with the `--source` flag and pass a visibility flag (`--public`, `--private`, or `--internal`). For example, `gh repo create --source=. --public`. Specify a remote with the `--remote` flag. To push your commits, pass the `--push` flag. For more information about possible arguments, see the [GitHub CLI manual](https://cli.github.com/manual/gh_repo_create). - -## Adding a project to {% data variables.product.product_name %} without {% data variables.product.prodname_cli %} - -{% mac %} - -1. [Create a new repository](/repositories/creating-and-managing-repositories/creating-a-new-repository) on {% data variables.product.product_location %}. To avoid errors, do not initialize the new repository with *README*, license, or `gitignore` files. You can add these files after your project has been pushed to {% data variables.product.product_name %}. - ![Create New Repository drop-down](/assets/images/help/repository/repo-create.png) -{% data reusables.command_line.open_the_multi_os_terminal %} -3. Change the current working directory to your local project. -4. Initialize the local directory as a Git repository. - ```shell - $ git init -b main - ``` -5. Add the files in your new local repository. This stages them for the first commit. - ```shell - $ git add . - # Adds the files in the local repository and stages them for commit. {% data reusables.git.unstage-codeblock %} - ``` -6. Commit the files that you've staged in your local repository. - ```shell - $ git commit -m "First commit" - # Commits the tracked changes and prepares them to be pushed to a remote repository. {% data reusables.git.reset-head-to-previous-commit-codeblock %} - ``` -7. At the top of your repository on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}'s Quick Setup page, click {% octicon "clippy" aria-label="The copy to clipboard icon" %} to copy the remote repository URL. - ![Copy remote repository URL field](/assets/images/help/repository/copy-remote-repository-url-quick-setup.png) -8. In Terminal, [add the URL for the remote repository](/github/getting-started-with-github/managing-remote-repositories) where your local repository will be pushed. - ```shell - $ git remote add origin <REMOTE_URL> - # Sets the new remote - $ git remote -v - # Verifies the new remote URL - ``` -9. [Push the changes](/github/getting-started-with-github/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}. - ```shell - $ git push -u origin main - # Pushes the changes in your local repository up to the remote repository you specified as the origin - ``` - -{% endmac %} - -{% windows %} - -1. [Create a new repository](/articles/creating-a-new-repository) on {% data variables.product.product_location %}. To avoid errors, do not initialize the new repository with *README*, license, or `gitignore` files. You can add these files after your project has been pushed to {% data variables.product.product_name %}. - ![Create New Repository drop-down](/assets/images/help/repository/repo-create.png) -{% data reusables.command_line.open_the_multi_os_terminal %} -3. Change the current working directory to your local project. -4. Initialize the local directory as a Git repository. - ```shell - $ git init -b main - ``` -5. Add the files in your new local repository. This stages them for the first commit. - ```shell - $ git add . - # Adds the files in the local repository and stages them for commit. {% data reusables.git.unstage-codeblock %} - ``` -6. Commit the files that you've staged in your local repository. - ```shell - $ git commit -m "First commit" - # Commits the tracked changes and prepares them to be pushed to a remote repository. {% data reusables.git.reset-head-to-previous-commit-codeblock %} - ``` -7. At the top of your repository on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}'s Quick Setup page, click {% octicon "clippy" aria-label="The copy to clipboard icon" %} to copy the remote repository URL. - ![Copy remote repository URL field](/assets/images/help/repository/copy-remote-repository-url-quick-setup.png) -8. In the Command prompt, [add the URL for the remote repository](/github/getting-started-with-github/managing-remote-repositories) where your local repository will be pushed. - ```shell - $ git remote add origin <REMOTE_URL> - # Sets the new remote - $ git remote -v - # Verifies the new remote URL - ``` -9. [Push the changes](/github/getting-started-with-github/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}. - ```shell - $ git push origin main - # Pushes the changes in your local repository up to the remote repository you specified as the origin - ``` - -{% endwindows %} - -{% linux %} - -1. [Create a new repository](/articles/creating-a-new-repository) on {% data variables.product.product_location %}. To avoid errors, do not initialize the new repository with *README*, license, or `gitignore` files. You can add these files after your project has been pushed to {% data variables.product.product_name %}. - ![Create New Repository drop-down](/assets/images/help/repository/repo-create.png) -{% data reusables.command_line.open_the_multi_os_terminal %} -3. Change the current working directory to your local project. -4. Initialize the local directory as a Git repository. - ```shell - $ git init -b main - ``` -5. Add the files in your new local repository. This stages them for the first commit. - ```shell - $ git add . - # Adds the files in the local repository and stages them for commit. {% data reusables.git.unstage-codeblock %} - ``` -6. Commit the files that you've staged in your local repository. - ```shell - $ git commit -m "First commit" - # Commits the tracked changes and prepares them to be pushed to a remote repository. {% data reusables.git.reset-head-to-previous-commit-codeblock %} - ``` -7. At the top of your repository on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}'s Quick Setup page, click {% octicon "clippy" aria-label="The copy to clipboard icon" %} to copy the remote repository URL. - ![Copy remote repository URL field](/assets/images/help/repository/copy-remote-repository-url-quick-setup.png) -8. In Terminal, [add the URL for the remote repository](/github/getting-started-with-github/managing-remote-repositories) where your local repository will be pushed. - ```shell - $ git remote add origin <REMOTE_URL> - # Sets the new remote - $ git remote -v - # Verifies the new remote URL - ``` -9. [Push the changes](/github/getting-started-with-github/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}. - ```shell - $ git push origin main - # Pushes the changes in your local repository up to the remote repository you specified as the origin - ``` - -{% endlinux %} - -## Further reading - -- "[Adding a file to a repository](/repositories/working-with-files/managing-files/adding-a-file-to-a-repository#adding-a-file-to-a-repository-using-the-command-line)" diff --git a/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-locally-hosted-code-to-github.md b/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-locally-hosted-code-to-github.md new file mode 100644 index 000000000000..1087e2455cda --- /dev/null +++ b/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-locally-hosted-code-to-github.md @@ -0,0 +1,162 @@ +--- +title: Adding locally hosted code to GitHub +intro: 'Learn how to add existing source code or repositories to {% data variables.product.product_name %} from the command line using {% data variables.product.prodname_cli %} or Git Commands. Then, share your code and invite others to work with you.' +redirect_from: + - /articles/add-an-existing-project-to-github + - /articles/adding-an-existing-project-to-github-using-the-command-line + - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /github/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line + - /get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line +versions: + fpt: '*' + ghes: '*' + ghae: '*' + ghec: '*' +shortTitle: Add locally hosted code +--- + +## About adding existing source code to {% data variables.product.product_name %} + +If you have existing source code or repositories stored locally on your computer or private network you can add them to {% data variables.product.product_name %} by typing commands in a terminal. You can do this by typing Git commands directly, or by using {% data variables.product.prodname_cli %}. + +{% data variables.product.prodname_cli %} 是用于从计算机的命令行使用 {% data variables.product.prodname_dotcom %} 的开源工具。 {% data variables.product.prodname_cli %} 可以简化使用命令行将现有项目添加到 {% data variables.product.product_name %} 的过程。 要了解有关 {% data variables.product.prodname_cli %} 的更多信息，请参阅“[关于 {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)”。 + +{% tip %} + +**提示：**如果您最喜欢点按式用户界面，请尝试使用 {% data variables.product.prodname_desktop %} 添加项目。 更多信息请参阅 *{% data variables.product.prodname_desktop %} 帮助*中的“[从本地计算机添加仓库到 GitHub Desktop](/desktop/guides/contributing-to-projects/adding-a-repository-from-your-local-computer-to-github-desktop)”。 + +{% endtip %} + +{% data reusables.repositories.sensitive-info-warning %} + +## Adding a local repository to {% data variables.product.product_name %} with {% data variables.product.prodname_cli %} + +1. 在命令行中，导航到项目的根目录。 +1. 将本地目录初始化为 Git 仓库。 + + ```shell + git init -b main + ``` + +1. Stage and commit all the files in your project + + ```shell + git add . && git commit -m "initial commit" + ``` + +1. To create a repository for your project on GitHub, use the `gh repo create` subcommand. When prompted, select **Push an existing local repository to GitHub** and enter the desired name for your repository. If you want your project to belong to an organization instead of your user account, specify the organization name and project name with `organization-name/project-name`. + +1. 按照交互式提示进行操作。 To add the remote and push the repository, confirm yes when asked to add the remote and push the commits to the current branch. + +1. Alternatively, to skip all the prompts, supply the path to the repository with the `--source` flag and pass a visibility flag (`--public`, `--private`, or `--internal`). For example, `gh repo create --source=. --public`. Specify a remote with the `--remote` flag. To push your commits, pass the `--push` flag. 有关可能的参数的详细信息，请参阅 [GitHub CLI 手册](https://cli.github.com/manual/gh_repo_create)。 + +## Adding a local repository to {% data variables.product.product_name %} using Git + +{% mac %} + +1. 在 {% data variables.product.product_location %} 上[创建新仓库](/repositories/creating-and-managing-repositories/creating-a-new-repository) 为避免错误，请勿使用*自述文件*、许可或 `gitignore` 文件初始化新仓库。 您可以在项目推送到 {% data variables.product.product_name %} 之后添加这些文件。 ![创建新仓库下拉列表](/assets/images/help/repository/repo-create.png) +{% data reusables.command_line.open_the_multi_os_terminal %} +3. 将当前工作目录更改为您的本地仓库。 +4. 将本地目录初始化为 Git 仓库。 + ```shell + $ git init -b main + ``` +5. 在新的本地仓库中添加文件。 这会暂存它们用于第一次提交。 + ```shell + $ git add . + # Adds the files in the local repository and stages them for commit. {% data reusables.git.unstage-codeblock %} + ``` +6. 提交暂存在本地仓库中的文件。 + ```shell + $ git commit -m "First commit" + # Commits the tracked changes and prepares them to be pushed to a remote repository. {% data reusables.git.reset-head-to-previous-commit-codeblock %} + ``` +7. 在仓库顶部 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 的快速设置页面，点击 {% octicon "clippy" aria-label="The copy to clipboard icon" %} 以复制远程仓库 URL。 ![创建远程仓库 URL 字段](/assets/images/help/repository/copy-remote-repository-url-quick-setup.png) +8. 在终端上，[添加远程仓库的 URL](/github/getting-started-with-github/managing-remote-repositories)（将在该 URL 推送本地仓库）。 + ```shell + $ git remote add origin <REMOTE_URL> + # Sets the new remote + $ git remote -v + # Verifies the new remote URL + ``` +9. [推送更改](/github/getting-started-with-github/pushing-commits-to-a-remote-repository/)（本地仓库中）到 {% data variables.product.product_location %}。 + ```shell + $ git push -u origin main + # Pushes the changes in your local repository up to the remote repository you specified as the origin + ``` + +{% endmac %} + +{% windows %} + +1. 在 {% data variables.product.product_location %} 上[创建新仓库](/articles/creating-a-new-repository) 为避免错误，请勿使用*自述文件*、许可或 `gitignore` 文件初始化新仓库。 您可以在项目推送到 {% data variables.product.product_name %} 之后添加这些文件。 ![创建新仓库下拉列表](/assets/images/help/repository/repo-create.png) +{% data reusables.command_line.open_the_multi_os_terminal %} +3. 将当前工作目录更改为您的本地仓库。 +4. 将本地目录初始化为 Git 仓库。 + ```shell + $ git init -b main + ``` +5. 在新的本地仓库中添加文件。 这会暂存它们用于第一次提交。 + ```shell + $ git add . + # Adds the files in the local repository and stages them for commit. {% data reusables.git.unstage-codeblock %} + ``` +6. 提交暂存在本地仓库中的文件。 + ```shell + $ git commit -m "First commit" + # Commits the tracked changes and prepares them to be pushed to a remote repository. {% data reusables.git.reset-head-to-previous-commit-codeblock %} + ``` +7. 在仓库顶部 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 的快速设置页面，点击 {% octicon "clippy" aria-label="The copy to clipboard icon" %} 以复制远程仓库 URL。 ![创建远程仓库 URL 字段](/assets/images/help/repository/copy-remote-repository-url-quick-setup.png) +8. 在命令提示中，[添加远程仓库的 URL](/github/getting-started-with-github/managing-remote-repositories)（将在该 URL 推送本地仓库）。 + ```shell + $ git remote add origin <REMOTE_URL> + # Sets the new remote + $ git remote -v + # Verifies the new remote URL + ``` +9. [推送更改](/github/getting-started-with-github/pushing-commits-to-a-remote-repository/)（本地仓库中）到 {% data variables.product.product_location %}。 + ```shell + $ git push origin main + # Pushes the changes in your local repository up to the remote repository you specified as the origin + ``` + +{% endwindows %} + +{% linux %} + +1. 在 {% data variables.product.product_location %} 上[创建新仓库](/articles/creating-a-new-repository) 为避免错误，请勿使用*自述文件*、许可或 `gitignore` 文件初始化新仓库。 您可以在项目推送到 {% data variables.product.product_name %} 之后添加这些文件。 ![创建新仓库下拉列表](/assets/images/help/repository/repo-create.png) +{% data reusables.command_line.open_the_multi_os_terminal %} +3. 将当前工作目录更改为您的本地仓库。 +4. 将本地目录初始化为 Git 仓库。 + ```shell + $ git init -b main + ``` +5. 在新的本地仓库中添加文件。 这会暂存它们用于第一次提交。 + ```shell + $ git add . + # Adds the files in the local repository and stages them for commit. {% data reusables.git.unstage-codeblock %} + ``` +6. 提交暂存在本地仓库中的文件。 + ```shell + $ git commit -m "First commit" + # Commits the tracked changes and prepares them to be pushed to a remote repository. {% data reusables.git.reset-head-to-previous-commit-codeblock %} + ``` +7. 在仓库顶部 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 的快速设置页面，点击 {% octicon "clippy" aria-label="The copy to clipboard icon" %} 以复制远程仓库 URL。 ![创建远程仓库 URL 字段](/assets/images/help/repository/copy-remote-repository-url-quick-setup.png) +8. 在终端上，[添加远程仓库的 URL](/github/getting-started-with-github/managing-remote-repositories)（将在该 URL 推送本地仓库）。 + ```shell + $ git remote add origin <REMOTE_URL> + # Sets the new remote + $ git remote -v + # Verifies the new remote URL + ``` +9. [推送更改](/github/getting-started-with-github/pushing-commits-to-a-remote-repository/)（本地仓库中）到 {% data variables.product.product_location %}。 + ```shell + $ git push origin main + # Pushes the changes in your local repository up to the remote repository you specified as the origin + ``` + +{% endlinux %} + +## 延伸阅读 + +- "[添加文件到仓库](/repositories/working-with-files/managing-files/adding-a-file-to-a-repository#adding-a-file-to-a-repository-using-the-command-line)" diff --git a/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/index.md b/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/index.md index 6796ee253627..6cb0f9b61e85 100644 --- a/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/index.md +++ b/translations/zh-CN/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/index.md @@ -18,7 +18,7 @@ children: - /importing-a-repository-with-github-importer - /updating-commit-author-attribution-with-github-importer - /importing-a-git-repository-using-the-command-line - - /adding-an-existing-project-to-github-using-the-command-line + - /adding-locally-hosted-code-to-github - /source-code-migration-tools shortTitle: 导入代码到 GitHub --- diff --git a/translations/zh-CN/content/github-cli/github-cli/using-github-cli-extensions.md b/translations/zh-CN/content/github-cli/github-cli/using-github-cli-extensions.md index f273e5faf927..2584cf2a528a 100644 --- a/translations/zh-CN/content/github-cli/github-cli/using-github-cli-extensions.md +++ b/translations/zh-CN/content/github-cli/github-cli/using-github-cli-extensions.md @@ -28,43 +28,43 @@ topics: ## 安装扩展 -要安装扩展，请使用 `extensions install` 子命令。 将 `repo` 参数替换为扩展的存储库。 You can use the full URL, such as `https://github.com/octocat/gh-whoami`, or just the owner and repository, such as `octocat/gh-whoami`. +要安装扩展，请使用 `extensions install` 子命令。 将 `repo` 参数替换为扩展的存储库。 您可以使用完整的URL，例如 `https://github.com/octocat/gh-whoami`，也可以仅使用所有者和存储库，例如 `octocat/gh-whoami`。 -If the owner and repository are used, `gh` will install the extension using the hostname to which `gh` is currently authenticated. The full URL format is useful when installing extensions from a different host. For example, users on {% data variables.product.prodname_ghe_server %} should use the full repository URL to install extensions from {% data variables.product.prodname_dotcom_the_website %} or any other host. +如果使用所有者和存储库，`gh` 将使用当前向 `gh` 验证的主机名安装扩展。 从其他主机安装扩展时，完整的 URL 格式非常有用。 例如， {% data variables.product.prodname_ghe_server %} 上的用户应使用完整存储库 URL 从 {% data variables.product.prodname_dotcom_the_website %} 或任何其他主机安装扩展。 -To install an extension in development from the current directory, use `.` as the value for the `repo` parameter. +要从当前目录安装开发中的扩展，请使用 `.` 作为 `repo` 参数的值。 ```shell gh extension install repo ``` -If you already have an extension by the same name installed, the command will fail. For example, if you have installed `octocat/gh-whoami`, you must uninstall it before installing `hubot/gh-whoami`. +如果已安装同名的扩展，则该命令将失败。 例如，如果您已经安装了 `octocat/gh-whoami`，则必须先将其卸载，然后再安装 `hubot/gh-whoami`。 -## Viewing installed extensions +## 查看已安装的扩展 -To view all installed extensions, use the `extensions list` subcommand. The output will also tell you which extensions have updates available. +要查看所有已安装的扩展，请使用 `extensions list` 子命令。 输出还将告诉您哪些扩展具有可用的更新。 ```shell gh extension list ``` -## Updating extensions +## 更新扩展 -To update an extension, use the `extensions upgrade` subcommand. Replace the `extension` parameter with the name of the extension. +要更新扩展，请使用 `extensions upgrade` 子命令。 将 `extension` 参数替换为扩展的名称。 ```shell gh extension upgrade extension ``` -To update all installed extensions, use the `--all` flag. +要更新所有已安装的扩展，请使用 `--all` 标志。 ```shell gh extension upgrade --all ``` -## Uninstalling extensions +## 卸载扩展 -To uninstall an extension, use the `extensions remove` subcommand. Replace the `extension` parameter with the name of the extension. +要卸载扩展，请使用 `extensions remove` 子命令。 将 `extension` 参数替换为扩展的名称。 ```shell gh extension remove extension diff --git a/translations/zh-CN/content/index.md b/translations/zh-CN/content/index.md index 168eab5cc98e..0ed4ae2fb8eb 100644 --- a/translations/zh-CN/content/index.md +++ b/translations/zh-CN/content/index.md @@ -9,7 +9,7 @@ featuredLinks: popular: - /pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests - /authentication - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-locally-hosted-code-to-github - /get-started/getting-started-with-git/managing-remote-repositories - /pages versions: '*' diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/about-projects.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/about-projects.md index 5c5ebf74cf3a..dfc8ab465684 100644 --- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/about-projects.md +++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/about-projects.md @@ -29,7 +29,7 @@ topics: - 跟踪任务复杂性的数字字段 - 跟踪任务是低、中还是高优先级的单个选择字段 - 添加快速说明的文本字段 -- 用于每周规划工作的迭代字段 +- 用于每周计划工作的迭代字段，包括对休息时间的支持 ### 从不同的角度查看您的项目 diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md index 34b798f1b357..89d5e3b6ae67 100644 --- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md +++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md @@ -75,7 +75,7 @@ topics: 利用各种字段类型来满足您的需求。 -使用迭代字段可以安排工作或创建日程表。 您可以按迭代进行分组以查看项目在迭代之间是否平衡，也可以进行筛选以专注于单个迭代。 迭代字段还允许您查看在过去迭代中完成的工作，这有助于快速规划和反映团队的成就。 +使用迭代字段可以安排工作或创建日程表。 您可以按迭代进行分组以查看项目在迭代之间是否平衡，也可以进行筛选以专注于单个迭代。 迭代字段还允许您查看在过去迭代中完成的工作，这有助于快速规划和反映团队的成就。 迭代字段还支持休息，以显示您和您的团队何时从迭代中抽出时间。 更多信息请参阅“[管理项目中的迭代](/issues/trying-out-the-new-projects-experience/managing-iterations)”。 使用单选字段可以根据预设的值列表跟踪有关任务的信息。 例如，跟踪优先级或项目阶段。 由于这些值是从预设列表中选择的，因此您可以轻松地对值进行分组或筛选，以将焦点放在具有特定值的项目上。 diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md index 887dcce2d18d..abbc64160288 100644 --- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md +++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md @@ -131,7 +131,7 @@ topics: - 数字：值必须是数字。 - 日期：值必须是日期。 - 单选：必须从一组指定的值中选择值。 -- 迭代：必须从一组日期范围（迭代）中选择值。 过去的迭代将自动标记为“已完成”，覆盖当前日期范围的迭代将标记为“当前”。 +- 迭代：必须从一组日期范围（迭代）中选择值。 过去的迭代将自动标记为“已完成”，覆盖当前日期范围的迭代将标记为“当前”。 更多信息请参阅“[管理项目中的迭代](/issues/trying-out-the-new-projects-experience/managing-iterations)”。 1. {% data reusables.projects.open-command-palette %} 开始输入 "Create new field" 的任何部分。 当 "Create new field" 显示在命令板中时，选择它。 2. 或者，单击最右侧字段标题中的 {% octicon "plus" aria-label="the plus icon" %} 。 将显示带有项目字段的下拉菜单。 单击 **New field（新建字段）**。 @@ -146,7 +146,9 @@ topics: {% data reusables.projects.project-settings %} 1. 在 **Fields（字段）**下，选择要编辑的字段。 1. 对于单选字段，您可以添加、删除或重新排序选项。 -2. 对于迭代字段，您可以添加或删除迭代、更改迭代名称以及更改迭代的开始日期和持续时间。 +1. 对于迭代字段，您可以添加或删除迭代、更改迭代名称以及更改迭代的开始日期和持续时间。 + + 有关修改迭代字段的详细信息，请参阅“[管理项目中的迭代](/issues/trying-out-the-new-projects-experience/managing-iterations)”。 ## 自定义视图 diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md index e6cf5b76161c..ed682be34a53 100644 --- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md +++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md @@ -125,12 +125,7 @@ topics: 点击表格顶部的 {% octicon "filter" aria-label="the filter icon" %} 以显示“Filter by keyword or by field（按关键字或字段过滤）”列。 开始键入要过滤的字段名称和值。 当您输入时，可能的值将会出现。 -- 要过滤多个值，请用逗号分隔值。 例如， `label:"good first issue",bug` 将列出标签为 `good first issue` 或 `bug` 的所有议题。 -- 要过滤缺少特定值的字段，请在过滤器之前加入 `-`。 例如， `-label:"bug"` 只会显示没有标签的 `bug` 的项。 -- 要过滤缺少所有值的字段, 请输入 `no:`，后接字段名称。 例如，`no:assignee` 仅显示没有受理人的项。 -- 要按状态过滤，请输入 `is:`。 例如 `is: issue` 或 `is:open`。 -- 多个过滤条件之间用逗号分隔。 例如，`status:"In progress" -label:"bug" no:assignee` 仅显示状态为 `In progress`、没有标签 `bug` 且没有受理人的项。 -- 要过滤迭代字段的当前迭代，请使用 `@current`。 例如 `sprint:@current`。 +{% data reusables.projects.projects-filters %} 或者，使用命令面板。 @@ -141,6 +136,8 @@ topics: 在板布局中，您可以单击项目数据以过滤具有该值的项。 例如，单击某个受理人以仅显示该受理人的项。 要移除过滤器，请再次单击项数据。 +更多信息请参阅“[筛选项目](/issues/trying-out-the-new-projects-experience/filtering-projects)”。 + ## 创建项目视图 项目视图允许您快速查看项目的特定方面。 每个视图都显示在项目中单独的选项卡上。 diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/filtering-projects.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/filtering-projects.md new file mode 100644 index 000000000000..16f9fc236b95 --- /dev/null +++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/filtering-projects.md @@ -0,0 +1,26 @@ +--- +title: Filtering projects (beta) +intro: You can filter your projects to focus on specific information. +allowTitleToDifferFromFilename: true +miniTocMaxHeadingLevel: 2 +versions: + fpt: '*' + ghec: '*' +topics: + - Projects + - Organizations +--- + +{% data reusables.projects.projects-beta %} + +## About filtering projects + +You can customize views using filters for item metadata, such as assignees and the labels applied to issues, and by the fields in your project. You can combine filters and save them as views. 更多信息请参阅“[自定义项目视图](/issues/trying-out-the-new-projects-experience/customizing-your-project-views)”。 + +To filter a project, click {% octicon "filter" aria-label="The Filter icon" %} and start typing the fields and values you would like to filter for. 当您输入时，可能的值将会出现。 You can also open the command pallet and type "Filter by" to choose from the available filters. + +The same filters are available for insights, allowing you to filter the data used to create your charts. For more information, see "[Using insights with projects](/issues/trying-out-the-new-projects-experience/using-insights-with-projects)." + +## Syntax for filtering projects + +{% data reusables.projects.projects-filters %} diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/index.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/index.md index 688f963b465c..10c16d1c9d36 100644 --- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/index.md +++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/index.md @@ -12,11 +12,14 @@ children: - /about-projects - /quickstart - /creating-a-project + - /managing-iterations - /customizing-your-project-views + - /filtering-projects - /using-the-api-to-manage-projects - /automating-projects - /managing-the-visibility-of-your-projects - /managing-access-to-projects + - /using-insights-with-projects - /best-practices-for-managing-projects --- diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/managing-iterations.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/managing-iterations.md new file mode 100644 index 000000000000..fac2745fb953 --- /dev/null +++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/managing-iterations.md @@ -0,0 +1,64 @@ +--- +title: Managing iterations in projects (beta) +intro: You can create iterations to plan upcoming work and group items. +allowTitleToDifferFromFilename: true +miniTocMaxHeadingLevel: 2 +versions: + fpt: '*' + ghec: '*' +topics: + - Projects + - Organizations +--- + +{% data reusables.projects.projects-beta %} + +## About iterations + +You can create an iteration field to associate items with specific repeating blocks of time. Iterations can be set to any length of time, can include breaks, and can be individually edited to modify name and date range. With projects, you can group by iteration to visualize the balance of upcoming work, use filters to focus on a single iteration, and sort by iteration. + +When you first create an iteration field, three iterations are automatically created. You can add additional iterations and make other changes on your project's settings page. + +![Screenshot showing the settings for an iteration field](/assets/images/help/issues/iterations-example.png) + +## Creating an iteration field + +You can create an iteration field using the command palette or the project's interface. + +1. {% data reusables.projects.open-command-palette %} 开始输入 "Create new field" 的任何部分。 当 "Create new field" 显示在命令板中时，选择它。 + + 或者，单击最右侧字段标题中的 {% octicon "plus" aria-label="the plus icon" %} 。 将显示带有项目字段的下拉菜单。 单击 **New field（新建字段）**。 +1. In the text box, enter a name for the new iteration field. +1. Select the dropdown menu below and click **Iteration**. +1. Optionally, if you want to change the starting date from the current day, select the calendar dropdown next to "Starts on" and click on a new starting date. +2. To change the duration of each iteration, type a new number, then select the dropdown and click either **days** or **weeks**. +3. Click **Save & create**. + +## Adding new iterations + +{% data reusables.projects.project-settings %} +1. Click the name of the iteration field you want to adjust. +1. To add a new iteration of the same duration, click **Add iteration**. +1. Optionally, to customize the duration of the new iteration and when it will start, click {% octicon "triangle-down" aria-label="The triangle icon" %} next to "Add iteration", select a starting date and duration, and click **Add**. +1. 单击 **Save changes（保存更改）**。 + +## Editing an iteration + +You can edit iterations in your project settings. You can also access the settings for an iteration field by clicking {% octicon "triangle-down" aria-label="The triangle icon" %} in the table header for the field and clicking **Edit values**. + +{% data reusables.projects.project-settings %} +1. Click the name of the iteration field you want to adjust. +1. To change the name of an iteration, click on the name and start typing. +1. To change the date or duration of an iteration, click on the date to open the calendar. Click on the start day, then click the end day, and then click **Apply**. +1. Optionally, to delete an iteration, click {% octicon "trash" aria-label="The trash icon" %}. +1. 单击 **Save changes（保存更改）**。 + +## Inserting a break + +You can insert breaks into your iterations to communicate when you are taking time away from scheduled work. The duration of a new break defaults to the length of the most recently created iteration. + +{% data reusables.projects.project-settings %} +1. Click the name of the iteration field you want to adjust. +2. On the dividing line above an iteration and to the right, click **Insert break**. ![Screenshot showing location of "Insert break" button](/assets/images/help/issues/iteration-insert-break.png) +3. Optionally, to change the duration of the break, click on the date to open the calendar. Click on the start day, then click the end day, and then click **Apply**. +4. 单击 **Save changes（保存更改）**。 diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md new file mode 100644 index 000000000000..0659935a0637 --- /dev/null +++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md @@ -0,0 +1,29 @@ +--- +title: Using insights with projects (beta) +intro: You can view and customize charts that are built from your project's data. +allowTitleToDifferFromFilename: true +miniTocMaxHeadingLevel: 2 +versions: + fpt: '*' + ghec: '*' +topics: + - Projects + - Organizations +--- + +{% data reusables.projects.insights-alpha %} + +## About insights + +You can use insights to view and customize charts that use the items added to your project as their source data. The default "Burn up" chart shows item status over time, allowing you to visualize progress. You can apply filters to the default chart and also customize and save charts that are available to everyone that can view the project. + +![Screenshot showing an example of the default burn up chart for the current iteration](/assets/images/help/issues/burnup-example.png) + +## Creating a chart + +1. Navigate to your project. +2. In the top-right, click {% octicon "graph" aria-label="the graph icon" %} to access insights. This feature is currently in a private preview and is not yet available to all organizations. If insights is not yet enabled for your organization, the {% octicon "graph" aria-label="the graph icon" %} icon will not be available. +3. In the menu on the left, click **New chart**. +4. Optionally, to change the name of the new chart, click {% octicon "triangle-down" aria-label="The triangle icon" %}, type a new name, and press Return. +5. Above the chart, type filters to change the data used to build the chart. 更多信息请参阅“[筛选项目](/issues/trying-out-the-new-projects-experience/filtering-projects)”。 +6. To the right of the filter text box, click **Save changes**. diff --git a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md index 7ebee46c59e7..7e865585b732 100644 --- a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md +++ b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md @@ -1,26 +1,31 @@ --- title: 管理组织允许的 IP 地址 intro: You can restrict access to your organization's private assets by configuring a list of IP addresses that are allowed to connect. -product: '{% data reusables.gated-features.allowed-ip-addresses %}' redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization - /organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization versions: - fpt: '*' ghae: '*' ghec: '*' topics: - Organizations - Teams shortTitle: 管理允许的 IP 地址 +permissions: Organization owners can manage allowed IP addresses for an organization. --- -组织所有者可以管理组织允许的 IP 地址。 - ## 关于允许的 IP 地址 You can restrict access to private organization assets by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %} +{% ifversion ghec %} +{% note %} + +**Note:** Only organizations that use {% data variables.product.prodname_ghe_cloud %} can use IP allow lists. {% data reusables.enterprise.link-to-ghec-trial %} + +{% endnote %} +{% endif %} + {% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %} {% data reusables.identity-and-permissions.ip-allow-lists-enable %} diff --git a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md index b2db7c4e2325..842b65165cc9 100644 --- a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md +++ b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md @@ -52,9 +52,9 @@ The audit log lists events triggered by activities that affect your organization | [`discussion_post_reply`](#discussion_post_reply-category-actions) | 包含与发布到团队页面的讨论回复相关的所有活动。{% ifversion fpt or ghes or ghec %} | [`企业`](#enterprise-category-actions) | 包含与企业设置相关的活动。 |{% endif %} | [`挂钩`](#hook-category-actions) | 包含与 web 挂钩相关的所有活动。 | -| [`integration_installation_request`](#integration_installation_request-category-actions) | 包含与组织成员请求所有者批准用于组织的集成相关的所有活动。 | -| [`ip_allow_list`](#ip_allow_list) | Contains activities related to enabling or disabling the IP allow list for an organization. | -| [`ip_allow_list_entry`](#ip_allow_list_entry) | Contains activities related to the creation, deletion, and editing of an IP allow list entry for an organization. | +| [`integration_installation_request`](#integration_installation_request-category-actions) | 包含与组织成员请求所有者批准用于组织的集成相关的所有活动。 |{% ifversion ghec or ghae %} +| [`ip_allow_list`](#ip_allow_list-category-actions) | Contains activities related to enabling or disabling the IP allow list for an organization. | +| [`ip_allow_list_entry`](#ip_allow_list_entry-category-actions) | Contains activities related to the creation, deletion, and editing of an IP allow list entry for an organization.{% endif %} | [`议题`](#issue-category-actions) | 包含与删除议题相关的活动。 |{% ifversion fpt or ghec %} | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | 包含与签署 {% data variables.product.prodname_marketplace %} 开发者协议相关的所有活动。 | | [`marketplace_listing`](#marketplace_listing-category-actions) | 包含与在 {% data variables.product.prodname_marketplace %} 中上架应用程序相关的所有活动。{% endif %}{% ifversion fpt or ghes or ghec %} @@ -361,6 +361,7 @@ By default, only events from the past three months are returned. To include olde | `create` | 当组织成员请求组织所有者安装集成以用于组织时触发。 | | `close` | 当安装集成以用于组织的请求被组织所有者批准或拒绝，或者被提出请求的组成成员取消时触发。 | +{% ifversion ghec or ghae %} ### `ip_allow_list` 类操作 | 操作 | 描述 | @@ -377,6 +378,7 @@ By default, only events from the past three months are returned. To include olde | `create` | IP 地址添加到 IP 允许列表中时触发。 | | `update` | Triggered when an IP address or its description was changed. | | `destroy` | Triggered when an IP address was deleted from an IP allow list. | +{% endif %} ### `issue` 类操作 diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md index 91970401f2e8..f138e86d3219 100644 --- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md +++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md @@ -22,7 +22,11 @@ permissions: People with admin access to a repository can add an outside collabo {% data reusables.organizations.outside-collaborators-use-seats %} +{% ifversion fpt %} +使用 {% data variables.product.prodname_ghe_cloud %} 的组织可以限制邀请协作者的能力。 更多信息请参阅 {% data variables.product.prodname_ghe_cloud %} 文档中的“[设置添加外部协作者的权限](/enterprise-cloud@latest/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)”。 +{% else %} 组织所有者可以限制邀请协作者的能力。 更多信息请参阅“[设置添加外部协作者的权限](/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)”。. +{% endif %} {% ifversion ghes %} 要将某人添加为仓库的外部协作者，此人必须在 {% data variables.product.product_location %} 上拥有用户帐户。 如果您的企业使用外部身份验证系统（如 SAML 或 LDAP），则要添加的人员必须通过该系统登录才能创建帐户。 如果此人无权访问身份验证系统，并且为您的企业启用了内置身份验证，则站点管理员可以为该人员创建用户帐户。 更多信息请参阅“[使用内置身份验证](/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-built-in-authentication#inviting-users)”。 @@ -32,10 +36,6 @@ permissions: People with admin access to a repository can add an outside collabo 如果您的组织需要双重身份验证，则在接受您的邀请以在仓库上进行协作之前，所有外部协作者都必须启用双重身份验证。 更多信息请参阅“[您的组织中需要双重身份验证](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/requiring-two-factor-authentication-in-your-organization)”。 {% endif %} -{% ifversion fpt %} -为了进一步支持团队的协作能力，您可以升级到 {% data variables.product.prodname_ghe_cloud %}，其中包括受保护的分支机构和私有仓库的代码所有者等功能。 {% data reusables.enterprise.link-to-ghec-trial %} -{% endif %} - ## 添加外部协作者到仓库 {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %} diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md index a2b45ad24af0..ef6e7adb8e1b 100644 --- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md +++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md @@ -1,6 +1,6 @@ --- title: 查看具有仓库访问权限的人员 -intro: '组织所有者可以查看人员对组织内仓库的访问权限。 使用 {% data variables.product.prodname_ghe_cloud %} 或 {% data variables.product.prodname_ghe_server %} 的组织所有者还可导出具有仓库访问权限人员的 CSV 列表。' +intro: '您可以查看{% ifversion ghec or ghes or ghae %} 和导出{% endif %} 拥有组织内仓库访问权限的人员列表。' redirect_from: - /articles/viewing-people-with-access-to-your-repository - /github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository @@ -13,9 +13,17 @@ topics: - Organizations - Teams shortTitle: 查看有访问权限的人 +permissions: Organization owners can view people with access to a repository. --- -管理员可以使用此信息帮助非内部人员，收集数据用于合规性以及其他常规安全检查。 +## 关于有权访问您的存储库的人员列表 + +您可以使用此信息来帮助离职人员、收集合规性数据以及其他常规安全检查。 + +{% ifversion fpt %} +使用 {% data variables.product.prodname_ghe_cloud %} 的组织还可以导出有权访问存储库的人员的 CSV 列表。 更多信息请参阅 [{% data variables.product.prodname_ghe_cloud %} 文档](/enterprise-cloud@latest/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository)。 +{% endif %} + {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %} ![访问权限管理概览](/assets/images/help/repository/manage-access-overview.png) {% else %} @@ -30,11 +38,20 @@ shortTitle: 查看有访问权限的人 {% data reusables.repositories.accessing-repository-graphs %} {% data reusables.repositories.accessing-repository-people %} {% endif %} + +{% ifversion ghec or ghes or ghae %} ## 导出具有您的仓库访问权限人员的列表 -{% data variables.product.prodname_ghe_cloud %} 或 {% data variables.product.prodname_ghe_server %} 上的组织所有者可以导出具有仓库访问权限人员的 CSV 列表。 +{% ifversion ghec %} +{% note %} + +**注意：** 只有使用 {% data variables.product.prodname_ghe_cloud %} 的组织才能导出有权访问存储库的人员列表。 {% data reusables.enterprise.link-to-ghec-trial %} + +{% endnote %} +{% endif %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.accessing-repository-graphs %} {% data reusables.repositories.accessing-repository-people %} 4. 单击 **Export CSV（导出 CSV）**。 ![仓库边栏中的人员选项卡](/assets/images/help/repository/export-repository-permissions.png) +{% endif %} diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md b/translations/zh-CN/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md index 2291a3aca72e..90c99a680be4 100644 --- a/translations/zh-CN/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md +++ b/translations/zh-CN/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md @@ -1,13 +1,11 @@ --- title: 设置添加外部协作者的权限 intro: 为了保护组织的数据和组织中使用的付费许可数，您可以只允许所有者邀请外部协作者加入组织仓库。 -product: '{% data reusables.gated-features.restrict-add-collaborator %}' redirect_from: - /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories - /articles/setting-permissions-for-adding-outside-collaborators - /github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators versions: - fpt: '*' ghes: '*' ghae: '*' ghec: '*' @@ -17,7 +15,16 @@ topics: shortTitle: 设置协作者策略 --- -组织所有者和具有仓库管理员权限的成员可以邀请外部协作者处理仓库。 您还可以将外部协作者邀请权限仅限于组织所有者。 +默认情况下，对存储库具有管理员访问权限的任何人都可以邀请外部协作者处理存储库。 您可以选择将邀请外部协作者的能力限制为仅邀请组织所有者。 + + +{% ifversion ghec %} +{% note %} + +**注意：** 只有使用 {% data variables.product.prodname_ghe_cloud %} 的组织才能限制向组织所有者邀请外部协作者的能力。 {% data reusables.enterprise.link-to-ghec-trial %} + +{% endnote %} +{% endif %} {% data reusables.organizations.outside-collaborators-use-seats %} diff --git a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md index 2702276a40cb..b3152f71bbbc 100644 --- a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md +++ b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md @@ -75,66 +75,67 @@ If your organization has a security team, you can use the security manager role {% ifversion fpt or ghec %} -| Organization permission | 所有者 | 成员 | 帐单管理员 | Security managers | -|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:-----:|:-----:|:---------------------------:| -| 创建仓库（详细信息请参阅“[限制在组织中创建仓库](/articles/restricting-repository-creation-in-your-organization)”） | **X** | **X** | | **X** | -| 查看和编辑帐单信息 | **X** | | **X** | | -| 邀请人员加入组织 | **X** | | | | -| 编辑和取消邀请加入组织 | **X** | | | | -| 从组织删除成员 | **X** | | | | -| 恢复组织的前成员 | **X** | | | | -| 添加和删除**所有团队**的人员 | **X** | | | | -| 将组织成员升级为*团队维护员* | **X** | | | | -| 配置代码审查分配（请参阅“[管理团队的代码审查分配](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)”） | **X** | | | | -| 设置预定提醒（请参阅“[管理拉取请求的预定提醒](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests)”） | **X** | | | | -| 添加协作者到**所有仓库** | **X** | | | | -| 访问组织审核日志 | **X** | | | | -| 编辑组织的资料页面（详细信息请参阅“[关于组织的资料](/github/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile)”） | **X** | | | | -| 验证组织的域（详细信息请参阅“[验证组织的域](/articles/verifying-your-organization-s-domain)”） | **X** | | | | -| 将电子邮件通知限于已经验证或批准的域名（有关详细信息，请参阅“[限制组织的电子邮件通知](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)”） | **X** | | | | -| 删除**所有团队** | **X** | | | | -| 删除组织帐户，包括所有仓库 | **X** | | | | -| 创建团队（详细信息请参阅“[在组织中设置团队创建权限](/articles/setting-team-creation-permissions-in-your-organization)”） | **X** | **X** | | **X** | -| [在组织的层次结构中移动团队](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | | -| 创建项目板（详细信息请参阅“[组织的项目板权限](/articles/project-board-permissions-for-an-organization)”） | **X** | **X** | | **X** | -| 查看所有组织成员和团队 | **X** | **X** | | **X** | -| @提及任何可见团队 | **X** | **X** | | **X** | -| 可成为*团队维护员* | **X** | **X** | | **X** | -| 查看组织洞见（详细信息请参阅“[查看用于组织的洞见](/articles/viewing-insights-for-your-organization)”） | **X** | **X** | | **X** | -| 查看并发布公共团队讨论到**所有团队**（详细信息请参阅“[关于团队讨论](/organizations/collaborating-with-your-team/about-team-discussions)”） | **X** | **X** | | **X** | -| 查看并发布私有团队讨论到**所有团队**（详细信息请参阅“[关于团队讨论](/organizations/collaborating-with-your-team/about-team-discussions)”） | **X** | | | | -| 编辑和删除**所有团队**的团队讨论（详细信息请参阅“[管理破坏性评论](/communities/moderating-comments-and-conversations/managing-disruptive-comments)”） | **X** | | | | -| 隐藏对提交、拉取请求和议题的评论（详细信息请参阅“[管理破坏性评论](/communities/moderating-comments-and-conversations/managing-disruptive-comments/#hiding-a-comment)”） | **X** | **X** | | **X** | -| 对组织禁用团队讨论（详细信息请参阅“[对组织禁用团队讨论](/articles/disabling-team-discussions-for-your-organization)”） | **X** | | | | -| 管理组织依赖项洞见的显示（详细信息请参阅“[更改组织依赖项洞见的可见性](/articles/changing-the-visibility-of-your-organizations-dependency-insights)”） | **X** | | | | -| 设置**所有团队**的团队头像（详细信息请参阅“[设置团队的头像](/articles/setting-your-team-s-profile-picture)”） | **X** | | | | -| 赞助帐户和管理组织的赞助（更多信息请参阅“[赞助开源贡献者](/sponsors/sponsoring-open-source-contributors)”） | **X** | | **X** | **X** | -| 管理赞助帐户的电子邮件更新（更多信息请参阅“[管理组织赞助帐户的更新](/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors)”） | **X** | | | | -| 将您的赞助归因于另一个组织（更多信息请参阅“[将赞助归因于组织](/sponsors/sponsoring-open-source-contributors/attributing-sponsorships-to-your-organization)”） | **X** | | | | -| 管理从组织中的仓库发布 {% data variables.product.prodname_pages %} 站点（请参阅“[管理组织的 {% data variables.product.prodname_pages %} 站点发布](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)”了解详细信息） | **X** | | | | -| 管理安全性和分析设置（详情请参阅“[管理组织的安全性和分析设置](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)”） | **X** | | | **X** | -| View the security overview for the organization (see "[About the security overview](/code-security/security-overview/about-the-security-overview)" for details) | **X** | | | **X** |{% ifversion ghec %} -| 启用并实施 [SAML 单点登录](/articles/about-identity-and-access-management-with-saml-single-sign-on) | **X** | | | | -| [管理用户对组织的 SAML 访问](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | | -| 管理组织的 SSH 认证中心（详细信息请参阅“[管理组织的 SSH 认证中心](/articles/managing-your-organizations-ssh-certificate-authorities)”） | **X** | | | +| Organization permission | 所有者 | 成员 | 帐单管理员 | Security managers | +|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:-----:|:-----:|:-------------------------------------:| +| 创建仓库（详细信息请参阅“[限制在组织中创建仓库](/articles/restricting-repository-creation-in-your-organization)”） | **X** | **X** | | **X** | +| 查看和编辑帐单信息 | **X** | | **X** | | +| 邀请人员加入组织 | **X** | | | | +| 编辑和取消邀请加入组织 | **X** | | | | +| 从组织删除成员 | **X** | | | | +| 恢复组织的前成员 | **X** | | | | +| 添加和删除**所有团队**的人员 | **X** | | | | +| 将组织成员升级为*团队维护员* | **X** | | | | +| 配置代码审查分配（请参阅“[管理团队的代码审查分配](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)”） | **X** | | | | +| 设置预定提醒（请参阅“[管理拉取请求的预定提醒](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests)”） | **X** | | | | +| 添加协作者到**所有仓库** | **X** | | | | +| 访问组织审核日志 | **X** | | | | +| 编辑组织的资料页面（详细信息请参阅“[关于组织的资料](/github/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile)”） | **X** | | | | +| 验证组织的域（详细信息请参阅“[验证组织的域](/articles/verifying-your-organization-s-domain)”） | **X** | | | | +| 将电子邮件通知限于已经验证或批准的域名（有关详细信息，请参阅“[限制组织的电子邮件通知](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)”） | **X** | | | | +| 删除**所有团队** | **X** | | | | +| 删除组织帐户，包括所有仓库 | **X** | | | | +| 创建团队（详细信息请参阅“[在组织中设置团队创建权限](/articles/setting-team-creation-permissions-in-your-organization)”） | **X** | **X** | | **X** | +| [在组织的层次结构中移动团队](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | | +| 创建项目板（详细信息请参阅“[组织的项目板权限](/articles/project-board-permissions-for-an-organization)”） | **X** | **X** | | **X** | +| 查看所有组织成员和团队 | **X** | **X** | | **X** | +| @提及任何可见团队 | **X** | **X** | | **X** | +| 可成为*团队维护员* | **X** | **X** | | **X** | +| 查看组织洞见（详细信息请参阅“[查看用于组织的洞见](/articles/viewing-insights-for-your-organization)”） | **X** | **X** | | **X** | +| 查看并发布公共团队讨论到**所有团队**（详细信息请参阅“[关于团队讨论](/organizations/collaborating-with-your-team/about-team-discussions)”） | **X** | **X** | | **X** | +| 查看并发布私有团队讨论到**所有团队**（详细信息请参阅“[关于团队讨论](/organizations/collaborating-with-your-team/about-team-discussions)”） | **X** | | | | +| 编辑和删除**所有团队**的团队讨论（详细信息请参阅“[管理破坏性评论](/communities/moderating-comments-and-conversations/managing-disruptive-comments)”） | **X** | | | | +| 隐藏对提交、拉取请求和议题的评论（详细信息请参阅“[管理破坏性评论](/communities/moderating-comments-and-conversations/managing-disruptive-comments/#hiding-a-comment)”） | **X** | **X** | | **X** | +| 对组织禁用团队讨论（详细信息请参阅“[对组织禁用团队讨论](/articles/disabling-team-discussions-for-your-organization)”） | **X** | | | | +| 管理组织依赖项洞见的显示（详细信息请参阅“[更改组织依赖项洞见的可见性](/articles/changing-the-visibility-of-your-organizations-dependency-insights)”） | **X** | | | | +| 设置**所有团队**的团队头像（详细信息请参阅“[设置团队的头像](/articles/setting-your-team-s-profile-picture)”） | **X** | | | | +| 赞助帐户和管理组织的赞助（更多信息请参阅“[赞助开源贡献者](/sponsors/sponsoring-open-source-contributors)”） | **X** | | **X** | **X** | +| 管理赞助帐户的电子邮件更新（更多信息请参阅“[管理组织赞助帐户的更新](/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors)”） | **X** | | | | +| 将您的赞助归因于另一个组织（更多信息请参阅“[将赞助归因于组织](/sponsors/sponsoring-open-source-contributors/attributing-sponsorships-to-your-organization)”） | **X** | | | | +| 管理从组织中的仓库发布 {% data variables.product.prodname_pages %} 站点（请参阅“[管理组织的 {% data variables.product.prodname_pages %} 站点发布](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)”了解详细信息） | **X** | | | | +| 管理安全性和分析设置（详情请参阅“[管理组织的安全性和分析设置](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)”） | **X** | | | **X** | +| View the security overview for the organization (see "[About the security overview](/code-security/security-overview/about-the-security-overview)" for details) | **X** | | | **X** |{% ifversion ghec %} +| 启用并实施 [SAML 单点登录](/articles/about-identity-and-access-management-with-saml-single-sign-on) | **X** | | | | +| [管理用户对组织的 SAML 访问](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | | +| 管理组织的 SSH 认证中心（详细信息请参阅“[管理组织的 SSH 认证中心](/articles/managing-your-organizations-ssh-certificate-authorities)”） | **X** | | | {% endif %} -| 转让仓库 | **X** | | | | -| 购买、安装、管理其帐单以及取消 {% data variables.product.prodname_marketplace %} 应用程序 | **X** | | | | -| 列出 {% data variables.product.prodname_marketplace %} 中的应用程序 | **X** | | | | -| 接收所有组织仓库[关于易受攻击的依赖项的 {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) | **X** | | | **X** | -| 管理 {% data variables.product.prodname_dependabot_security_updates %}（请参阅“[关于 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)”） | **X** | | | **X** | -| [管理复刻策略](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization) | **X** | | | | -| [限制组织中公共仓库的活动](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization) | **X** | | | | -| Pull (read) *all repositories* in the organization | **X** | | | **X** | -| Push (write) and clone (copy) *all repositories* in the organization | **X** | | | | -| 将组织成员转换为[外部协作者](#outside-collaborators) | **X** | | | | -| [查看对组织仓库具有访问权限的人员](/articles/viewing-people-with-access-to-your-repository) | **X** | | | | -| [导出具有组织仓库访问权限人员的列表](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | | | -| 管理默认分支名称（请参阅“[管理组织中仓库的默认标签](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)”） | **X** | | | | -| 管理默认标签（请参阅“[管理组织中仓库的默认标签](/articles/managing-default-labels-for-repositories-in-your-organization)”） | **X** | | | |{% ifversion ghec %} -| 启用团队同步（详情请参阅“[管理组织的团队同步](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)”） | **X** | | | +| 转让仓库 | **X** | | | | +| 购买、安装、管理其帐单以及取消 {% data variables.product.prodname_marketplace %} 应用程序 | **X** | | | | +| 列出 {% data variables.product.prodname_marketplace %} 中的应用程序 | **X** | | | | +| 接收所有组织仓库[关于易受攻击的依赖项的 {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) | **X** | | | **X** | +| 管理 {% data variables.product.prodname_dependabot_security_updates %}（请参阅“[关于 {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)”） | **X** | | | **X** | +| [管理复刻策略](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization) | **X** | | | | +| [限制组织中公共仓库的活动](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization) | **X** | | | | +| Pull (read) *all repositories* in the organization | **X** | | | **X** | +| Push (write) and clone (copy) *all repositories* in the organization | **X** | | | | +| 将组织成员转换为[外部协作者](#outside-collaborators) | **X** | | | | +| [查看对组织仓库具有访问权限的人员](/articles/viewing-people-with-access-to-your-repository) | **X** | | | |{% ifversion ghec or ghes or ghae %} +| [导出具有组织仓库访问权限人员的列表](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | | {% endif %} -| Manage pull request reviews in the organization (see "[Managing pull request reviews in your organization](/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization)") | **X** | | | | +| 管理默认分支名称（请参阅“[管理组织中仓库的默认标签](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)”） | **X** | | | | +| 管理默认标签（请参阅“[管理组织中仓库的默认标签](/articles/managing-default-labels-for-repositories-in-your-organization)”） | **X** | | | |{% ifversion ghec %} +| 启用团队同步（详情请参阅“[管理组织的团队同步](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)”） | **X** | | | +{% endif %} +| Manage pull request reviews in the organization (see "[Managing pull request reviews in your organization](/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization)") | **X** | | | | {% elsif ghes > 3.2 or ghae-issue-4999 %} diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md index bd3ad9849252..dc89b7fb8715 100644 --- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md +++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md @@ -29,6 +29,8 @@ shortTitle: 查看依赖项更改 {% data reusables.dependency-review.feature-overview %} +{% ifversion ghec %}Before you can use dependency review in a private repository, you must enable the dependency graph. For more information, see "[Exploring the dependencies of a repository](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository)."{% endif %} + {% ifversion ghes > 3.1 %} Before you can use dependency review, you must enable the dependency graph and connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. 更多信息请参阅“[为 {% data variables.product.prodname_ghe_server %} 上的有漏洞依赖项启用安全警报](/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)”。{% endif %} 依赖关系审核允许您“左移”。 您可以使用所提供的预测信息在易受攻击的依赖项进入生产之前捕获它们。 更多信息请参阅“[关于依赖项审查](/code-security/supply-chain-security/about-dependency-review)”。 diff --git a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md index 2afe45b49857..8a4d5ed39c8c 100644 --- a/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md +++ b/translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md @@ -68,7 +68,7 @@ You can use [{% data variables.product.prodname_codespaces %}](/codespaces/overv {% data reusables.dependency-review.beta %} -如果拉取请求包含对依赖项的更改，您可以使用清单或锁定文件的依赖项审阅来查看更改的内容，并检查更改是否引入安全漏洞。 更多信息请参阅“[审查拉取请求中的依赖项更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request)”。 +如果拉取请求包含对依赖项的更改，您可以使用清单或锁定文件的依赖项审阅来查看更改的内容，并检查更改是否引入安全漏洞。 更多信息请参阅“[审查拉取请求中的依赖项更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request)”。 {% data reusables.repositories.changed-files %} diff --git a/translations/zh-CN/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md b/translations/zh-CN/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md index f795d077a968..9650a6eb7a37 100644 --- a/translations/zh-CN/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md +++ b/translations/zh-CN/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md @@ -69,4 +69,4 @@ shortTitle: 添加文件 ## 延伸阅读 -- "[使用命令行添加现有项目到 GitHub](/articles/adding-an-existing-project-to-github-using-the-command-line)" +- "[将本地托管的代码添加到 {% data variables.product.product_name %}](/get-started/importing-your-projects-to-github/importing-source-code-to-github//adding-locally-hosted-code-to-github)" diff --git a/translations/zh-CN/data/features/restrict-groups-to-workflows.yml b/translations/zh-CN/data/features/restrict-groups-to-workflows.yml new file mode 100644 index 000000000000..5d3afa7004be --- /dev/null +++ b/translations/zh-CN/data/features/restrict-groups-to-workflows.yml @@ -0,0 +1,7 @@ +--- +#Issue 6137 +#Restrict self-hosted runner groups to specific workflows +versions: + ghec: '*' + ghes: '>=3.5' + ghae: 'issue-6137' diff --git a/translations/zh-CN/data/learning-tracks/code-security.yml b/translations/zh-CN/data/learning-tracks/code-security.yml index 931afcbdea10..f2dabf055594 100644 --- a/translations/zh-CN/data/learning-tracks/code-security.yml +++ b/translations/zh-CN/data/learning-tracks/code-security.yml @@ -3,7 +3,7 @@ security_advisories: title: '修复并披露安全漏洞' description: 'Using repository security advisories to privately fix a reported vulnerability and get a CVE.' - featured_track: '{% ifversion fpt %}true{% else %}false{% endif %}' + featured_track: '{% ifversion fpt or ghec %}true{% else %}false{% endif %}' guides: - /code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities - /code-security/repository-security-advisories/creating-a-repository-security-advisory @@ -13,30 +13,30 @@ security_advisories: - /code-security/repository-security-advisories/editing-a-repository-security-advisory - /code-security/repository-security-advisories/withdrawing-a-repository-security-advisory - /code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory -#Feature available on dotcom and GHES +#Feature available on dotcom and GHES 3.3+, so articles available on GHAE and earlier GHES hidden to hide the learning track dependabot_alerts: title: '获取漏洞依赖项的通知' description: '设置 Dependabot 提醒您的依赖项中有新漏洞。' guides: - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies - - '{% ifversion not ghae %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}' - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors -#Feature available only on dotcom, so articles available hidden to hide the learning track in other versions +#Feature available on dotcom and GHES 3.3+, so articles available on GHAE and earlier GHES hidden to hide the learning track dependabot_security_updates: title: '获取拉取请求以更新您的漏洞依赖项' description: '设置 Dependabot 以在报告新漏洞时创建拉取请求。' guides: - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates - - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}' - - '{% ifversion fpt %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}' - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates - - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies{% endif %}' -#Feature available only on dotcom + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies{% endif %}' +#Feature available only on dotcom and GHES 3.3+ dependency_version_updates: title: '保持更新依赖项' description: '使用 Dependabot 检查新版本并创建拉取请求来更新您的依赖关系。' @@ -51,30 +51,32 @@ dependency_version_updates: - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors -#Feature available in all versions from GHES 3.0 up +#Feature available in GHEC, GHES 3.0 up, and GHAE. Feature limited on FPT so hidden there. secret_scanning: title: '扫描密码' description: '设置秘密扫描以防意外检入令牌、密码和其他密钥到您的仓库。' guides: - - /code-security/secret-scanning/about-secret-scanning - - /code-security/secret-scanning/configuring-secret-scanning-for-your-repositories - - /code-security/secret-scanning/defining-custom-patterns-for-secret-scanning - - /code-security/secret-scanning/managing-alerts-from-secret-scanning -#Security overview feature available only on dotcom currently, so other articles hidden to hide the learning path in other versions + - '{% ifversion not fpt %}/code-security/secret-scanning/about-secret-scanning{% endif %}' + - '{% ifversion not fpt %}/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories{% endif %}' + - '{% ifversion not fpt %}/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning{% endif %}' + - '{% ifversion not fpt %}/code-security/secret-scanning/managing-alerts-from-secret-scanning{% endif %}' + - '{% ifversion not fpt %}/code-security/secret-scanning/secret-scanning-patterns{% endif %}' +#Security overview feature available in GHEC and GHES 3.2+, so other articles hidden to hide the learning path in other versions security_alerts: title: '探索和管理安全警报' description: '了解在哪里可以查找和解决安全警报。' guides: - - /code-security/security-overview/about-the-security-overview - - '{% ifversion fpt %}/code-security/secret-scanning/managing-alerts-from-secret-scanning {% endif %}' - - '{% ifversion fpt %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository{% endif %}' - - '{% ifversion fpt %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests{% endif %}' - - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository{% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/security-overview/about-the-security-overview {% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/security-overview/viewing-the-security-overview {% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/secret-scanning/managing-alerts-from-secret-scanning {% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository{% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests{% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository{% endif %}' #Feature available in all versions from GHES 2.22 up code_security_actions: title: '使用 GitHub Actions 运行代码扫描' description: '检查默认分支和每个拉取请求，以排除仓库中的漏洞和错误。' - featured_track: '{% ifversion ghae or ghes > 2.22 %}true{% else %}false{% endif %}' + featured_track: '{% ifversion ghae or ghes %}true{% else %}false{% endif %}' guides: - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository @@ -99,6 +101,5 @@ code_security_ci: - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/about-codeql-code-scanning-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system - - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-runner-in-your-ci-system - - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-runner-in-your-ci-system + - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/troubleshooting-codeql-runner-in-your-ci-system diff --git a/translations/zh-CN/data/product-examples/code-security/code-examples.yml b/translations/zh-CN/data/product-examples/code-security/code-examples.yml index b57f90526b00..3d3471e16870 100644 --- a/translations/zh-CN/data/product-examples/code-security/code-examples.yml +++ b/translations/zh-CN/data/product-examples/code-security/code-examples.yml @@ -22,9 +22,9 @@ - GitHub Actions - #Security policies - title: Microsoft 安全策略 + title: Microsoft security policy template description: 示例安全策略 - href: /microsoft/microsoft.github.io/blob/master/SECURITY.MD + href: https://github.com/microsoft/repo-templates/blob/main/shared/SECURITY.md tags: - 安全策略 - @@ -54,8 +54,9 @@ versions: fpt: '*' ghec: '*' + ghes: '>=3.3' - - #Dependabot configuration only relevant to GitHub.com + #Dependabot configuration only relevant to GitHub.com and GHES 3.3+ #Convert "languages" to "package-ecosystems" for Dependabot configurations title: 超级语法检查配置 description: 超级语法检查仓库中的 Dependabot 版本更新配置示例。 @@ -73,6 +74,7 @@ versions: fpt: '*' ghec: '*' + ghes: '>=3.3' - title: Dependabot 版本更新 PR description: 由 Depabot 版本在超级语法检查仓库中更新配置生成的示例拉取请求。 @@ -85,3 +87,4 @@ versions: fpt: '*' ghec: '*' + ghes: '>=3.3' diff --git a/translations/zh-CN/data/reusables/accounts/you-must-know-your-password.md b/translations/zh-CN/data/reusables/accounts/you-must-know-your-password.md index f4795c3909e7..7e671d41272a 100644 --- a/translations/zh-CN/data/reusables/accounts/you-must-know-your-password.md +++ b/translations/zh-CN/data/reusables/accounts/you-must-know-your-password.md @@ -1 +1 @@ -If you protect your personal account with two-factor authentication but do not know your password, you will not be able to generate a one-time password to recover your account. {% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[Updating your {% data variables.product.prodname_dotcom %} access credentials](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)." +If you protect your personal account with two-factor authentication but do not know your password, you will not be able to follow these steps to recover your account. {% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[Updating your {% data variables.product.prodname_dotcom %} access credentials](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)." diff --git a/translations/zh-CN/data/reusables/actions/restrict-runner-workflow-beta.md b/translations/zh-CN/data/reusables/actions/restrict-runner-workflow-beta.md new file mode 100644 index 000000000000..77949eb08b0c --- /dev/null +++ b/translations/zh-CN/data/reusables/actions/restrict-runner-workflow-beta.md @@ -0,0 +1,7 @@ +{% if restrict-groups-to-workflows %} +{% note %} + +**Note:** Configuring the workflows that can access a runner group is currently in beta and subject to change. + +{% endnote %} +{% endif %} diff --git a/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-org.md b/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-org.md index 20bcfabb15a4..84f09b3e0c6a 100644 --- a/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-org.md +++ b/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-org.md @@ -1,3 +1,3 @@ -1. 输入运行程序组的名称，并分配组织访问策略。 +1. Assign a policy for organization access. - You can configure a runner group to be accessible to a specific list of organizations, or all organizations in the enterprise.{% ifversion ghec or ghes %} By default, only private repositories can access runners in a runner group, but you can override this. 如果配置企业共享的组织的运行组，则不能覆盖此设置。{% endif %} + 您可以将运行器组配置为可供特定组织列表或企业中的所有组织访问。{% ifversion ghec or ghes %} 默认情况下，只有私有存储库可以访问运行器组中的运行器，但您可以覆盖此操作。 如果配置企业共享的组织的运行组，则不能覆盖此设置。{% endif %} diff --git a/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-repo.md b/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-repo.md index a82711986e04..9e46e1ec7250 100644 --- a/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-repo.md +++ b/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-repo.md @@ -1,3 +1,3 @@ -1. 输入运行程序组的名称，并分配仓库访问策略。 +1. Assign a policy for repository access. 您可以将运行器组配置为可供特定的存储库列表或组织中的所有存储库访问。{% ifversion ghec or ghes %} 默认情况下，只有私有存储库可以访问运行器组中的运行器，但您可以覆盖此操作。 如果配置企业共享的组织的运行组，则不能覆盖此设置。{% endif %} diff --git a/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-workflow.md b/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-workflow.md new file mode 100644 index 000000000000..ed40533e3096 --- /dev/null +++ b/translations/zh-CN/data/reusables/actions/runner-group-assign-policy-workflow.md @@ -0,0 +1,6 @@ +{%- if restrict-groups-to-workflows %} +1. Assign a policy for workflow access. + + You can configure a runner group to be accessible to a specific list of workflows, or to all workflows. This setting can't be overridden if you are configuring an organization's runner group that was shared by an enterprise. If you specify what workflow can access the runner group, you must use the full path to the workflow, including the repository name and owner, and you must pin the workflow to a branch, tag, or full SHA. 例如：`octo-org/octo-repo/.github/workflows/build.yml@v2, octo-org/octo-repo/.github/workflows/deploy.yml@d6dc6c96df4f32fa27b039f2084f576ed2c5c2a5, monalisa/octo-test/.github/workflows/test.yml@main`。 + + Only jobs directly defined within the selected workflows will have access to the runner group.{%- endif %} diff --git a/translations/zh-CN/data/reusables/actions/self-hosted-runner-configure-runner-group-access.md b/translations/zh-CN/data/reusables/actions/self-hosted-runner-configure-runner-group-access.md index a0f66371adb6..a2dcb19ee5bd 100644 --- a/translations/zh-CN/data/reusables/actions/self-hosted-runner-configure-runner-group-access.md +++ b/translations/zh-CN/data/reusables/actions/self-hosted-runner-configure-runner-group-access.md @@ -1,5 +1,5 @@ -1. 在设置页面的 {% ifversion fpt or ghes > 3.1 or ghae or ghec %}“运行器”{% else %}“自托管运行器）”{% endif %} 部分，单击要配置的运行器组旁边的 {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}，然后单击 **Edit name and [organization|repository] access（编辑名称和[组织|仓库] 权限）**。 ![管理仓库权限](/assets/images/help/settings/actions-runner-manage-permissions.png) -1. 修改策略选项，或更改运行器组名称。 +{% data reusables.actions.self-hosted-runner-configure-runner-group %} +1. Modify your policy options. {% ifversion not ghae %} {% warning %} diff --git a/translations/zh-CN/data/reusables/actions/self-hosted-runner-configure-runner-group.md b/translations/zh-CN/data/reusables/actions/self-hosted-runner-configure-runner-group.md new file mode 100644 index 000000000000..44d059883144 --- /dev/null +++ b/translations/zh-CN/data/reusables/actions/self-hosted-runner-configure-runner-group.md @@ -0,0 +1 @@ +1. In the {% ifversion fpt or ghes > 3.1 or ghae or ghec %}"Runners"{% else %}"Self-hosted runners"{% endif %} section of the settings page, next to the runner group you'd like to configure, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Edit name and [organization|repository] access**. ![管理仓库权限](/assets/images/help/settings/actions-runner-manage-permissions.png) \ No newline at end of file diff --git a/translations/zh-CN/data/reusables/actions/workflow-dispatch-inputs.md b/translations/zh-CN/data/reusables/actions/workflow-dispatch-inputs.md index 641db1aa32a6..5ef8091877f2 100644 --- a/translations/zh-CN/data/reusables/actions/workflow-dispatch-inputs.md +++ b/translations/zh-CN/data/reusables/actions/workflow-dispatch-inputs.md @@ -15,10 +15,14 @@ on: - info - warning - debug {% endif %} + print_tags: + description: 'True to print to STDOUT' + required: true {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5511 %} + type: boolean {% endif %} tags: description: 'Test scenario tags' - required: false {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5511 %} - type: boolean + required: true {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5511 %} + type: string environment: description: 'Environment to run tests against' type: environment @@ -27,7 +31,7 @@ on: jobs: print-tag: runs-on: ubuntu-latest - + if: {% raw %} ${{ github.event.inputs.print_tags == 'true' }} {% endraw %} steps: - name: Print the input tag to STDOUT run: echo {% raw %} The tag is ${{ github.event.inputs.tag }} {% endraw %} diff --git a/translations/zh-CN/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md b/translations/zh-CN/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md index d6e21487ac91..9072d9035af6 100644 --- a/translations/zh-CN/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md +++ b/translations/zh-CN/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md @@ -5,7 +5,7 @@ Use the `branches` filter when you want to include branch name patterns or when Use the `tags` filter when you want to include tag name patterns or when you want to both include and exclude tag names patterns. Use the `tags-ignore` filter when you only want to exclude tag name patterns. You cannot use both the `tags` and `tags-ignore` filters for the same event in a workflow. -If you define only `tags`/`tag-ignore` or only `branches`/`branches-ignore`, the workflow won't run for events affecting the undefined Git ref. If you define neither `tags`/`tag-ignore` or `branches`/`branches-ignore`, the workflow will run for events affecting either branches or tags. If you define both `branches`/`branches-ignore` and [`paths`](#onpushpull_requestpull_request_targetpathspaths-ignore), the workflow will only run when both filters are satisfied. +If you define only `tags`/`tags-ignore` or only `branches`/`branches-ignore`, the workflow won't run for events affecting the undefined Git ref. If you define neither `tags`/`tags-ignore` or `branches`/`branches-ignore`, the workflow will run for events affecting either branches or tags. If you define both `branches`/`branches-ignore` and [`paths`](#onpushpull_requestpull_request_targetpathspaths-ignore), the workflow will only run when both filters are satisfied. `branches`、`branches-ignore`、`tags` 和 `tags-ignore` 关键词接受使用 `*`、`**`、`+`、`?`、`!` 等字符匹配多个分支或标记名称的 glob 模式。 If a name contains any of these characters and you want a literal match, you need to *escape* each of these special characters with `\`. 有关 glob 模式的更多信息，请参阅“[过滤器模式备忘清单](/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet)”。 diff --git a/translations/zh-CN/data/reusables/dotcom_billing/pricing_cal.md b/translations/zh-CN/data/reusables/dotcom_billing/pricing_cal.md deleted file mode 100644 index 6509379b2892..000000000000 --- a/translations/zh-CN/data/reusables/dotcom_billing/pricing_cal.md +++ /dev/null @@ -1 +0,0 @@ -To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} pricing calculator. For more information, go to https://github.com/pricing/calculator. diff --git a/translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md b/translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md new file mode 100644 index 000000000000..c8e8d5628c07 --- /dev/null +++ b/translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md @@ -0,0 +1 @@ +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=actions). diff --git a/translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md b/translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md new file mode 100644 index 000000000000..6d8a5f5451fb --- /dev/null +++ b/translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md @@ -0,0 +1 @@ +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces). diff --git a/translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md b/translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md new file mode 100644 index 000000000000..690f270d1b18 --- /dev/null +++ b/translations/zh-CN/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md @@ -0,0 +1 @@ +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=packages). diff --git a/translations/zh-CN/data/reusables/gated-features/allowed-ip-addresses.md b/translations/zh-CN/data/reusables/gated-features/allowed-ip-addresses.md deleted file mode 100644 index b9bba18977d3..000000000000 --- a/translations/zh-CN/data/reusables/gated-features/allowed-ip-addresses.md +++ /dev/null @@ -1 +0,0 @@ -允许的 IP 地址可用于 {% data variables.product.prodname_ghe_cloud %} 和 {% data variables.product.prodname_ghe_managed %}。 更多信息请参阅“[{% data variables.product.prodname_dotcom %} 的产品](/articles/github-s-products)”。 diff --git a/translations/zh-CN/data/reusables/gated-features/dependency-review.md b/translations/zh-CN/data/reusables/gated-features/dependency-review.md index d9a0a56fffbd..a04758566f06 100644 --- a/translations/zh-CN/data/reusables/gated-features/dependency-review.md +++ b/translations/zh-CN/data/reusables/gated-features/dependency-review.md @@ -1,3 +1,13 @@ -{% ifversion fpt or ghec %}Dependency review is available for all public repositories, as well as private repositories owned by organizations where {% data variables.product.prodname_GH_advanced_security %} is enabled.{% endif %} -{% ifversion ghes > 3.1 %}Dependency review is available for organization-owned repositories where {% data variables.product.prodname_GH_advanced_security %} is enabled. -{% endif %} {% data reusables.advanced-security.more-info-ghas %} +{%- ifversion fpt %} +Dependency review is enabled on public repositories. Dependency review is also available in private repositories owned by organizations that use {% data variables.product.prodname_ghe_cloud %} and have a license for {% data variables.product.prodname_GH_advanced_security %}. + +{%- elsif ghec %} +依赖项审查包含在公共存储库的 {% data variables.product.product_name %} 中。 To use dependency review in private repositories owned by organizations, you must have a license for {% data variables.product.prodname_GH_advanced_security %}. + +{%- elsif ghes > 3.1 %} +Dependency review is available for organization-owned repositories in {% data variables.product.product_name %}. This feature requires a license for {% data variables.product.prodname_GH_advanced_security %}. + +{%- elsif ghae-issue-4864 %} +Dependency review is available for organization-owned repositories in {% data variables.product.product_name %}. This is a {% data variables.product.prodname_GH_advanced_security %} feature (free during the beta release). + +{%- endif %} {% data reusables.advanced-security.more-info-ghas %} \ No newline at end of file diff --git a/translations/zh-CN/data/reusables/gated-features/restrict-add-collaborator.md b/translations/zh-CN/data/reusables/gated-features/restrict-add-collaborator.md deleted file mode 100644 index 2e88d1a35992..000000000000 --- a/translations/zh-CN/data/reusables/gated-features/restrict-add-collaborator.md +++ /dev/null @@ -1 +0,0 @@ -限制添加外部协作者到所有者的能力可用于 {% data variables.product.prodname_ghe_cloud %}。 更多信息请参阅“[GitHub's products](/articles/githubs-products)”。 diff --git a/translations/zh-CN/data/reusables/getting-started/managing-org-policies.md b/translations/zh-CN/data/reusables/getting-started/managing-org-policies.md index 717d24f2ed1c..9951b2f57240 100644 --- a/translations/zh-CN/data/reusables/getting-started/managing-org-policies.md +++ b/translations/zh-CN/data/reusables/getting-started/managing-org-policies.md @@ -1,5 +1,5 @@ You can manage permissions and policies for a number of different actions and features in your organization. -For example, to protect your organization's data and number of paid licenses, you can choose to allow only organization owners to invite outside collaborators to organization repositories. You can also choose to allow or prevent the forking of private repositories owned by your organization. For more information, see "[Setting permissions for adding outside collaborators](/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)" and "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)." +For example, to protect your organization's data, you can restrict repository creation in your organization. You can also choose to allow or prevent the forking of private repositories owned by your organization. For more information, see "[Restricting repository creation in your organization](/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization)" and "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)." For the full list of settings you can configure for your organization, see "[Managing organization settings](/organizations/managing-organization-settings)." diff --git a/translations/zh-CN/data/reusables/projects/insights-alpha.md b/translations/zh-CN/data/reusables/projects/insights-alpha.md new file mode 100644 index 000000000000..7374ac98a954 --- /dev/null +++ b/translations/zh-CN/data/reusables/projects/insights-alpha.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** Insights for projects (beta) is currently in private preview and is not yet available to all organizations. + +{% endnote %} diff --git a/translations/zh-CN/data/reusables/projects/projects-filters.md b/translations/zh-CN/data/reusables/projects/projects-filters.md new file mode 100644 index 000000000000..a584c0628683 --- /dev/null +++ b/translations/zh-CN/data/reusables/projects/projects-filters.md @@ -0,0 +1,9 @@ +- To filter for any match of multiple values (an OR query), separate the values with a comma. For example `label:"good first issue",bug` will list all issues labelled `good first issue` or `bug`. +- 要过滤缺少特定值的字段，请在过滤器之前加入 `-`。 例如， `-label:"bug"` 只会显示没有标签的 `bug` 的项。 +- 要过滤缺少所有值的字段, 请输入 `no:`，后接字段名称。 例如，`no:assignee` 仅显示没有受理人的项。 +- 要按状态过滤，请输入 `is:`。 例如 `is: issue` 或 `is:open`。 +- 多个过滤条件之间用逗号分隔。 例如，`status:"In progress" -label:"bug" no:assignee` 仅显示状态为 `In progress`、没有标签 `bug` 且没有受理人的项。 +- To filter for the previous, current, or next iteration of an iteration field, use `@previous`, `@current`, or `@next`. 例如 `sprint:@current`。 +- To filter for items assigned to the viewer, use `@me`. For example, `assignee:@me`. Anyone using this view will see items assigned to themselves. +- To filter date and number fields, use `>`, `>=`, `<`, `<=`, and `..` range queries. For example: `target:2022-03-01..2022-03-15`. 更多信息请参阅“[了解搜索语法](/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax)”。 +- \ No newline at end of file diff --git a/translations/zh-CN/data/ui.yml b/translations/zh-CN/data/ui.yml index 59c7765b04a1..07f39b9ec0f2 100644 --- a/translations/zh-CN/data/ui.yml +++ b/translations/zh-CN/data/ui.yml @@ -80,6 +80,7 @@ contribution_cta: products: graphql: reference: + implements: Implements fields: 字段 arguments: 参数 name: 名称 From 6f04f4266d2ac451614ecc456f497ca7d5faf706 Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Mon, 14 Mar 2022 09:25:19 -0700 Subject: [PATCH 13/18] New translation batch for ja (#26148) * Add crowdin translations * Run script/i18n/homogenize-frontmatter.js * Run script/i18n/lint-translation-files.js --check parsing * Run script/i18n/lint-translation-files.js --check rendering * run script/i18n/reset-files-with-broken-liquid-tags.js --language=ja * run script/i18n/reset-known-broken-translation-files.js * Check in ja CSV report Co-authored-by: Robert Sese --- ...tributions-not-showing-up-on-my-profile.md | 6 +- .../creating-a-javascript-action.md | 4 +- .../deployment/about-deployments/index.md | 3 +- .../deploying-xcode-applications/index.md | 3 +- .../managing-your-deployments/index.md | 3 +- .../targeting-different-environments/index.md | 3 +- .../about-self-hosted-runners.md | 5 +- ...-hosted-runner-application-as-a-service.md | 6 + ...ess-to-self-hosted-runners-using-groups.md | 51 +++- .../actions/learn-github-actions/contexts.md | 5 + .../environment-variables.md | 2 +- .../security-hardening-for-github-actions.md | 2 +- .../using-workflows/reusing-workflows.md | 2 + .../managing-github-connect.md | 6 +- ...saml-single-sign-on-for-your-enterprise.md | 2 - ...le-sign-on-for-enterprise-managed-users.md | 6 +- ...-for-enterprise-managed-users-with-okta.md | 2 + ...ovisioning-for-enterprise-managed-users.md | 2 + ...or-security-settings-in-your-enterprise.md | 2 +- ...viting-people-to-manage-your-enterprise.md | 7 +- .../managing-dormant-users.md | 1 - ...ccount-if-you-lose-your-2fa-credentials.md | 9 +- .../about-billing-for-github-actions.md | 2 +- .../about-billing-for-codespaces.md | 2 +- .../about-billing-for-github-packages.md | 4 +- .../downgrading-your-github-subscription.md | 7 + ...io-subscriptions-with-github-enterprise.md | 2 + .../sarif-support-for-code-scanning.md | 14 +- .../ja-JP/content/code-security/guides.md | 6 +- .../ja-JP/content/code-security/index.md | 28 +-- .../about-the-security-overview.md | 2 +- .../about-dependabot-version-updates.md | 1 + .../index.md | 1 - ...pendabotcom-to-github-native-dependabot.md | 54 ----- ...nerable-dependencies-in-your-repository.md | 15 +- .../about-dependency-review.md | 13 +- ...abling-codespaces-for-your-organization.md | 4 +- ...g-allowed-ip-addresses-for-a-github-app.md | 2 +- .../events/issue-event-types.md | 12 +- ...> adding-locally-hosted-code-to-github.md} | 19 +- .../importing-source-code-to-github/index.md | 2 +- translations/ja-JP/content/index.md | 2 +- .../about-projects.md | 2 +- .../best-practices-for-managing-projects.md | 2 +- .../creating-a-project.md | 6 +- .../customizing-your-project-views.md | 9 +- .../filtering-projects.md | 26 +++ .../index.md | 3 + .../managing-iterations.md | 64 +++++ .../using-insights-with-projects.md | 29 +++ ...owed-ip-addresses-for-your-organization.md | 19 +- ...ing-the-audit-log-for-your-organization.md | 8 +- ...rs-to-repositories-in-your-organization.md | 8 +- .../repository-roles-for-an-organization.md | 168 +++++++------- ...g-people-with-access-to-your-repository.md | 25 +- ...ssions-for-adding-outside-collaborators.md | 13 +- ...om-repository-roles-for-an-organization.md | 2 + .../roles-in-an-organization.md | 117 +++++----- ...ml-single-sign-on-for-your-organization.md | 2 - ...ging-code-review-settings-for-your-team.md | 4 - translations/ja-JP/content/packages/index.md | 4 +- .../deleting-and-restoring-a-package.md | 24 +- .../publishing-a-package.md | 25 +- .../working-with-the-docker-registry.md | 2 +- .../about-github-pages.md | 10 +- ...ng-dependency-changes-in-a-pull-request.md | 2 + ...wing-proposed-changes-in-a-pull-request.md | 2 +- .../duplicating-a-repository.md | 8 +- .../configuring-tag-protection-rules.md | 28 +++ .../managing-repository-settings/index.md | 1 + .../adding-a-file-to-a-repository.md | 2 +- .../rest/guides/basics-of-authentication.md | 16 +- .../guides/best-practices-for-integrators.md | 8 +- .../rest/guides/building-a-ci-server.md | 2 +- .../rest/guides/delivering-deployments.md | 10 +- .../discovering-resources-for-a-user.md | 6 +- .../getting-started-with-the-rest-api.md | 219 +++++++++++------- .../features/reopen-dependabot-alerts.yml | 7 + .../features/restrict-groups-to-workflows.yml | 7 + .../data/learning-tracks/code-security.yml | 45 ++-- .../code-security/code-examples.yml | 9 +- .../accounts/you-must-know-your-password.md | 2 +- .../actions/github-token-permissions.md | 2 +- .../actions/restrict-runner-workflow-beta.md | 7 + .../actions/runner-group-assign-policy-org.md | 2 +- .../runner-group-assign-policy-repo.md | 2 +- .../runner-group-assign-policy-workflow.md | 6 + ...ed-runner-configure-runner-group-access.md | 4 +- ...lf-hosted-runner-configure-runner-group.md | 1 + .../actions/workflow-dispatch-inputs.md | 10 +- ...ection-run-on-specific-branches-or-tags.md | 2 +- .../reusables/dotcom_billing/pricing_cal.md | 1 - .../pricing_calculator/pricing_cal_actions.md | 1 + .../pricing_cal_codespaces.md | 1 + .../pricing_cal_packages.md | 1 + .../gated-features/allowed-ip-addresses.md | 1 - .../gated-features/dependency-review.md | 16 +- .../restrict-add-collaborator.md | 1 - .../gated-features/tag-protection-rules.md | 1 + .../getting-started/managing-org-policies.md | 2 +- ...ip-allow-lists-example-and-restrictions.md | 2 +- .../data/reusables/projects/insights-alpha.md | 5 + .../reusables/projects/projects-filters.md | 9 + .../cannot-update-existing-saml-settings.md | 5 - .../reusables/scim/emu-scim-rate-limit.md | 5 + translations/ja-JP/data/ui.yml | 1 + translations/log/ja-resets.csv | 7 +- 107 files changed, 867 insertions(+), 498 deletions(-) delete mode 100644 translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md rename translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/{adding-an-existing-project-to-github-using-the-command-line.md => adding-locally-hosted-code-to-github.md} (91%) create mode 100644 translations/ja-JP/content/issues/trying-out-the-new-projects-experience/filtering-projects.md create mode 100644 translations/ja-JP/content/issues/trying-out-the-new-projects-experience/managing-iterations.md create mode 100644 translations/ja-JP/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md create mode 100644 translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md create mode 100644 translations/ja-JP/data/features/reopen-dependabot-alerts.yml create mode 100644 translations/ja-JP/data/features/restrict-groups-to-workflows.yml create mode 100644 translations/ja-JP/data/reusables/actions/restrict-runner-workflow-beta.md create mode 100644 translations/ja-JP/data/reusables/actions/runner-group-assign-policy-workflow.md create mode 100644 translations/ja-JP/data/reusables/actions/self-hosted-runner-configure-runner-group.md delete mode 100644 translations/ja-JP/data/reusables/dotcom_billing/pricing_cal.md create mode 100644 translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md create mode 100644 translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md create mode 100644 translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md delete mode 100644 translations/ja-JP/data/reusables/gated-features/allowed-ip-addresses.md delete mode 100644 translations/ja-JP/data/reusables/gated-features/restrict-add-collaborator.md create mode 100644 translations/ja-JP/data/reusables/gated-features/tag-protection-rules.md create mode 100644 translations/ja-JP/data/reusables/projects/insights-alpha.md create mode 100644 translations/ja-JP/data/reusables/projects/projects-filters.md delete mode 100644 translations/ja-JP/data/reusables/saml/cannot-update-existing-saml-settings.md create mode 100644 translations/ja-JP/data/reusables/scim/emu-scim-rate-limit.md diff --git a/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md index 9175a164abfc..e50ef642b2bd 100644 --- a/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md +++ b/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md @@ -19,6 +19,8 @@ shortTitle: Missing contributions Your profile contributions graph is a record of contributions you've made to repositories {% ifversion ghae %}owned by{% else %}on{% endif %} {% data variables.product.product_location %}. ローカルタイムゾーンではなく、協定世界時 (UTC) に従って、コントリビューションにタイムスタンプが付けられます。 コントリビューションは、一定の基準を満たしている場合にのみカウントされます。 場合によっては、コントリビューションを表示するためにグラフを再構築する必要があります。 +If you are part of an organization that uses SAML single sign-on (SSO), you won’t be able to see contribution activity from the organization on your profile if you do not have an active SSO session. People viewing your profile from outside your organization will see anonymized contribution activity of your contribution activity for your organization. + ## カウントされるコントリビューション ### Issue、プルリクエスト、ディスカッション @@ -53,7 +55,7 @@ For more information on project sites, see "[About {% data variables.product.pro Commits must be made with an email address that is connected to your account on {% data variables.product.product_location %}{% ifversion fpt or ghec %}, or the {% data variables.product.prodname_dotcom %}-provided `noreply` email address provided to you in your email settings,{% endif %} in order to appear on your contributions graph.{% ifversion fpt or ghec %} For more information about `noreply` email addresses, see "[Setting your commit email address](/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address#about-commit-email-addresses)."{% endif %} -コミット URL の最後に `.patch` を追加すると、コミットに使用されたメールアドレスを確認できます。例: https://github.com/octocat/octocat.github.io/commit/67c0afc1da354d8571f51b6f0af8f2794117fd10.patch: +You can check the email address used for a commit by adding `.patch` to the end of a commit URL, e.g. https://github.com/octocat/octocat.github.io/commit/67c0afc1da354d8571f51b6f0af8f2794117fd10.patch: ``` From 67c0afc1da354d8571f51b6f0af8f2794117fd10 Mon Sep 17 00:00:00 2001 @@ -90,7 +92,7 @@ If the email address used for the commit is not connected to your account on {% フォークで行われたコミットは、 コントリビューションにはカウントされません。 カウントには、次のいずれかを実行する必要があります: - 変更内容を親リポジトリにマージするために、[プルリクエストを開きます](/articles/creating-a-pull-request)。 -- To detach the fork and turn it into a standalone repository on {% data variables.product.product_location %}, contact {% data variables.contact.contact_support %}. If the fork has forks of its own, let {% data variables.contact.contact_support %} know if the forks should move with your repository into a new network or remain in the current network. 詳細は「[フォークについて](/articles/about-forks/)」を参照してください。 +- フォークをデタッチして、{% data variables.product.product_location %} 上のスタンドアロンリポジトリに変換するために、{% data variables.contact.contact_support %} に連絡してください。 フォークに独自のフォークがある場合は、フォークがリポジトリと一緒に新しいネットワークに移動するのか、現在のネットワークに残るのかを {% data variables.contact.contact_support %}に連絡してください。 詳細は「[フォークについて](/articles/about-forks/)」を参照してください。 ## 参考リンク diff --git a/translations/ja-JP/content/actions/creating-actions/creating-a-javascript-action.md b/translations/ja-JP/content/actions/creating-actions/creating-a-javascript-action.md index c36ab4e1d9ad..765bd03e6003 100644 --- a/translations/ja-JP/content/actions/creating-actions/creating-a-javascript-action.md +++ b/translations/ja-JP/content/actions/creating-actions/creating-a-javascript-action.md @@ -141,7 +141,7 @@ try { - アクションが使用する環境変数 - ワークフローでアクションを使う使用方法の例 -```markdown +```markdown{:copy} # Hello world javascript action This action prints "Hello World" or "Hello" + the name of a person to greet to the log. @@ -193,7 +193,7 @@ git push --follow-tags 1. すでに `node_modules` ディレクトリをチェックインしていた場合、次のコマンドで削除します: `rm -rf node_modules/*` 1. ターミナルから、`action.yml`、`dist/index.js`、および `node_modules` ファイルをコミットします。 -```shell +```shell{:copy} git add action.yml dist/index.js node_modules/* git commit -m "Use vercel/ncc" git tag -a -m "My first action release" v1.1 diff --git a/translations/ja-JP/content/actions/deployment/about-deployments/index.md b/translations/ja-JP/content/actions/deployment/about-deployments/index.md index 89456a53a4f3..921a8c1fbd47 100644 --- a/translations/ja-JP/content/actions/deployment/about-deployments/index.md +++ b/translations/ja-JP/content/actions/deployment/about-deployments/index.md @@ -4,7 +4,8 @@ shortTitle: About deployments intro: 'Learn how deployments can run with {% data variables.product.prodname_actions %} workflows.' versions: fpt: '*' - ghae: issue-4856 + ghes: '*' + ghae: '*' ghec: '*' children: - /about-continuous-deployment diff --git a/translations/ja-JP/content/actions/deployment/deploying-xcode-applications/index.md b/translations/ja-JP/content/actions/deployment/deploying-xcode-applications/index.md index 6d53c5d887c1..26b4df60698c 100644 --- a/translations/ja-JP/content/actions/deployment/deploying-xcode-applications/index.md +++ b/translations/ja-JP/content/actions/deployment/deploying-xcode-applications/index.md @@ -4,7 +4,8 @@ shortTitle: Deploying Xcode applications intro: '{% data variables.product.prodname_actions %} ランナーに Apple コード署名証明書をインストールすることで、継続的インテグレーション (CI) ワークフロー内で Xcode アプリケーションに署名できます。' versions: fpt: '*' - ghae: issue-4856 + ghes: '*' + ghae: '*' ghec: '*' children: - /installing-an-apple-certificate-on-macos-runners-for-xcode-development diff --git a/translations/ja-JP/content/actions/deployment/managing-your-deployments/index.md b/translations/ja-JP/content/actions/deployment/managing-your-deployments/index.md index d1d09d4013d8..46b63742610e 100644 --- a/translations/ja-JP/content/actions/deployment/managing-your-deployments/index.md +++ b/translations/ja-JP/content/actions/deployment/managing-your-deployments/index.md @@ -4,7 +4,8 @@ shortTitle: Managing your deployments intro: You can review the past activity of your deployments. versions: fpt: '*' - ghae: issue-4856 + ghes: '*' + ghae: '*' ghec: '*' children: - /viewing-deployment-history diff --git a/translations/ja-JP/content/actions/deployment/targeting-different-environments/index.md b/translations/ja-JP/content/actions/deployment/targeting-different-environments/index.md index f18edc9d3696..71d254578a94 100644 --- a/translations/ja-JP/content/actions/deployment/targeting-different-environments/index.md +++ b/translations/ja-JP/content/actions/deployment/targeting-different-environments/index.md @@ -4,7 +4,8 @@ shortTitle: Targeting different environments intro: 保護ルールとシークレットを持つ環境を設定できます。 A workflow job that references an environment must follow any protection rules for the environment before running or accessing the environment's secrets. versions: fpt: '*' - ghae: issue-4856 + ghes: '*' + ghae: '*' ghec: '*' children: - /using-environments-for-deployment diff --git a/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index 5e7c96e02894..d086fee7b1be 100644 --- a/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -51,7 +51,8 @@ For more information about installing and using self-hosted runners, see "[Addin - Can use cloud services or local machines that you already pay for. - Are customizable to your hardware, operating system, software, and security requirements. - Don't need to have a clean instance for every job execution. -- Are free to use with {% data variables.product.prodname_actions %}, but you are responsible for the cost of maintaining your runner machines. +- Are free to use with {% data variables.product.prodname_actions %}, but you are responsible for the cost of maintaining your runner machines.{% ifversion ghec or ghes or ghae %} +- Can be organized into groups to restrict access to specific {% if restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories. For more information, see "[Managing access to self-hosted runners using groups](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)."{% endif %} ## Requirements for self-hosted runner machines @@ -186,7 +187,7 @@ github-registry-files.githubusercontent.com In addition, your workflow may require access to other network resources. For example, if your workflow installs packages or publishes containers to {% data variables.product.prodname_dotcom %} Packages, then the runner will also require access to those network endpoints. -If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing policies for security settings in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise)". +If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/{% ifversion fpt %}enterprise-cloud@latest/{% endif %}/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing policies for security settings in your enterprise](/{% ifversion fpt %}enterprise-cloud@latest/{% endif %}admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} {% else %} diff --git a/translations/ja-JP/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md b/translations/ja-JP/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md index 26cf7569d639..7d25eb4dfdcc 100644 --- a/translations/ja-JP/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md +++ b/translations/ja-JP/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md @@ -78,6 +78,12 @@ Windowsでは、ランナーサービスは**サービス**アプリケーショ ``` {% endmac %} +The command takes an optional `user` argument to install the service as a different user. + +```shell +./svc.sh install --user USERNAME +``` + ## サービスの起動 以下のコマンドでサービスを起動してください。 diff --git a/translations/ja-JP/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/translations/ja-JP/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index c584eeb246ba..30fe65df0554 100644 --- a/translations/ja-JP/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/translations/ja-JP/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -9,11 +9,12 @@ versions: ghae: '*' ghec: '*' type: tutorial -shortTitle: Manage runner groups +shortTitle: Manage access to runners --- {% data reusables.actions.enterprise-beta %} {% data reusables.actions.enterprise-github-hosted-runners %} +{% data reusables.actions.restrict-runner-workflow-beta %} ## セルフホストランナーのグループについて @@ -31,9 +32,10 @@ Self-hosted runner groups are used to control access to self-hosted runners. Org {% endif %} {% ifversion ghec or ghes or ghae %} -セルフホストランナーグループは、Organization レベルおよび Enterprise レベルでセルフホストランナーへのアクセスを制御するために使用されます。 Enterprise の管理者は、Enterprise 内のどの Organization がランナーグループにアクセスできるかを制御するアクセスポリシーを設定できます。 Organization の管理者は、Organization 内のどのリポジトリがランナーグループにアクセスできるかを制御するアクセスポリシーを設定できます。 +セルフホストランナーグループは、Organization レベルおよび Enterprise レベルでセルフホストランナーへのアクセスを制御するために使用されます。 Enterprise owners can configure access policies that control which organizations +{% if restrict-groups-to-workflows %}and workflows {% endif %}in an enterprise have access to the runner group. Organization owners can configure access policies that control which repositories{% if restrict-groups-to-workflows %} and workflows{% endif %} in an organization have access to the runner group. -Enterprise の管理者が Organization にランナーグループへのアクセスを許可すると、Organization の管理者は、Organization のセルフホストランナー設定にリストされたランナーグループを表示できます。 Organization の管理者は、追加の詳細なリポジトリアクセスポリシーを Enterprise ランナーグループに割り当てることができます。 +When an enterprise owner grants an organization access to a runner group, organization owners can see the runner group listed in the organization's self-hosted runner settings. The organization owners can then assign additional granular repository{% if restrict-groups-to-workflows %} and workflow{% endif %} access policies to the enterprise runner group. 新しいランナーが作成されると、それらは自動的にデフォルトグループに割り当てられます。 ランナーは一度に1つのグループにのみ参加できます。 ランナーはデフォルトグループから別のグループに移動できます。 詳しい情報については、「[セルフホストランナーをグループに移動する](#moving-a-self-hosted-runner-to-a-group)」を参照してください。 @@ -43,13 +45,14 @@ Enterprise の管理者が Organization にランナーグループへのアク セルフホストランナーは、作成時にデフォルトグループに自動的に割り当てられ、一度に 1 つのグループのメンバーになることができます。 ランナーはデフォルトグループから作成した任意のグループに移動できます。 -グループを作成する場合、ランナーグループにアクセスできるリポジトリを定義するポリシーを選択する必要があります。 +When creating a group, you must choose a policy that defines which repositories{% if restrict-groups-to-workflows %} and workflows{% endif %} have access to the runner group. {% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.actions.settings-sidebar-actions-runner-groups %} 1. In the "Runner groups" section, click **New runner group**. +1. Enter a name for your runner group. {% data reusables.actions.runner-group-assign-policy-repo %} {% warning %} @@ -59,6 +62,7 @@ Enterprise の管理者が Organization にランナーグループへのアク 詳しい情報については「[セルフホストランナーについて](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories)」を参照してください。 {% endwarning %} +{% data reusables.actions.runner-group-assign-policy-workflow %}{%- if restrict-groups-to-workflows %} Organization-owned runner groups cannot access workflows from a different organization in the enterprise; instead, you must create an enterprise-owned runner group.{% endif %} {% data reusables.actions.self-hosted-runner-create-group %} {% elsif ghae or ghes < 3.4 %} {% data reusables.organizations.navigate-to-org %} @@ -89,7 +93,7 @@ Enterprise の管理者が Organization にランナーグループへのアク ## Enterprise のセルフホストランナーグループを作成する -Enterprise は、セルフホストランナーをグループに追加して、アクセス管理を行うことができます。 Enterprise は、Enterprise アカウント内の特定の Organization がアクセスできるセルフホストランナーのグループを作成できます。 Organization の管理者は、追加の詳細なリポジトリアクセスポリシーを Enterprise ランナーグループに割り当てることができます。 For information about how to create a self-hosted runner group with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/reference/actions#self-hosted-runner-groups). +Enterprise は、セルフホストランナーをグループに追加して、アクセス管理を行うことができます。 Enterprises can create groups of self-hosted runners that are accessible to specific organizations in the enterprise account{% if restrict-groups-to-workflows %} or to specific workflows{% endif %}. Organization owners can then assign additional granular repository{% if restrict-groups-to-workflows %} or workflow{% endif %} access policies to the enterprise runner groups. For information about how to create a self-hosted runner group with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/reference/actions#self-hosted-runner-groups). セルフホストランナーは、作成時にデフォルトグループに自動的に割り当てられ、一度に 1 つのグループのメンバーになることができます。 登録処理中にランナーを特定のグループに割り当てることも、後でランナーをデフォルトグループからカスタムグループに移動することもできます。 @@ -116,17 +120,21 @@ Enterprise は、セルフホストランナーをグループに追加して、 ![ランナーグループのオプションを追加](/assets/images/help/settings/actions-enterprise-account-add-runner-group-options-ae.png) {%- endif %} +{% data reusables.actions.runner-group-assign-policy-workflow %} 1. [**Save group**] をクリックしてグループを作成し、ポリシーを適用します。 {% endif %} ## セルフホストランナーグループのアクセスポリシーを変更する -ランナーグループのアクセスポリシーを更新したり、ランナーグループの名前を変更したりすることができます。 +For runner groups in an enterprise, you can change what organizations in the enterprise can access a runner group{% if restrict-groups-to-workflows %} or restrict what workflows a runner group can run{% endif %}. For runner groups in an organization, you can change what repositories in the organization can access a runner group{% if restrict-groups-to-workflows %} or restrict what workflows a runner group can run{% endif %}. + +### Changing what organizations or repositories can access a runner group + {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.actions.self-hosted-runner-groups-navigate-to-repo-org-enterprise %} {% data reusables.actions.settings-sidebar-actions-runner-groups-selection %} -1. Modify the access options, or change the runner group name. +1. For runner groups in an enterprise, under **Organization access**, modify what organizations can access the runner group. For runner groups in an organization, under **Repository access**, modify what repositories can access the runner group. {%- ifversion fpt or ghec or ghes %} {% warning %} @@ -143,6 +151,35 @@ Enterprise は、セルフホストランナーをグループに追加して、 {% data reusables.actions.self-hosted-runner-configure-runner-group-access %} {% endif %} +{% if restrict-groups-to-workflows %} +### Changing what workflows can access a runner group +You can configure a self-hosted runner group to run either selected workflows or all workflows. For example, you might use this setting to protect secrets that are stored on self-hosted runners or to standardize deployment workflows by restricting a runner group to run only a specific reusable workflow. This setting cannot be overridden if you are configuring an organization's runner group that was shared by an enterprise. +{% data reusables.actions.self-hosted-runner-groups-navigate-to-repo-org-enterprise %} +{% data reusables.actions.settings-sidebar-actions-runner-groups-selection %} +1. Under **Workflow access**, select the dropdown menu and click **Selected workflows**. +1. {% octicon "gear" aria-label="the gear icon" %} をクリックします。 +1. Enter a comma separated list of the workflows that can access the runner group. Use the full path, including the repository name and owner. Pin the workflow to a branch, tag, or full SHA. For example: `octo-org/octo-repo/.github/workflows/build.yml@v2, octo-org/octo-repo/.github/workflows/deploy.yml@d6dc6c96df4f32fa27b039f2084f576ed2c5c2a5, monalisa/octo-test/.github/workflows/test.yml@main`. + + Only jobs directly defined within the selected workflows will have access to the runner group. + + Organization-owned runner groups cannot access workflows from a different organization in the enterprise; instead, you must create an enterprise-owned runner group. + +1. [**Save**] をクリックします。 + +{% endif %} + +## Changing the name of a runner group + +{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} +{% data reusables.actions.self-hosted-runner-groups-navigate-to-repo-org-enterprise %} +{% data reusables.actions.settings-sidebar-actions-runner-groups-selection %} +1. Change the runner group name. + +{% elsif ghae or ghes < 3.4 %} +{% data reusables.actions.self-hosted-runner-configure-runner-group %} +1. Change the runner group name. +{% endif %} + {% ifversion ghec or ghes or ghae %} ## Automatically adding a self-hosted runner to a group diff --git a/translations/ja-JP/content/actions/learn-github-actions/contexts.md b/translations/ja-JP/content/actions/learn-github-actions/contexts.md index 46da68daf891..a5aa89513654 100644 --- a/translations/ja-JP/content/actions/learn-github-actions/contexts.md +++ b/translations/ja-JP/content/actions/learn-github-actions/contexts.md @@ -180,6 +180,7 @@ jobs: | `github.action_path` | `string` | The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action. | | `github.action_ref` | `string` | For a step executing an action, this is the ref of the action being executed. For example, `v2`. | | `github.action_repository` | `string` | For a step executing an action, this is the owner and repository name of the action. For example, `actions/checkout`. | +| `github.action_status` | `string` | For a composite action, the current result of the composite action. | | `github.actor` | `string` | The username of the user that initiated the workflow run. | | `github.api_url` | `string` | The URL of the {% data variables.product.prodname_dotcom %} REST API. | | `github.base_ref` | `string` | ワークフローの実行における `base_ref` またはプルリクエストのターゲットブランチ。 このプロパティは、ワークフローの実行をトリガーするイベントが `pull_request` または `pull_request_target` のいずれかである場合にのみ使用できます。 | @@ -751,10 +752,14 @@ on: deploy_target: required: true type: string + perform_deploy: + required: true + type: boolean jobs: deploy: runs-on: ubuntu-latest + if: ${{ inputs.perform_deploy == 'true' }} steps: - name: Deploy build to target run: deploy --build ${{ inputs.build_id }} --target ${{ inputs.deploy_target }} diff --git a/translations/ja-JP/content/actions/learn-github-actions/environment-variables.md b/translations/ja-JP/content/actions/learn-github-actions/environment-variables.md index a1dc33e6b564..9c22edc99f28 100644 --- a/translations/ja-JP/content/actions/learn-github-actions/environment-variables.md +++ b/translations/ja-JP/content/actions/learn-github-actions/environment-variables.md @@ -147,7 +147,7 @@ The default environment variables that {% data variables.product.prodname_dotcom {%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5338 %} | `GITHUB_REF_NAME` | {% data reusables.actions.ref_name-description %} For example, `feature-branch-1`.| | `GITHUB_REF_PROTECTED` | {% data reusables.actions.ref_protected-description %} | | `GITHUB_REF_TYPE` | {% data reusables.actions.ref_type-description %} {%- endif %} -| `GITHUB_REPOSITORY` | The owner and repository name. `octocat/Hello-World`などです。 | | `GITHUB_REPOSITORY_OWNER` | The repository owner's name. `octocat`などです。 | | `GITHUB_RETENTION_DAYS` | The number of days that workflow run logs and artifacts are kept. For example, `90`. | | `GITHUB_RUN_ATTEMPT` | A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. For example, `3`. | | `GITHUB_RUN_ID` | {% data reusables.actions.run_id_description %} For example, `1658821493`. | | `GITHUB_RUN_NUMBER` | {% data reusables.actions.run_number_description %} For example, `3`. | | `GITHUB_SERVER_URL`| The URL of the {% data variables.product.product_name %} server. For example: `https://{% data variables.product.product_url %}`. | `GITHUB_SHA` | The commit SHA that triggered the workflow. たとえば、`ffac537e6cbbf934b08745a378932722df287a53`です。 | | `GITHUB_WORKFLOW` | The name of the workflow. For example, `My test workflow`. If the workflow file doesn't specify a `name`, the value of this variable is the full path of the workflow file in the repository. | | `GITHUB_WORKSPACE` | The default working directory on the runner for steps, and the default location of your repository when using the [`checkout`](https://github.com/actions/checkout) action. たとえば、`/home/runner/work/my-repo-name/my-repo-name`となります。 | +| `GITHUB_REPOSITORY` | The owner and repository name. `octocat/Hello-World`などです。 | | `GITHUB_REPOSITORY_OWNER` | The repository owner's name. `octocat`などです。 | | `GITHUB_RETENTION_DAYS` | The number of days that workflow run logs and artifacts are kept. For example, `90`. | | `GITHUB_RUN_ATTEMPT` | A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. For example, `3`. | | `GITHUB_RUN_ID` | {% data reusables.actions.run_id_description %} For example, `1658821493`. | | `GITHUB_RUN_NUMBER` | {% data reusables.actions.run_number_description %} For example, `3`. | | `GITHUB_SERVER_URL`| The URL of the {% data variables.product.product_name %} server. For example: `https://{% data variables.product.product_url %}`. | `GITHUB_SHA` | The commit SHA that triggered the workflow. The value of this commit SHA depends on the event that triggered the workflow. For more information, see [Events that trigger workflows](/actions/using-workflows/events-that-trigger-workflows). たとえば、`ffac537e6cbbf934b08745a378932722df287a53`です。 | | `GITHUB_WORKFLOW` | The name of the workflow. For example, `My test workflow`. If the workflow file doesn't specify a `name`, the value of this variable is the full path of the workflow file in the repository. | | `GITHUB_WORKSPACE` | The default working directory on the runner for steps, and the default location of your repository when using the [`checkout`](https://github.com/actions/checkout) action. たとえば、`/home/runner/work/my-repo-name/my-repo-name`となります。 | {%- if actions-runner-arch-envvars %} | `RUNNER_ARCH` | {% data reusables.actions.runner-arch-description %} {%- endif %} diff --git a/translations/ja-JP/content/actions/security-guides/security-hardening-for-github-actions.md b/translations/ja-JP/content/actions/security-guides/security-hardening-for-github-actions.md index e898402413dd..bb025280a4bf 100644 --- a/translations/ja-JP/content/actions/security-guides/security-hardening-for-github-actions.md +++ b/translations/ja-JP/content/actions/security-guides/security-hardening-for-github-actions.md @@ -265,7 +265,7 @@ The attacker server can use the {% ifversion fpt or ghec %}{% data variables.pro {% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes or ghae %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which{% ifversion fpt or ghes > 3.1 or ghae or ghec %}, depending on its settings, can grant {% else %} grants {% endif %}write access to the repository. ワークフローは、環境と必要なレビューを使用して環境シークレットへのアクセスを制御できますが、これらのワークフローは分離された環境では実行されず、セルフホストランナーで実行した場合でも同じリスクの影響を受けやすくなります。 -セルフホストランナーがOrganizationもしくはEnterpriseのレベルで定義されているなら、{% data variables.product.product_name %}は同じランナー上で複数のリポジトリからのワークフローをスケジューリングするかもしれません。 したがって、これらの環境へのセキュリティ侵害は、大きな影響をもたらす可能性があります。 侵害の範囲を狭めるために、セルフホストランナーを個別のグループにまとめることで、境界を作ることができます。 詳しい情報については、「[グループを使用したセルフホストランナーへのアクセスを管理する](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)」を参照してください。 +セルフホストランナーがOrganizationもしくはEnterpriseのレベルで定義されているなら、{% data variables.product.product_name %}は同じランナー上で複数のリポジトリからのワークフローをスケジューリングするかもしれません。 したがって、これらの環境へのセキュリティ侵害は、大きな影響をもたらす可能性があります。 侵害の範囲を狭めるために、セルフホストランナーを個別のグループにまとめることで、境界を作ることができます。 You can restrict what {% if restrict-groups-to-workflows %}workflows, {% endif %}organizations and repositories can access runner groups. 詳しい情報については、「[グループを使用したセルフホストランナーへのアクセスを管理する](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)」を参照してください。 次のように、セルフホストランナーマシンの環境も考慮する必要があります。 - セルフホストランナーとして設定されたマシンにはどのような機密情報が存在するか。 たとえば、SSH 秘密鍵、API アクセストークンなどです。 diff --git a/translations/ja-JP/content/actions/using-workflows/reusing-workflows.md b/translations/ja-JP/content/actions/using-workflows/reusing-workflows.md index 0f5128b7e7cd..22bc8451d8a6 100644 --- a/translations/ja-JP/content/actions/using-workflows/reusing-workflows.md +++ b/translations/ja-JP/content/actions/using-workflows/reusing-workflows.md @@ -307,3 +307,5 @@ For information about using the REST API to query the audit log for an organizat ## 次のステップ To continue learning about {% data variables.product.prodname_actions %}, see "[Events that trigger workflows](/actions/learn-github-actions/events-that-trigger-workflows)." + +{% if restrict-groups-to-workflows %}You can standardize deployments by creating a self-hosted runner group that can only execute a specific reusable workflow. For more information, see "[Managing access to self-hosted runners using groups](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)."{% endif %} diff --git a/translations/ja-JP/content/admin/configuration/configuring-github-connect/managing-github-connect.md b/translations/ja-JP/content/admin/configuration/configuring-github-connect/managing-github-connect.md index 9fb537d8d88b..bb31f2100313 100644 --- a/translations/ja-JP/content/admin/configuration/configuring-github-connect/managing-github-connect.md +++ b/translations/ja-JP/content/admin/configuration/configuring-github-connect/managing-github-connect.md @@ -41,7 +41,9 @@ When you enable {% data variables.product.prodname_github_connect %}, you config To use {% data variables.product.prodname_github_connect %}, you must have an organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} that uses {% data variables.product.prodname_ghe_cloud %}. You may already have {% data variables.product.prodname_ghe_cloud %} included in your plan. {% data reusables.enterprise.link-to-ghec-trial %} {% ifversion ghes %} -To configure a connection, your proxy configuration must allow connectivity to `github.com`, `api.github.com`, and `uploads.github.com`. 詳細は「[アウトバウンド Web プロキシサーバーを設定する](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-an-outbound-web-proxy-server)」を参照してください。 +If your organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} uses IP allow lists, you must add the IP address or network for {% data variables.product.product_location %} to your IP allow list on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Managing allowed IP addresses for your organization](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization)" and "[Enforcing policies for security settings in your enterprise](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)" in the {% data variables.product.prodname_ghe_cloud %} documentation. + +To configure a connection, your proxy configuration must allow connectivity to `github.com`, `api.github.com`, and `uploads.github.com`. For more information, see "[Configuring an outbound web proxy server](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-an-outbound-web-proxy-server)." {% endif %} ## {% data variables.product.prodname_github_connect %} の有効化 @@ -69,7 +71,7 @@ If you're connecting {% data variables.product.product_location %} to an organiz Enterprise owners can disable {% data variables.product.prodname_github_connect %}. -{% data variables.product.prodname_ghe_cloud %}から切断すると、EnterpriseアカウントまたはOrganizationから{% data variables.product.prodname_github_connect %}{% data variables.product.prodname_github_app %}が削除され、{% data variables.product.product_location %}に保存されているクレデンシャルが削除されます。 +When you disconnect from {% data variables.product.prodname_ghe_cloud %}, the {% data variables.product.prodname_github_connect %} {% data variables.product.prodname_github_app %} is deleted from your enterprise account or organization and credentials stored on {% data variables.product.product_location %} are deleted. {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.github-connect-tab %} diff --git a/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md b/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md index 2a335a09626a..7e0c95853ad8 100644 --- a/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md +++ b/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md @@ -33,8 +33,6 @@ redirect_from: {% data reusables.saml.about-saml-access-enterprise-account %}詳細は「[Enterprise アカウントへのユーザの SAML アクセスの表示および管理](/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise)」を参照してください。 -{% data reusables.saml.cannot-update-existing-saml-settings %} - {% data reusables.saml.saml-disabled-linked-identities-removed %} {% data reusables.scim.enterprise-account-scim %} diff --git a/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md b/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md index 3e0912bb251a..8035f65eb219 100644 --- a/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md +++ b/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md @@ -25,7 +25,11 @@ With {% data variables.product.prodname_emus %}, your enterprise uses SAML SSO t After you configure SAML SSO, we recommend storing your recovery codes so you can recover access to your enterprise in the event that your identity provider is unavailable. -{% data reusables.saml.cannot-update-existing-saml-settings %} +{% note %} + +**Note:** When SAML SSO is enabled, the only setting you can update on {% data variables.product.prodname_dotcom %} for your existing SAML configuration is the SAML certificate. If you need to update the Sign on URL or Issuer, you must first disable SAML SSO and then reconfigure SAML SSO with the new settings. + +{% endnote %} ## Configuring SAML single sign-on for {% data variables.product.prodname_emus %} diff --git a/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md b/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md index 9b01b3c5b4e8..240661957982 100644 --- a/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md +++ b/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md @@ -76,6 +76,8 @@ To configure provisioning, the setup user with the **@SHORT-CODE_admin* After you have configured SAML SSO and provisioning, you will be able provision new users on {% data variables.product.prodname_dotcom_the_website %} by assigning users to the {% data variables.product.prodname_emu_idp_application %} application. +{% data reusables.scim.emu-scim-rate-limit %} + You can also automatically manage organization membership by assigning groups to the application and adding them to the "Push Groups" tab in Okta. When the group is provisioned successfully, it will be available to connect to teams in the enterprise's organizations. For more information about managing teams, see "[Managing team memberships with identity provider groups](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/managing-team-memberships-with-identity-provider-groups)." When assigning users, you can use the "Roles" attribute in the {% data variables.product.prodname_emu_idp_application %} application to set a user's role in your enterprise on {% data variables.product.product_name %}. For more information on roles, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/roles-in-an-enterprise)." diff --git a/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md b/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md index cf41f8086781..56a4ac860d07 100644 --- a/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md +++ b/translations/ja-JP/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md @@ -51,6 +51,8 @@ To configure provisioning for your {% data variables.product.prodname_emu_enterp After creating your personal access token and storing it securely, you can configure provisioning on your identity provider. +{% data reusables.scim.emu-scim-rate-limit %} + To configure Azure Active Directory to provision users for your {% data variables.product.prodname_emu_enterprise %}, see [Tutorial: Configure GitHub Enterprise Managed User for automatic user provisioning](https://docs.microsoft.com/en-us/azure/active-directory/saas-apps/github-enterprise-managed-user-provisioning-tutorial) in the Azure AD documentation. To configure Okta to provision users for your {% data variables.product.prodname_emu_enterprise %}, see "[Configuring SCIM provisioning for Enterprise Managed Users with Okta](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users-with-okta)." diff --git a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md index 82d6daa54e07..8424cb504ece 100644 --- a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md +++ b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md @@ -67,7 +67,7 @@ You can restrict network traffic to your enterprise on {% data variables.product {% elsif ghec %} -Enterprise owners can restrict access to assets owned by organizations in an enterprise by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %} +Enterprise owners can restrict access to private assets owned by organizations in an enterprise by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %} {% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %} diff --git a/translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md b/translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md index 299e6da6f06e..7703bbaa4f3c 100644 --- a/translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md +++ b/translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md @@ -47,7 +47,7 @@ If your enterprise uses {% data variables.product.prodname_emus %}, enterprise o {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.people-tab %} -1. 左サイドバーで [**Administrators**] をクリックします。 ![左サイドバーの [Administrators] タブ](/assets/images/help/business-accounts/administrators-tab.png) +{% data reusables.enterprise-accounts.administrators-tab %} 1. Above the list of administrators, click {% ifversion ghec %}**Invite admin**{% elsif ghes %}**Add owner**{% endif %}. {% ifversion ghec %} !["Invite admin" button above the list of enterprise owners](/assets/images/help/business-accounts/invite-admin-button.png) @@ -65,10 +65,11 @@ Enterprise アカウントから他の Enterprise 管理者を削除できるの {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.people-tab %} -1. Next to the username of the person you'd like to remove, click {% octicon "gear" aria-label="The Settings gear" %}, then click **Remove owner**{% ifversion ghec %} or **Remove billing manager**{% endif %}. +{% data reusables.enterprise-accounts.administrators-tab %} +1. Next to the username of the person you'd like to remove, click {% octicon "gear" aria-label="The Settings gear" %}, then click {% ifversion ghes %}**Remove owner**{% elsif ghec %}**Convert to member**{% endif %}. {% ifversion ghec %} ![Enterprise 管理者を削除するためのメニュー オプション付きの設定「歯車」アイコン](/assets/images/help/business-accounts/remove-admin.png) {% elsif ghes %} ![Enterprise 管理者を削除するためのメニュー オプション付きの設定「歯車」アイコン](/assets/images/help/business-accounts/ghes-remove-owner.png) {% endif %} -1. Read the confirmation, then click **Remove owner**{% ifversion ghec %} or **Remove billing manager**{% endif %}. +1. Read the confirmation, then click {% ifversion ghes %}**Remove owner**{% elsif ghec %}**Yes, convert USERNAME to member**{% endif %}. diff --git a/translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md b/translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md index 0d133bdb7f1c..73958923069e 100644 --- a/translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md +++ b/translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md @@ -42,7 +42,6 @@ topics: {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} -{% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.options-tab %} 4. [Dormancy threshold] の下で、ドロップダウンメニューを使って、希望する休眠閾値をクリックします。 ![休眠の閾値のドロップダウンメニュー](/assets/images/enterprise/site-admin-settings/dormancy-threshold-menu.png) diff --git a/translations/ja-JP/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md b/translations/ja-JP/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md index cca33717f5b0..d9f15c122084 100644 --- a/translations/ja-JP/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md +++ b/translations/ja-JP/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md @@ -23,7 +23,6 @@ shortTitle: Recover an account with 2FA **警告**: - {% data reusables.two_fa.support-may-not-help %} -- {% data reusables.accounts.you-must-know-your-password %} {% endwarning %} @@ -33,7 +32,13 @@ shortTitle: Recover an account with 2FA リカバリコードのうち 1 つを使用して、アカウントへのエントリを自動で再取得します。 リカバリコード は、多くの場合、パスワードマネージャまたはご使用のコンピュータのダウンロードフォルダに保存されています。 リカバリコードのデフォルトのファイル名は `github-recovery-codes.txt` です。 リカバリコードの詳しい情報については「[2 要素認証リカバリ方法を設定する](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#downloading-your-two-factor-authentication-recovery-codes)」を参照してください。 -{% data reusables.two_fa.username-password %} +1. 認証を求めるためにユーザ名とパスワードを入力してください。 + + {% warning %} + + **Warning**: {% data reusables.accounts.you-must-know-your-password %} + + {% endwarning %} {% ifversion fpt or ghec %} 1. Under "Having problems?", click **Use a recovery code or request a reset**. diff --git a/translations/ja-JP/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md b/translations/ja-JP/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md index 18e4e716a61d..c60547920a87 100644 --- a/translations/ja-JP/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md +++ b/translations/ja-JP/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md @@ -70,7 +70,7 @@ Microsoft Enterprise Agreement を通じて {% data variables.product.prodname_e ## 利用時間 (分) とストレージ消費量の計算 -{% data reusables.dotcom_billing.pricing_cal %} +{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_actions %} 月末に、{% data variables.product.prodname_dotcom %}はアカウントに含まれている量に対して使用された分とストレージのコストを計算します。 diff --git a/translations/ja-JP/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md b/translations/ja-JP/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md index fca5817da7f3..81918487bd5b 100644 --- a/translations/ja-JP/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md +++ b/translations/ja-JP/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md @@ -38,7 +38,7 @@ topics: If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_codespaces %} usage. 詳しい情報については、「[Azure サブスクリプションを Enterprise に接続する](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)」を参照してください。 {% endif %} -{% data reusables.dotcom_billing.pricing_cal %} +{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_codespaces %} ### Billing for {% data variables.product.prodname_codespaces %} prebuilds diff --git a/translations/ja-JP/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md b/translations/ja-JP/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md index 27867b71cbbe..d9247cd9649e 100644 --- a/translations/ja-JP/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md +++ b/translations/ja-JP/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md @@ -51,7 +51,9 @@ Storage usage is shared with build artifacts produced by {% data variables.produ {% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.25 USD per GB of storage and $0.50 USD per GB of data transfer. -For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD. {% data reusables.dotcom_billing.pricing_cal %} +For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD. + +{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_packages %} At the end of the month, {% data variables.product.prodname_dotcom %} rounds your data transfer to the nearest GB. diff --git a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md index 3354e40e755a..a20e50fb59b0 100644 --- a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md +++ b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md @@ -52,6 +52,13 @@ Organizationを{% data variables.product.prodname_team %}から{% data variables Organizationを{% data variables.product.prodname_ghe_cloud %}から{% data variables.product.prodname_team %}または{% data variables.product.prodname_free_team %}にダウングレードした場合、そのアカウントは高度なセキュリティ、コンプライアンス、およびデプロイメントコントロールにアクセスできなくなります。 {% data reusables.gated-features.more-info %} + +{% note %} + +**Note:** If you're currently trialing {% data variables.product.prodname_ghe_cloud %}, and you don't purchase {% data variables.product.prodname_enterprise %} before the trial ends, your organization will be automatically downgraded to {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %}. 詳しい情報については、「[{% data variables.product.prodname_ghe_cloud %} のトライアルを設定する](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud#finishing-your-trial)」を参照してください。 + +{% endnote %} + {% data reusables.organizations.billing-settings %} 1. "Current plan（現在のプラン）"の下で、[**Edit**] ドロップダウンから必要なダウングレード オプションをクリックします。 ![[Downgrade] ボタン](/assets/images/help/billing/downgrade-option-button.png) {% data reusables.dotcom_billing.confirm_cancel_org_plan %} diff --git a/translations/ja-JP/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md b/translations/ja-JP/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md index 51cb098986a6..dfd32f9e9e42 100644 --- a/translations/ja-JP/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md +++ b/translations/ja-JP/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md @@ -16,6 +16,8 @@ shortTitle: 設定 This guide shows you how your team can get {% data variables.product.prodname_vs %} subscribers licensed and started with {% data variables.product.prodname_enterprise %}. +If you prefer video, you can watch [Setting up your {% data variables.product.prodname_enterprise %} licenses with {% data variables.product.prodname_vs %} subscriptions](https://www.youtube.com/watch?v=P_zBgp_BE_I) on Microsoft Visual Studio's YouTube channel. + ## Roles for {% data variables.product.prodname_vss_ghe %} Before setting up {% data variables.product.prodname_vss_ghe %}, it's important to understand the roles for this combined offering. diff --git a/translations/ja-JP/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md b/translations/ja-JP/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md index 88765f488b1a..ccef24154c61 100644 --- a/translations/ja-JP/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md +++ b/translations/ja-JP/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md @@ -75,7 +75,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr | Name | Description | |----|----| -| `$schema` | **Required.** The URI of the SARIF JSON schema for version 2.1.0. For example, `https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json`. | +| `$schema` | **Required.** The URI of the SARIF JSON schema for version 2.1.0. For example, `https://json.schemastore.org/sarif-2.1.0.json`. | | `version` | **Required.** {% data variables.product.prodname_code_scanning_capc %} only supports SARIF version `2.1.0`. | `runs[]` | **Required.** A SARIF file contains an array of one or more runs. Each run represents a single run of an analysis tool. For more information about a `run`, see the [`run` object](#run-object). @@ -105,7 +105,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr | `properties.tags[]` | **Optional.** An array of strings. {% data variables.product.prodname_code_scanning_capc %} uses `tags` to allow you to filter results on {% data variables.product.prodname_dotcom %}. For example, it is possible to filter to all results that have the tag `security`. | `properties.precision` | **Recommended.** A string that indicates how often the results indicated by this rule are true. For example, if a rule has a known high false-positive rate, the precision should be `low`. {% data variables.product.prodname_code_scanning_capc %} orders results by precision on {% data variables.product.prodname_dotcom %} so that the results with the highest `level`, and highest `precision` are shown first. Can be one of: `very-high`, `high`, `medium`, or `low`. {% ifversion fpt or ghes > 3.1 or ghae or ghec %} | `properties.problem.severity` | **Recommended.** A string that indicates the level of severity of any alerts generated by a non-security query. This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `problem.severity`, and highest `precision` are shown first. Can be one of: `error`, `warning`, or `recommendation`. -| `properties.security-severity` | **Recommended.** A score that indicates the level of severity, between 0.0 and 10.0, for security queries (`@tags` includes `security`). This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `security-severity`, and highest `precision` are shown first. {% data variables.product.prodname_code_scanning_capc %} translates numerical scores as follows: over 9.0 is `critical`, 7.0 to 8.9 is `high`, 4.0 to 6.9 is `medium` and 3.9 or less is `low`. {% endif %} +| `properties.security-severity` | **Recommended.** A string representing a score that indicates the level of severity, between 0.0 and 10.0, for security queries (`@tags` includes `security`). This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `security-severity`, and highest `precision` are shown first. {% data variables.product.prodname_code_scanning_capc %} translates numerical scores as follows: over 9.0 is `critical`, 7.0 to 8.9 is `high`, 4.0 to 6.9 is `medium` and 3.9 or less is `low`. {% endif %} ### `result` object @@ -114,7 +114,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr | Name | Description | |----|----| | `ruleId`| **Optional.** The unique identifier of the rule (`reportingDescriptor.id`). For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object). {% data variables.product.prodname_code_scanning_capc %} uses the rule identifier to filter results by rule on {% data variables.product.prodname_dotcom %}. -| `ruleIndex`| **Optional.** The index of the associated rule (`reportingDescriptor` object) in the tool component `rules` array. For more information, see the [`run` object](#run-object). +| `ruleIndex`| **Optional.** The index of the associated rule (`reportingDescriptor` object) in the tool component `rules` array. For more information, see the [`run` object](#run-object). The allowed range for this property 0 to 2^63 - 1. | `rule`| **Optional.** A reference used to locate the rule (reporting descriptor) for this result. For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object). | `level`| **Optional.** The severity of the result. This level overrides the default severity defined by the rule. {% data variables.product.prodname_code_scanning_capc %} uses the level to filter results by severity on {% data variables.product.prodname_dotcom %}. | `message.text`| **Required.** A message that describes the result. {% data variables.product.prodname_code_scanning_capc %} displays the message text as the title of the result. Only the first sentence of the message will be displayed when visible space is limited. @@ -129,7 +129,7 @@ A location within a programming artifact, such as a file in the repository or a | Name | Description | |----|----| -| `location.id` | **Optional.** A unique identifier that distinguishes this location from all other locations within a single result object. +| `location.id` | **Optional.** A unique identifier that distinguishes this location from all other locations within a single result object. The allowed range for this property 0 to 2^63 - 1. | `location.physicalLocation` | **Required.** Identifies the artifact and region. For more information, see the [`physicalLocation`](#physicallocation-object). | `location.message.text` | **Optional.** A message relevant to the location. @@ -192,7 +192,7 @@ This SARIF output file has example values to show the minimum required propertie ```json { - "$schema": "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json", + "$schema": "https://json.schemastore.org/sarif-2.1.0.json", "version": "2.1.0", "runs": [ { @@ -250,7 +250,7 @@ This SARIF output file has example values to show all supported SARIF properties {% ifversion fpt or ghes > 3.1 or ghae or ghec %} ```json { - "$schema": "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json", + "$schema": "https://json.schemastore.org/sarif-2.1.0.json", "version": "2.1.0", "runs": [ { @@ -503,7 +503,7 @@ This SARIF output file has example values to show all supported SARIF properties {% else %} ```json { - "$schema": "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json", + "$schema": "https://json.schemastore.org/sarif-2.1.0.json", "version": "2.1.0", "runs": [ { diff --git a/translations/ja-JP/content/code-security/guides.md b/translations/ja-JP/content/code-security/guides.md index 4de7301a4e65..1fb4e1e57022 100644 --- a/translations/ja-JP/content/code-security/guides.md +++ b/translations/ja-JP/content/code-security/guides.md @@ -31,6 +31,7 @@ includeGuides: - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/tracking-code-scanning-alerts-in-issues-using-task-lists - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-alerts + - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository @@ -38,6 +39,7 @@ includeGuides: - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow + - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/viewing-code-scanning-logs - /code-security/code-scanning/integrating-with-code-scanning/about-integration-with-code-scanning - /code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning - /code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github @@ -45,6 +47,7 @@ includeGuides: - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-runner-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system + - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-runner-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/troubleshooting-codeql-runner-in-your-ci-system - /code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities @@ -58,6 +61,8 @@ includeGuides: - /code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory - /code-security/repository-security-advisories/withdrawing-a-repository-security-advisory - /code-security/security-overview/about-the-security-overview + - /code-security/security-overview/filtering-alerts-in-the-security-overview + - /code-security/security-overview/viewing-the-security-overview - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates @@ -67,7 +72,6 @@ includeGuides: - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/listing-dependencies-configured-for-version-updates - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-managing-vulnerable-dependencies diff --git a/translations/ja-JP/content/code-security/index.md b/translations/ja-JP/content/code-security/index.md index 4cc88fec9208..ec13e102f5c4 100644 --- a/translations/ja-JP/content/code-security/index.md +++ b/translations/ja-JP/content/code-security/index.md @@ -8,17 +8,17 @@ featuredLinks: guides: - /code-security/getting-started/securing-your-repository - /code-security/getting-started/securing-your-organization - - '{% ifversion fpt %}/code-security/repository-security-advisories/creating-a-repository-security-advisory{% endif %}' - - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif%}' + - '{% ifversion fpt or ghec %}/code-security/repository-security-advisories/creating-a-repository-security-advisory{% endif %}' + - '{% ifversion ghes or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif%}' guideCards: - - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates{% endif %}' - - '{% ifversion fpt %}/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/enabling-and-disabling-dependabot-version-updates{% endif %}' - - '{% ifversion fpt %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif %}' - - '{% ifversion ghes %}/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository{% endif %}' - - '{% ifversion ghes %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}' - - '{% ifversion ghes or ghae %}/code-security/secret-security/configuring-secret-scanning-for-your-repositories{% endif %}' - - '{% ifversion ghae %}/code-security/secure-coding/integrating-with-code-scanning/uploading-a-sarif-file-to-github{% endif %}' - - '{% ifversion ghae %}/code-security/secure-coding/using-codeql-code-scanning-with-your-existing-ci-system{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/enabling-and-disabling-dependabot-version-updates{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif %}' + - '{% ifversion ghes < 3.3 %}/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository{% endif %}' + - '{% ifversion ghes < 3.3 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}' + - '{% ifversion ghes < 3.3 or ghae %}/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories{% endif %}' + - '{% ifversion ghae %}/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github{% endif %}' + - '{% ifversion ghae %}/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system{% endif %}' popular: - '{% ifversion ghes %}/admin/release-notes{% endif %}' - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies @@ -26,11 +26,11 @@ featuredLinks: - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot - - '{% ifversion ghae %}/code-security/secret-security/about-secret-scanning{% endif %}' + - '{% ifversion ghae %}/code-security/secret-scanning/about-secret-scanning{% endif %}' - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies - - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages{% endif %}' - - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow{% endif %}' - - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/running-codeql-code-scanning-in-a-container{% endif %}' + - '{% ifversion ghes < 3.3 or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages{% endif %}' + - '{% ifversion ghes < 3.3 or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow{% endif %}' + - '{% ifversion ghes < 3.3 or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/running-codeql-code-scanning-in-a-container{% endif %}' changelog: label: security-and-compliance versions: diff --git a/translations/ja-JP/content/code-security/security-overview/about-the-security-overview.md b/translations/ja-JP/content/code-security/security-overview/about-the-security-overview.md index 8f73a6bac60f..6bbc0ee124c0 100644 --- a/translations/ja-JP/content/code-security/security-overview/about-the-security-overview.md +++ b/translations/ja-JP/content/code-security/security-overview/about-the-security-overview.md @@ -26,7 +26,7 @@ shortTitle: About security overview ## セキュリティの概要について -セキュリティの概要は、Organizationのセキュリティの状況の高レベルでの表示、あるいは介入が必要な問題のあるリポジトリを特定するために利用できます。 You can view aggregate or repository-specific security information in the security overview. You can also use the security overview to see which which security features are enabled for your repositories and to configure any available security features that are not currently in use. +セキュリティの概要は、Organizationのセキュリティの状況の高レベルでの表示、あるいは介入が必要な問題のあるリポジトリを特定するために利用できます。 You can view aggregate or repository-specific security information in the security overview. You can also use the security overview to see which security features are enabled for your repositories and to configure any available security features that are not currently in use. The security overview indicates whether {% ifversion fpt or ghes > 3.1 or ghec %}security{% endif %}{% ifversion ghae %}{% data variables.product.prodname_GH_advanced_security %}{% endif %} features are enabled for repositories owned by your organization and consolidates alerts for each feature.{% ifversion fpt or ghes > 3.1 or ghec %} Security features include {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_secret_scanning %}, as well as {% data variables.product.prodname_dependabot_alerts %}.{% endif %} For more information about {% data variables.product.prodname_GH_advanced_security %} features, see "[About {% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security)."{% ifversion fpt or ghes > 3.1 or ghec %} For more information about {% data variables.product.prodname_dependabot_alerts %}, see "[About alerts for vulnerable dependencies](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies#dependabot-alerts-for-vulnerable-dependencies)."{% endif %} diff --git a/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md b/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md index 0a1311cc4ac5..e87757c4bf4c 100644 --- a/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md +++ b/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md @@ -7,6 +7,7 @@ redirect_from: - /github/administering-a-repository/about-github-dependabot-version-updates - /github/administering-a-repository/about-dependabot-version-updates - /code-security/supply-chain-security/about-dependabot-version-updates + - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot versions: fpt: '*' ghec: '*' diff --git a/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md b/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md index 84f3386e5755..96d217d37f60 100644 --- a/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md +++ b/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md @@ -15,7 +15,6 @@ topics: - Pull requests children: - /about-dependabot-version-updates - - /upgrading-from-dependabotcom-to-github-native-dependabot - /enabling-and-disabling-dependabot-version-updates - /listing-dependencies-configured-for-version-updates - /managing-pull-requests-for-dependency-updates diff --git a/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md b/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md deleted file mode 100644 index 8439c9df42a9..000000000000 --- a/translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md +++ /dev/null @@ -1,54 +0,0 @@ ---- -title: Upgrading from Dependabot.com to GitHub-native Dependabot -intro: You can upgrade to GitHub-native Dependabot by merging a pull request that will allow your dependencies to continue being updated. -versions: - fpt: '*' - ghec: '*' -type: how_to -topics: - - Repositories - - Dependabot - - Version updates - - Dependencies -redirect_from: - - /code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot -shortTitle: Dependabot.com upgrades ---- -{% warning %} - -Dependabot Preview has been shut down as of August 3rd, 2021. In order to keep getting Dependabot updates, please migrate to GitHub-native Dependabot. - -Open pull requests from Dependabot Preview will remain open, including the pull request to upgrade to GitHub-native Dependabot, but the bot itself will no longer work on your {% data variables.product.prodname_dotcom %} accounts and organizations. - -{% endwarning %} - -## About upgrading from Dependabot Preview to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} - -Dependabot Preview has been built directly into {% data variables.product.prodname_dotcom %}, so you can use {% data variables.product.prodname_dependabot %} alongside all the other functionality in {% data variables.product.prodname_dotcom %} without having to install and use a separate application. By migrating to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, we can also focus on bringing lots of exciting new features to {% data variables.product.prodname_dependabot %}, including more [ecosystem updates](https://github.com/github/roadmap/issues/150), [improved notifications](https://github.com/github/roadmap/issues/133), and {% data variables.product.prodname_dependabot %} support for [{% data variables.product.prodname_ghe_server %}](https://github.com/github/roadmap/issues/86) and [{% data variables.product.prodname_ghe_managed %}](https://github.com/github/roadmap/issues/135). - -## Differences between Dependabot Preview and {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} - -While most of the Dependabot Preview features exist in {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, a few remain unavailable: -- **Live updates:** We hope to bring these back in the future. For now, you can run {% data variables.product.prodname_dotcom %} {% data variables.product.prodname_dependabot %} daily to catch new packages within one day of release. -- **PHP environment variable registries:** For projects that rely on the `ACF_PRO_KEY` environment variable, you may be able to vendor your licensed copy of the Advanced Custom Fields plugin. For an example, see [dependabot/acf-php-example](https://github.com/dependabot/acf-php-example#readme). For other environment variables, you can use {% data variables.product.prodname_actions %} to fetch dependencies from these registries. -- **Auto-merge:** We always recommend verifying your dependencies before merging them; therefore, auto-merge will not be supported for the foreseeable future. For those of you who have vetted your dependencies, or are only using internal dependencies, we recommend adding third-party auto-merge apps, or setting up GitHub Actions to merge. We have provided the [`dependabot/fetch-metadata`](https://github.com/marketplace/actions/fetch-metadata-from-dependabot-prs) action to help developers [enable GitHub's automerge](https://github.com/dependabot/fetch-metadata/#enabling-auto-merge). - -In {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, you can configure all version updates using the configuration file. This file is similar to the Dependabot Preview configuration file with a few changes and improvements that will be automatically included in your upgrade pull request. For more information about the upgrade pull request, see "[Upgrading to GitHub-native Dependabot](/code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot#upgrading-to-github-native-dependabot)". - -To see update logs for {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} that were previously on the Dependabot.com dashboard: - - 1. Navigate to your repository’s **Insights** page. - 2. Click **Dependency graph** to the left. - 3. Click **{% data variables.product.prodname_dependabot %}**. - -For more information about version updates with {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, see "[About Dependabot version updates](/code-security/supply-chain-security/about-dependabot-version-updates)." - -## Upgrading to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} - -Upgrading from Dependabot Preview to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} requires you to merge the *Upgrade to GitHub-native Dependabot* pull request in your repository. This pull request includes the updated configuration file needed for {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}. - -If you are using private repositories, you will have to grant Dependabot access to these repositories in your organization's security and analysis settings. For more information, see "[Allowing Dependabot to access private dependencies](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)". Previously, Dependabot had access to all repositories within an organization, but we implemented this change because it is much safer to use the principle of least privilege for Dependabot. - -If you are using private registries, you will have to add your existing Dependabot Preview secrets to your repository's or organization's "Dependabot secrets". For more information, see "[Managing encrypted secrets for Dependabot](/code-security/supply-chain-security/managing-encrypted-secrets-for-dependabot)". - -If you have any questions or need help migrating, you can view or open issues in the [`dependabot/dependabot-core`](https://github.com/dependabot/dependabot-core/issues/new?assignees=%40dependabot%2Fpreview-migration-reviewers&labels=E%3A+preview-migration&template=migration-issue.md&title=) repository. diff --git a/translations/ja-JP/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/ja-JP/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md index 2dc4bb9fc5fa..c1e0d76330bc 100644 --- a/translations/ja-JP/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md +++ b/translations/ja-JP/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md @@ -54,7 +54,7 @@ Each {% data variables.product.prodname_dependabot %} alert has a unique numeric 1. 脆弱性の詳細を確認し、可能な場合は、自動セキュリティアップデートを含むプルリクエストを確認します。 1. 必要に応じて、アラートに対する {% data variables.product.prodname_dependabot_security_updates %} アップデートがまだ入手できない場合、脆弱性を解決するプルリクエストを作成するには、[**Create {% data variables.product.prodname_dependabot %} security update**] をクリックします。 ![{% data variables.product.prodname_dependabot %} セキュリティアップデートボタンを作成](/assets/images/help/repository/create-dependabot-security-update-button-ungrouped.png) 1. 依存関係を更新して脆弱性を解決する準備ができたら、プルリクエストをマージしてください。 {% data variables.product.prodname_dependabot %} によって発行される各プルリクエストには、{% data variables.product.prodname_dependabot %} の制御に使用できるコマンドの情報が含まれています。 詳しい情報については、「[依存関係の更新に関するプルリクエストを管理する](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands) 」を参照してください。 -1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" drop-down, and click a reason for dismissing the alert. ![[Dismiss] ドロップダウンでアラートを却下する理由を選択する](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png) +1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" dropdown, and click a reason for dismissing the alert.{% if reopen-dependabot-alerts %} Unfixed dismissed alerts can be reopened later.{% endif %} ![[Dismiss] ドロップダウンでアラートを却下する理由を選択する](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png) {% elsif ghes = 3.3 %} {% data reusables.repositories.navigate-to-repo %} @@ -83,6 +83,19 @@ Each {% data variables.product.prodname_dependabot %} alert has a unique numeric 1. **Dependencies（依存関係）**タブの上部のバナーは、脆弱性のある依存関係がすべて解決されるか、そのバナーを閉じるまで表示されます。 バナーの右上にある**Dismiss（却下）**をクリックして、アラートを却下する理由を選択してください。 ![セキュリティバナーを閉じる](/assets/images/enterprise/3.0/dependabot-alert-dismiss.png) {% endif %} +{% if reopen-dependabot-alerts %} + +## Viewing and updating closed alerts + +{% data reusables.repositories.navigate-to-repo %} +{% data reusables.repositories.sidebar-security %} +{% data reusables.repositories.sidebar-dependabot-alerts %} +1. To just view closed alerts, click **Closed**. ![Screenshot showing the "Closed" option](/assets/images/help/repository/dependabot-alerts-closed.png) +1. Click the alert that you would like to view or update. ![Screenshot showing a highlighted dependabot alert](/assets/images/help/repository/dependabot-alerts-select-closed-alert.png) +2. Optionally, if the alert was dismissed and you wish to reopen it, click **Reopen**. ![Screenshot showing the "Reopen" button](/assets/images/help/repository/reopen-dismissed-alert.png) + +{% endif %} + ## 参考リンク - 「[脆弱性のある依存関係に対するアラートについて](/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies)」{% ifversion fpt or ghec or ghes > 3.2 %} diff --git a/translations/ja-JP/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review.md b/translations/ja-JP/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review.md index c1ec057d861d..72a04be9efb3 100644 --- a/translations/ja-JP/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review.md +++ b/translations/ja-JP/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review.md @@ -27,11 +27,12 @@ redirect_from: プルリクエストがリポジトリのデフォルトブランチを対象とし、パッケージマニフェストまたはロックファイルへの変更が含まれている場合は、依存関係のレビューを表示して、何が変更されたかを確認できます。 依存関係のレビューには、ロックファイル内の間接的な依存関係への変更の詳細が含まれ、追加または更新された依存関係のいずれかに既知の脆弱性が含まれているかどうかが示されます。 -{% ifversion fpt or ghec %} -依存関係のレビューは次の項目で確認できます。 +{% ifversion fpt %} +Dependency review is available in all public repositories in all products and cannot be disabled. Dependency review is available in private repositories owned by organizations that use GitHub Enterprise Cloud and have a license for {% data variables.product.prodname_GH_advanced_security %}. 詳しい情報については[{% data variables.product.prodname_ghe_cloud %}のドキュメンテーション](/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review)を参照してください。 + +{% elsif ghec %} +Dependency review is included in {% data variables.product.product_name %} for public repositories. To use dependency review in private repositories owned by organizations, you must have a license for {% data variables.product.prodname_GH_advanced_security %} and have the dependency graph enabled. 詳しい情報については、「[リポジトリの依存関係を調べる](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository)」を参照してください。 -* すべてのパブリックリポジトリ -* 依存関係グラフが有効になっている {% data variables.product.prodname_advanced_security %} ライセンスを持つ Organization が所有するプライベートリポジトリ。 詳しい情報については、「[リポジトリの依存関係を調べる](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository)」を参照してください。 {% elsif ghes or ghae %} Dependency review is available when dependency graph is enabled for {% data variables.product.product_location %} and {% data variables.product.prodname_advanced_security %} is enabled for the organization or repository. {% endif %} @@ -44,6 +45,8 @@ Dependency review is available when dependency graph is enabled for {% data vari 依存関係のレビューは、依存関係グラフと同じ言語とパッケージ管理エコシステムをサポートしています。 詳しい情報については、「[依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)」を参照してください。 +{% ifversion ghec or ghes or ghae %} ## Enabling dependency review -The dependency review feature becomes available when you enable the dependency graph. {% ifversion fpt or ghec %}For more information, see "[Enabling the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph#enabling-the-dependency-graph)."{% endif %}{% ifversion ghes or ghae %}For more information, see "[Enabling the dependency graph for your enterprise](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise)."{% endif %} +The dependency review feature becomes available when you enable the dependency graph. {% ifversion ghec %}For more information, see "[Enabling the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph#enabling-the-dependency-graph)."{% endif %}{% ifversion ghes or ghae %}For more information, see "[Enabling the dependency graph for your enterprise](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise)."{% endif %} +{% endif %} diff --git a/translations/ja-JP/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md b/translations/ja-JP/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md index 791f2084b39a..be3eada2951e 100644 --- a/translations/ja-JP/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md +++ b/translations/ja-JP/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md @@ -24,9 +24,9 @@ Organization のオーナーは、Organization 内のどのユーザが Codespac To use codespaces in your organization, you must do the following: - Ensure that users have [at least write access](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) to the repositories where they want to use a codespace. -- [Enable {% data variables.product.prodname_codespaces %} for users in your organization](#enable-codespaces-for-users-in-your-organization). You can choose allow {% data variables.product.prodname_codespaces %} for selected users or only for specific users. +- [Enable {% data variables.product.prodname_codespaces %} for users in your organization](#enable-codespaces-for-users-in-your-organization). You can choose to allow {% data variables.product.prodname_codespaces %} for selected users or only for specific users. - [Set a spending limit](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces) -- Ensure that your organization does not have an IP address allow list enabled. 詳細は「[ Organization に対する許可 IP アドレスを管理する](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)」を参照してください。 +- Ensure that your organization does not have an IP address allow list enabled. For more information, see "[Managing allowed IP addresses for your organization](/{% ifversion fpt %}enterprise-cloud@latest/{% endif %}organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} By default, a codespace can only access the repository from which it was created. Organization 内の Codespaces で、codespace の作者がアクセスできる他の Organization リポジトリにアクセスできるようにする場合は、「[{% data variables.product.prodname_codespaces %} のアクセスとセキュリティを管理する](/codespaces/managing-codespaces-for-your-organization/managing-access-and-security-for-your-organizations-codespaces)」を参照してください。 diff --git a/translations/ja-JP/content/developers/apps/building-github-apps/managing-allowed-ip-addresses-for-a-github-app.md b/translations/ja-JP/content/developers/apps/building-github-apps/managing-allowed-ip-addresses-for-a-github-app.md index 2467c261fd0f..9741288825c8 100644 --- a/translations/ja-JP/content/developers/apps/building-github-apps/managing-allowed-ip-addresses-for-a-github-app.md +++ b/translations/ja-JP/content/developers/apps/building-github-apps/managing-allowed-ip-addresses-for-a-github-app.md @@ -17,7 +17,7 @@ Enterprise および Organization のオーナーは、IPアドレス許可リ Organization に許可リストがある場合、{% data variables.product.prodname_github_app %} 経由で接続するサードパーティアプリケーションは、以下の両方が真でない限りアクセスを拒否されます。 * {% data variables.product.prodname_github_app %} の作成者が、そのアプリケーションに対し、アプリケーションが動作する IP アドレスを指定した許許可リストを設定していること。 その詳しい方法については後述します。 -* Organizationのオーナーが {% data variables.product.prodname_github_app %}の許可リストにあるアドレスで、自らの許可リストを追加できるようにしていること。 詳細は「[ Organization に対する許可 IP アドレスを管理する](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#allowing-access-by-github-apps)」を参照してください。 +* Organizationのオーナーが {% data variables.product.prodname_github_app %}の許可リストにあるアドレスで、自らの許可リストを追加できるようにしていること。 For more information, see "[Managing allowed IP addresses for your organization](/{% ifversion fpt %}enterprise-cloud@latest/{% endif %}organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} {% data reusables.apps.ip-allow-list-only-apps %} diff --git a/translations/ja-JP/content/developers/webhooks-and-events/events/issue-event-types.md b/translations/ja-JP/content/developers/webhooks-and-events/events/issue-event-types.md index 1ba990bbc830..681a409b55bd 100644 --- a/translations/ja-JP/content/developers/webhooks-and-events/events/issue-event-types.md +++ b/translations/ja-JP/content/developers/webhooks-and-events/events/issue-event-types.md @@ -320,6 +320,16 @@ Issue またはプルリクエストが、別の Issue またはプルリクエ |:-------------------------- |:--------------:|:--------------:| |
    • プルリクエスト
    | **X** | **X** | +## head_ref_force_pushed + +The pull request's HEAD branch was force pushed. + +### 利用の可否 + +| Issue タイプ | Issue イベント API | タイムラインイベント API | +|:-------------------------- |:--------------:|:--------------:| +|
    • プルリクエスト
    | **X** | **X** | + ### イベントオブジェクトのプロパティ {% data reusables.issue-events.issue-event-common-properties %} @@ -694,7 +704,7 @@ Issue がピン留め解除された。 {% data reusables.issue-events.issue-event-common-properties %} -## サブスクライブ解除 +## 通知の受け取りの解除 誰かが Issue またはプルリクエストの通知を受信しないようにサブスクライブ解除した。 diff --git a/translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line.md b/translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-locally-hosted-code-to-github.md similarity index 91% rename from translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line.md rename to translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-locally-hosted-code-to-github.md index fbd44a932f1f..3b931a77f84e 100644 --- a/translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line.md +++ b/translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-locally-hosted-code-to-github.md @@ -1,20 +1,25 @@ --- -title: コマンドラインを使った GitHub への既存のプロジェクトの追加 -intro: '既存の作業を {% data variables.product.product_name %}に置けば、多くの素晴らしい方法で共有とコラボレーションができます。' +title: Adding locally hosted code to GitHub +intro: 'Learn how to add existing source code or repositories to {% data variables.product.product_name %} from the command line using {% data variables.product.prodname_cli %} or Git Commands. Then, share your code and invite others to work with you.' redirect_from: - /articles/add-an-existing-project-to-github - /articles/adding-an-existing-project-to-github-using-the-command-line - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - /github/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line + - /get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-an-existing-project-to-github-using-the-command-line versions: fpt: '*' ghes: '*' ghae: '*' ghec: '*' -shortTitle: Add a project locally +shortTitle: Add locally hosted code --- -## About adding existing projects to {% data variables.product.product_name %} +## About adding existing source code to {% data variables.product.product_name %} + +If you have existing source code or repositories stored locally on your computer or private network you can add them to {% data variables.product.product_name %} by typing commands in a terminal. You can do this by typing Git commands directly, or by using {% data variables.product.prodname_cli %}. + +{% data variables.product.prodname_cli %} は、コンピューターのコマンドラインから {% data variables.product.prodname_dotcom %} を使用するためのオープンソースツールです。 {% data variables.product.prodname_cli %} can simplify the process of adding an existing project to {% data variables.product.product_name %} using the command line. To learn more about {% data variables.product.prodname_cli %}, see "[About {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)." {% tip %} @@ -24,9 +29,7 @@ shortTitle: Add a project locally {% data reusables.repositories.sensitive-info-warning %} -## Adding a project to {% data variables.product.product_name %} with {% data variables.product.prodname_cli %} - -{% data variables.product.prodname_cli %} は、コンピューターのコマンドラインから {% data variables.product.prodname_dotcom %} を使用するためのオープンソースツールです。 {% data variables.product.prodname_cli %} can simplify the process of adding an existing project to {% data variables.product.product_name %} using the command line. To learn more about {% data variables.product.prodname_cli %}, see "[About {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)." +## Adding a local repository to {% data variables.product.product_name %} with {% data variables.product.prodname_cli %} 1. In the command line, navigate to the root directory of your project. 1. ローカルディレクトリを Git リポジトリとして初期化します。 @@ -47,7 +50,7 @@ shortTitle: Add a project locally 1. Alternatively, to skip all the prompts, supply the path to the repository with the `--source` flag and pass a visibility flag (`--public`, `--private`, or `--internal`). For example, `gh repo create --source=. --public`. Specify a remote with the `--remote` flag. To push your commits, pass the `--push` flag. For more information about possible arguments, see the [GitHub CLI manual](https://cli.github.com/manual/gh_repo_create). -## Adding a project to {% data variables.product.product_name %} without {% data variables.product.prodname_cli %} +## Adding a local repository to {% data variables.product.product_name %} using Git {% mac %} diff --git a/translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/index.md b/translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/index.md index 3e5dc71bb48a..3decef2fccdd 100644 --- a/translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/index.md +++ b/translations/ja-JP/content/get-started/importing-your-projects-to-github/importing-source-code-to-github/index.md @@ -18,7 +18,7 @@ children: - /importing-a-repository-with-github-importer - /updating-commit-author-attribution-with-github-importer - /importing-a-git-repository-using-the-command-line - - /adding-an-existing-project-to-github-using-the-command-line + - /adding-locally-hosted-code-to-github - /source-code-migration-tools shortTitle: Import code to GitHub --- diff --git a/translations/ja-JP/content/index.md b/translations/ja-JP/content/index.md index 125989634267..1825c56e8272 100644 --- a/translations/ja-JP/content/index.md +++ b/translations/ja-JP/content/index.md @@ -9,7 +9,7 @@ featuredLinks: popular: - /pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests - /authentication - - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line + - /get-started/importing-your-projects-to-github/importing-source-code-to-github/adding-locally-hosted-code-to-github - /get-started/getting-started-with-git/managing-remote-repositories - /pages versions: '*' diff --git a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/about-projects.md b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/about-projects.md index 7f9fccd8f3a1..c99725e7a5b1 100644 --- a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/about-projects.md +++ b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/about-projects.md @@ -29,7 +29,7 @@ topics: - タスクの複雑さを追跡する数値フィールド - タスクの優先度が低、中、高なのかを追跡するための単一選択フィールド - クイックノートを追跡するテキストフィールド -- 週ごとの作業を計画するための繰り返しフィールド +- 休憩のサポートを含め、作業を週単位で計画するための繰り返しフィールド ### 様々な観点からプロジェクトを見る diff --git a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md index db0917161a2e..7965a203d6c6 100644 --- a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md +++ b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/best-practices-for-managing-projects.md @@ -75,7 +75,7 @@ IssueとPull Requestには、コラボレータと容易にコミュニケーシ 様々なフィールドタイプを活用して、要求を満たしてください。 -繰り返しフィールドを使って、作業をスケジュールしたり、タイムラインを作成したりしてください。 繰り返しをグループ化して、アイテムが繰り返し間でバランスしているかを見たり、あるいは繰り返しの1つに焦点を当てるためにフィルタリングできます。 繰り返しフィールドを使えば、過去の繰り返しで完了した作業を見ることもでき、それを速度の計画とチームの成果への反映に役立てられます。 +繰り返しフィールドを使って、作業をスケジュールしたり、タイムラインを作成したりしてください。 繰り返しをグループ化して、アイテムが繰り返し間でバランスしているかを見たり、あるいは繰り返しの1つに焦点を当てるためにフィルタリングできます。 繰り返しフィールドを使えば、過去の繰り返しで完了した作業を見ることもでき、それを速度の計画とチームの成果への反映に役立てられます。 繰り返しフィールドは、あなたとあなたのチームが繰り返しから離れる時間を取っている時を示す休憩もサポートします。 詳しい情報については「[プロジェクトでの繰り返しの管理](/issues/trying-out-the-new-projects-experience/managing-iterations)」を参照してください。 単一の選択フィールドを利用して、事前設定された値のリストに基づき、タスクに関する情報を追跡してください。 たとえば、優先度やプロジェクトのフェーズを追跡してください。 値は事前設定されたリストから選択されるので、グループ化や特定の値のアイテムに集中するためのフィルタリングが容易です。 diff --git a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/creating-a-project.md b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/creating-a-project.md index 7b334b05152d..a735c4b7eb00 100644 --- a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/creating-a-project.md +++ b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/creating-a-project.md @@ -131,7 +131,7 @@ topics: - 数値: 値は数値でなければなりません。 - 日付: 値は日付でなければなりません。 - 単一選択: 値は指定された値の集合から選択されなければなりません。 -- 繰り返し: 値は日付範囲のセット（繰り返し）から選択しなければなりません。 過去の繰り返しは、自動的に"completed"としてマークされ、現在の日付範囲をカバーする繰り返しは"current"としてマークされます。 +- 繰り返し: 値は日付範囲のセット（繰り返し）から選択しなければなりません。 過去の繰り返しは、自動的に"completed"としてマークされ、現在の日付範囲をカバーする繰り返しは"current"としてマークされます。 詳しい情報については「[プロジェクトでの繰り返しの管理](/issues/trying-out-the-new-projects-experience/managing-iterations)」を参照してください。 1. {% data reusables.projects.open-command-palette %} "Create new field"のどこかを入力し始めてください。 コマンドパレットに"Create new field"が表示されたら、選択してください。 2. あるいは、右端のフィールドヘッダの{% octicon "plus" aria-label="the plus icon" %}をクリックしてください。 プロジェクトのフィールドのドロップダウンメニューが表示されます。 **New field（新規フィールド）**をクリックしてください。 @@ -146,7 +146,9 @@ topics: {% data reusables.projects.project-settings %} 1. **Fields（フィールド）**の下で、編集したいフィールドを選択してください。 1. 単一選択フィールドでは、選択肢を追加、削除、並び替えができます。 -2. 繰り返しフィールドでは、繰り返しの追加や削除、繰り返し名の変更、繰り返しの開始日と期間を変更できます。 +1. 繰り返しフィールドでは、繰り返しの追加や削除、繰り返し名の変更、繰り返しの開始日と期間を変更できます。 + + 繰り返しフィールドの変更に関する詳しい情報については「[プロジェクトでの繰り返しの管理](/issues/trying-out-the-new-projects-experience/managing-iterations)」を参照してください。 ## ビューのカスタマイズ diff --git a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md index 7680675cc103..e7dabf48c2d4 100644 --- a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md +++ b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md @@ -125,12 +125,7 @@ topics: テーブルの上部にある{% octicon "filter" aria-label="the filter icon" %}をクリックして、"Filter by keyword or by field（キーワードもしくはフィールドでフィルタ）"バーを表示させてください。 フィルタに使いたいフィールド名及び値を入力し始めてください。 入力していくと、利用できる値が表示されます。 -- 複数の値でフィルタリングするには、値をカンマで区切ってください。 たとえば`label:"good first issue",bug`とすれば、ラベルが`good first issue`か`bug`になっているすべてのIssueがリストされます。 -- 特定の値が欠けているものをフィルタリングするには、フィルタの前に`-`を置いてください。 たとえば`-label:"bug"`とすれば、`bug`というラベルを持たないアイテムだけが表示されます。 -- すべての値が欠けているものをフィルタリングするには、`no:`に続けてフィールド名を入力してください。 たとえば`no:assignee`とすれば、アサインされた人のないアイテムだけが表示されます。 -- 状態でフィルタリングするには、`is:`を入力してください。 たとえば`is: issue`あるいは`is:open`としてください。 -- 複数のフィルタは空白で区切ってください。 たとえば`status:"In progress" -label:"bug" no:assignee`とすれば、ステータスが`In progress`であり、`bug`というラベルを持たず、アサインされた人がいないアイテムだけが表示されます。 -- 繰り返しフィールドで現在の繰り返しだけをフィルタリングするには、`@current`を使ってください。 たとえば`sprint:@current`としてください。 +{% data reusables.projects.projects-filters %} あるいは、コマンドパレットを使用してください。 @@ -141,6 +136,8 @@ topics: ボードレイアウトでは、アイテムデータをクリックして、その値を持つアイテムにフィルタリングできます。 たとえば、アサインされた人をクリックして、そのアサインされた人のアイテムだけを表示させられます。 このフィルタを削除するには、そのアイテムデータをもう一度クリックします。 +詳しい情報については「[プロジェクトのフィルタリング](/issues/trying-out-the-new-projects-experience/filtering-projects)」を参照してください。 + ## プロジェクトビューの作成 プロジェクトビューを使うと、プロジェクトの特定の側面を素早く見ることができます。 それぞれのビューは、プロジェクト内の個別のタブに表示されます。 diff --git a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/filtering-projects.md b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/filtering-projects.md new file mode 100644 index 000000000000..f6ab59464737 --- /dev/null +++ b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/filtering-projects.md @@ -0,0 +1,26 @@ +--- +title: プロジェクト（ベータ）のフィルタリング +intro: 特定の情報に集中するために、プロジェクトをフィルタリングできます。 +allowTitleToDifferFromFilename: true +miniTocMaxHeadingLevel: 2 +versions: + fpt: '*' + ghec: '*' +topics: + - Projects + - Organizations +--- + +{% data reusables.projects.projects-beta %} + +## プロジェクトのフィルタリングについて + +Issueにアサインされた人やラベルといったアイテムのメタデータやプロジェクトのフィールドに対するフィルタを使って、ビューをカスタマイズできます。 フィルタを組み合わせて、ビューとして保存できます。 詳しい情報については「[プロジェクトのビューのカスタマイズ](/issues/trying-out-the-new-projects-experience/customizing-your-project-views)」を参照してください。 + +プロジェクトをフィルタするには、{% octicon "filter" aria-label="The Filter icon" %}をクリックし、フィルタリングしたいフィールドとその値を入力していってください。 入力していくと、利用できる値が表示されます。 コマンドパレットを開いて"Filter by"と入力し、利用可能なフィルタから選択することもできます。 + +同じフィルタがインサイトでも利用でき、チャートを作成するのに使われたのと同じデータをフィルタリングできます。 詳しい情報については「[プロジェクトでのインサイトの利用](/issues/trying-out-the-new-projects-experience/using-insights-with-projects)」を参照してください。 + +## プロジェクトのフィルタリングの構文 + +{% data reusables.projects.projects-filters %} diff --git a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/index.md b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/index.md index d50ba59b8db7..5de8e435338f 100644 --- a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/index.md +++ b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/index.md @@ -12,11 +12,14 @@ children: - /about-projects - /quickstart - /creating-a-project + - /managing-iterations - /customizing-your-project-views + - /filtering-projects - /using-the-api-to-manage-projects - /automating-projects - /managing-the-visibility-of-your-projects - /managing-access-to-projects + - /using-insights-with-projects - /best-practices-for-managing-projects --- diff --git a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/managing-iterations.md b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/managing-iterations.md new file mode 100644 index 000000000000..c3f18e791a01 --- /dev/null +++ b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/managing-iterations.md @@ -0,0 +1,64 @@ +--- +title: プロジェクト（ベータ）での繰り返しの管理 +intro: 今後の作業を計画し、アイテムをグループ化するために、繰り返しを作成できます。 +allowTitleToDifferFromFilename: true +miniTocMaxHeadingLevel: 2 +versions: + fpt: '*' + ghec: '*' +topics: + - Projects + - Organizations +--- + +{% data reusables.projects.projects-beta %} + +## 繰り返しについて + +繰り返しフィールドを作成して、アイテムを特定の繰り返し時間ブロックに関連づけることができます。 繰り返しは任意の長さに設定でき、休憩を含められ、名前と日付の範囲を変更するために個別に編集できます。 プロジェクトでは、繰り返しでグループ化を行い、今後の作業のバランスを視覚化し、フィルタを使って繰り返しの1つに焦点を当て、繰り返しで並べ替えできます。 + +最初に繰り返しフィールドを作成すると、3回の繰り返しが自動的に作成されます。 プロジェクトの設定ページから、繰り返しを追加したり、他の変更をしたりできます。 + +![Screenshot showing the settings for an iteration field](/assets/images/help/issues/iterations-example.png) + +## 繰り返しフィールの作成 + +コマンドパレットを使って、あるいはプロジェクトのインターフェースを通じて繰り返しフィールドを作成できます。 + +1. {% data reusables.projects.open-command-palette %} "Create new field"のどこかを入力し始めてください。 コマンドパレットに"Create new field"が表示されたら、選択してください。 + + あるいは、右端のフィールドヘッダの{% octicon "plus" aria-label="the plus icon" %}をクリックしてください。 プロジェクトのフィールドのドロップダウンメニューが表示されます。 **New field（新規フィールド）**をクリックしてください。 +1. テキストボックスに新しい繰り返しフィールドの名前を入力してください。 +1. 下のドロップダウンメニューを選択し、**Iteration（繰り返し）**を選択してください。 +1. あるいは、開始日を現在の日付から変更したい場合には、"Starts on（開始）"の隣のカレンダードロップダウンを選択し、新しい開始日をクリックしてください。 +2. それぞれの繰り返しの期間を変更するには、新しい数値を入力し、ドロップダウンを選択して**days（日）**もしくは**weeks（週）**をクリックしてください。 +3. **Save & create（保存して作成）**をクリックしてください。 + +## 新しい繰り返しの追加 + +{% data reusables.projects.project-settings %} +1. 調整したい繰り返しフィールドの名前をクリックしてください。 +1. 同じ期間の新しい繰り返しを追加したいなら、**Add iteration（繰り返しの追加）**をクリックしてください。 +1. あるいは、新しい繰り返しの期間と開始時点をカスタマイズしたいなら、"Add iteration（繰り返しの追加）"の隣の{% octicon "triangle-down" aria-label="The triangle icon" %}をクリックし、開始日と期間を選択し、**Add（追加）**をクリックしてください。 +1. [**Save changes**] をクリックします。 + +## 繰り返しの編集 + +繰り返しは、プロジェクトの設定で編集できます。 繰り返しフィールドの設定には、フィールドの表ヘッダ内の{% octicon "triangle-down" aria-label="The triangle icon" %}をクリックし、**Edit values（値の編集）**をクリックしてもアクセスできます。 + +{% data reusables.projects.project-settings %} +1. 調整したい繰り返しフィールドの名前をクリックしてください。 +1. 繰り返しの名前を変更するには、名前をクリックして入力していってください。 +1. To change the date or duration of an iteration, click on the date to open the calendar. Click on the start day, then click the end day, and then click **Apply**. +1. Optionally, to delete an iteration, click {% octicon "trash" aria-label="The trash icon" %}. +1. [**Save changes**] をクリックします。 + +## Inserting a break + +You can insert breaks into your iterations to communicate when you are taking time away from scheduled work. The duration of a new break defaults to the length of the most recently created iteration. + +{% data reusables.projects.project-settings %} +1. 調整したい繰り返しフィールドの名前をクリックしてください。 +2. On the dividing line above an iteration and to the right, click **Insert break**. ![Screenshot showing location of "Insert break" button](/assets/images/help/issues/iteration-insert-break.png) +3. Optionally, to change the duration of the break, click on the date to open the calendar. Click on the start day, then click the end day, and then click **Apply**. +4. [**Save changes**] をクリックします。 diff --git a/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md new file mode 100644 index 000000000000..1bf6a376f81d --- /dev/null +++ b/translations/ja-JP/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md @@ -0,0 +1,29 @@ +--- +title: Using insights with projects (beta) +intro: You can view and customize charts that are built from your project's data. +allowTitleToDifferFromFilename: true +miniTocMaxHeadingLevel: 2 +versions: + fpt: '*' + ghec: '*' +topics: + - Projects + - Organizations +--- + +{% data reusables.projects.insights-alpha %} + +## About insights + +You can use insights to view and customize charts that use the items added to your project as their source data. The default "Burn up" chart shows item status over time, allowing you to visualize progress. You can apply filters to the default chart and also customize and save charts that are available to everyone that can view the project. + +![Screenshot showing an example of the default burn up chart for the current iteration](/assets/images/help/issues/burnup-example.png) + +## Creating a chart + +1. Navigate to your project. +2. In the top-right, click {% octicon "graph" aria-label="the graph icon" %} to access insights. This feature is currently in a private preview and is not yet available to all organizations. If insights is not yet enabled for your organization, the {% octicon "graph" aria-label="the graph icon" %} icon will not be available. +3. In the menu on the left, click **New chart**. +4. Optionally, to change the name of the new chart, click {% octicon "triangle-down" aria-label="The triangle icon" %}, type a new name, and press Return. +5. Above the chart, type filters to change the data used to build the chart. 詳しい情報については「[プロジェクトのフィルタリング](/issues/trying-out-the-new-projects-experience/filtering-projects)」を参照してください。 +6. To the right of the filter text box, click **Save changes**. diff --git a/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md b/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md index 34d3c0388ec5..81912bf754b5 100644 --- a/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md +++ b/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md @@ -1,25 +1,30 @@ --- title: Organization に対する許可 IP アドレスを管理する -intro: 接続を許可される IP アドレスのリストを設定することで、Organization のアセットに対するアクセスを制限することができます。 -product: '{% data reusables.gated-features.allowed-ip-addresses %}' +intro: 接続を許可される IP アドレスのリストを設定することで、Organizationのプライベートアセットに対するアクセスを制限することができます。 redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization - /organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization versions: - fpt: '*' ghae: '*' ghec: '*' topics: - Organizations - Teams shortTitle: 許可 IPアドレスの管理 +permissions: Organization owners can manage allowed IP addresses for an organization. --- -Organization のオーナーは、Organization に対する許可 IP アドレスを管理できます。 - ## 許可 IP アドレスについて -特定の IP アドレスに対する許可リストを設定することで、Organization アセットへのアクセスを制限できます。 {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %} +特定の IP アドレスに対する許可リストを設定することで、Organizationのプライベートアセットへのアクセスを制限できます。 {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %} + +{% ifversion ghec %} +{% note %} + +**Note:** Only organizations that use {% data variables.product.prodname_ghe_cloud %} can use IP allow lists. {% data reusables.enterprise.link-to-ghec-trial %} + +{% endnote %} +{% endif %} {% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %} @@ -27,7 +32,7 @@ Organization のオーナーは、Organization に対する許可 IP アドレ 許可リストをセットアップした場合は、Organizationにインストールした{% data variables.product.prodname_github_apps %}に設定されたIPアドレスを自動的に許可リストに追加するかを選択することもできます。 {% data variables.product.prodname_github_app %}の作者は、自分のアプリケーションのための許可リストを、アプリケーションが実行されるIPアドレスを指定して設定できます。 それらの許可リストを継承すれば、アプリケーションからの接続リクエストが拒否されるのを避けられます。 詳しい情報については「[{% data variables.product.prodname_github_apps %}によるアクセスの許可](#allowing-access-by-github-apps)」を参照してください。 -Enterprise アカウントで Organization に対して許可される IP アドレスを設定することもできます。 詳しい情報については、「[Enterprise にセキュリティ設定のポリシーを適用する](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise)」以下を参照してください。 +Enterprise アカウントで Organization に対して許可される IP アドレスを設定することもできます。 詳しい情報については、「[Enterprise にセキュリティ設定のポリシーを適用する](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)」以下を参照してください。 ## 許可 IP アドレスを追加する diff --git a/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md index f4fe6129155c..c8eb80ee20cd 100644 --- a/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md +++ b/translations/ja-JP/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md @@ -52,9 +52,9 @@ To search for specific events, use the `action` qualifier in your query. Actions | [`discussion_post_reply`](#discussion_post_reply-category-actions) | Contains all activities related to replies to discussions posted to a team page.{% ifversion fpt or ghes or ghec %} | [`enterprise`](#enterprise-category-actions) | Contains activities related to enterprise settings. | {% endif %} | [`hook`](#hook-category-actions) | Contains all activities related to webhooks. -| [`integration_installation_request`](#integration_installation_request-category-actions) | Contains all activities related to organization member requests for owners to approve integrations for use in the organization. | -| [`ip_allow_list`](#ip_allow_list) | Contains activities related to enabling or disabling the IP allow list for an organization. -| [`ip_allow_list_entry`](#ip_allow_list_entry) | Contains activities related to the creation, deletion, and editing of an IP allow list entry for an organization. +| [`integration_installation_request`](#integration_installation_request-category-actions) | Contains all activities related to organization member requests for owners to approve integrations for use in the organization. |{% ifversion ghec or ghae %} +| [`ip_allow_list`](#ip_allow_list-category-actions) | Contains activities related to enabling or disabling the IP allow list for an organization. +| [`ip_allow_list_entry`](#ip_allow_list_entry-category-actions) | Contains activities related to the creation, deletion, and editing of an IP allow list entry for an organization.{% endif %} | [`issue`](#issue-category-actions) | Contains activities related to deleting an issue. {% ifversion fpt or ghec %} | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %}{% ifversion fpt or ghes or ghec %} @@ -360,6 +360,7 @@ An overview of some of the most common actions that are recorded as events in th | `create` | Triggered when an organization member requests that an organization owner install an integration for use in the organization. | `close` | Triggered when a request to install an integration for use in an organization is either approved or denied by an organization owner, or canceled by the organization member who opened the request. +{% ifversion ghec or ghae %} ### `ip_allow_list` category actions | Action | Description @@ -376,6 +377,7 @@ An overview of some of the most common actions that are recorded as events in th | `create` | Triggered when an IP address was added to an IP allow list. | `update` | Triggered when an IP address or its description was changed. | `destroy` | Triggered when an IP address was deleted from an IP allow list. +{% endif %} ### `issue` category actions diff --git a/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md b/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md index 15285d82099e..8f0bc4622cab 100644 --- a/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md +++ b/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md @@ -22,7 +22,11 @@ permissions: People with admin access to a repository can add an outside collabo {% data reusables.organizations.outside-collaborators-use-seats %} +{% ifversion fpt %} +{% data variables.product.prodname_ghe_cloud %}を使うOrganizationは、コラボレータの招待機能を制限できます。 詳しい情報については、{% data variables.product.prodname_ghe_cloud %}のドキュメンテーションの「[外部のコラボレータの追加権限の設定](/enterprise-cloud@latest/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)」を参照してください。 +{% else %} Organozationのオーナーは、コラボレータを招待する機能を制限できます。 詳しい情報については「[外部のコラボレータを追加する権限の設定](/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)」を参照してください。 +{% endif %} {% ifversion ghes %} リポジトリに外部コラボレータとして誰かを追加するには、その人は{% data variables.product.product_location %}上にユーザアカウントを持っていなければなりません。 EnterpriseがSAMLやLDAPのような外部の認証システムを使っているなら、アカウントを作成するためには追加したい人はそのシステムを通じてサインインしなければなりません。 その人がその認証システムにアクセスできず、Enterpriseではビルトイン認証が有効化されているなら、サイト管理者がその人にユーザアカウントを作成できます。 詳しい情報については「[ビルトイン認証の利用](/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-built-in-authentication#inviting-users)」を参照してください。 @@ -32,10 +36,6 @@ Organozationのオーナーは、コラボレータを招待する機能を制 Organizationで2要素認証が必須になっているなら、すべての外部のコラボレータはリポジトリでの共同作業への招待を承認する前に、2要素認証を有効化していなければなりません。 詳しい情報日手は「[Organizationでの2要素認証の必須化](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/requiring-two-factor-authentication-in-your-organization)」を参照してください。 {% endif %} -{% ifversion fpt %} -Teamのコラボレーション機能をさらにサポートするために、保護されたブランチやプライベートリポジトリでのコードオーナーのような機能を含む{% data variables.product.prodname_ghe_cloud %}にアップグレードできます。 {% data reusables.enterprise.link-to-ghec-trial %} -{% endif %} - ## リポジトリへの外部のコラボレータの追加 {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %} diff --git a/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md b/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md index 05cdb16c16cb..6605f6f51ff5 100644 --- a/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md +++ b/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md @@ -60,94 +60,98 @@ Organizationレベルの設定の管理に加えて、Organizationのオーナ {% endnote %} {% endif %} -| リポジトリアクション | Read | Triage | Write | Maintain | Admin | -|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:------:|:-----:|:--------:|:---------------------------------------------:| -| リポジトリへの[個人](/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository)、[Team](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)、[外部のコラボレータ](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization)のアクセス管理 | | | | | **X** | -| 個人または Team の割り当てリポジトリからのプル | **X** | **X** | **X** | **X** | **X** | -| 個人または Team の割り当てリポジトリのフォーク | **X** | **X** | **X** | **X** | **X** | -| 自分のコメントの編集および削除 | **X** | **X** | **X** | **X** | **X** | -| Issue のオープン | **X** | **X** | **X** | **X** | **X** | -| 自分でオープンした Issue のクローズ | **X** | **X** | **X** | **X** | **X** | -| 自分でクローズした Issue を再オープン | **X** | **X** | **X** | **X** | **X** | -| 自分に割り当てられた Issue の取得 | **X** | **X** | **X** | **X** | **X** | -| Team の割り当てリポジトリのフォークからのプルリクエストの送信 | **X** | **X** | **X** | **X** | **X** | -| プルリクエストについてのレビューのサブミット | **X** | **X** | **X** | **X** | **X** | -| 公開済みリリースの表示 | **X** | **X** | **X** | **X** | **X** |{% ifversion fpt or ghec %} -| [[GitHub Actions workflow runs](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run)] の表示 | **X** | **X** | **X** | **X** | **X** +| リポジトリアクション | Read | Triage | Write | Maintain | Admin | +|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:------:|:-----:|:--------:|:-------------------------------------------------------------------:| +| リポジトリへの[個人](/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository)、[Team](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)、[外部のコラボレータ](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization)のアクセス管理 | | | | | **X** | +| 個人または Team の割り当てリポジトリからのプル | **X** | **X** | **X** | **X** | **X** | +| 個人または Team の割り当てリポジトリのフォーク | **X** | **X** | **X** | **X** | **X** | +| 自分のコメントの編集および削除 | **X** | **X** | **X** | **X** | **X** | +| Issue のオープン | **X** | **X** | **X** | **X** | **X** | +| 自分でオープンした Issue のクローズ | **X** | **X** | **X** | **X** | **X** | +| 自分でクローズした Issue を再オープン | **X** | **X** | **X** | **X** | **X** | +| 自分に割り当てられた Issue の取得 | **X** | **X** | **X** | **X** | **X** | +| Team の割り当てリポジトリのフォークからのプルリクエストの送信 | **X** | **X** | **X** | **X** | **X** | +| プルリクエストについてのレビューのサブミット | **X** | **X** | **X** | **X** | **X** | +| 公開済みリリースの表示 | **X** | **X** | **X** | **X** | **X** |{% ifversion fpt or ghec %} +| [[GitHub Actions workflow runs](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run)] の表示 | **X** | **X** | **X** | **X** | **X** {% endif %} -| パブリックリポジトリでのWikiの編集 | **X** | **X** | **X** | **X** | **X** | -| プライベートリポジトリのWikiの編集 | | | **X** | **X** | **X** |{% ifversion fpt or ghec %} -| [悪用あるいはスパムの可能性があるコンテンツのレポート](/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam) | **X** | **X** | **X** | **X** | **X** +| パブリックリポジトリでのWikiの編集 | **X** | **X** | **X** | **X** | **X** | +| プライベートリポジトリのWikiの編集 | | | **X** | **X** | **X** |{% ifversion fpt or ghec %} +| [悪用あるいはスパムの可能性があるコンテンツのレポート](/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam) | **X** | **X** | **X** | **X** | **X** {% endif %} -| ラベルの適用/却下 | | **X** | **X** | **X** | **X** | -| ラベルの作成、編集、削除 | | | **X** | **X** | **X** | -| すべての Issue およびプルリクエストのクローズ、再オープン、割り当て | | **X** | **X** | **X** | **X** | -| [プルリクエストの自動マージの有効化または無効化](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository) | | | **X** | **X** | **X** | -| マイルストーンの適用 | | **X** | **X** | **X** | **X** | -| [重複した Issue とプルリクエスト](/articles/about-duplicate-issues-and-pull-requests)のマーク付け | | **X** | **X** | **X** | **X** | -| [プルリクエストのレビュー](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review)の要求 | | **X** | **X** | **X** | **X** | -| [Pull Request](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)のマージ | | | **X** | **X** | **X** | -| 個人または Team の割り当てリポジトリへのプッシュ (書き込み) | | | **X** | **X** | **X** | -| コミット、プルリクエスト、Issue についての他者によるコメントの編集と削除 | | | **X** | **X** | **X** | -| [他者によるコメントの非表示](/communities/moderating-comments-and-conversations/managing-disruptive-comments) | | | **X** | **X** | **X** | -| [会話のロック](/communities/moderating-comments-and-conversations/locking-conversations) | | | **X** | **X** | **X** | -| Issue の移譲 (詳細は「[他のリポジトリへ Issue を移譲する](/articles/transferring-an-issue-to-another-repository)」を参照) | | | **X** | **X** | **X** | -| [リポジトリに指定されたコードオーナーとしてのアクション](/articles/about-code-owners) | | | **X** | **X** | **X** | -| [プルリクエストのドラフトに、レビューの準備ができたことを示すマークを付ける](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** | -| [プルリクエストをドラフトに変換する](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** | -| プルリクエストのマージ可能性に影響するレビューのサブミット | | | **X** | **X** | **X** | -| プルリクエストに[提案された変更を適用する](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request) | | | **X** | **X** | **X** | -| [ステータスチェック](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)の作成 | | | **X** | **X** | **X** |{% ifversion fpt or ghec %} -| [GitHub Actions ワークフロー](/actions/automating-your-workflow-with-github-actions/) の作成、編集、実行、再実行、キャンセル | | | **X** | **X** | **X** +| ラベルの適用/却下 | | **X** | **X** | **X** | **X** | +| ラベルの作成、編集、削除 | | | **X** | **X** | **X** | +| すべての Issue およびプルリクエストのクローズ、再オープン、割り当て | | **X** | **X** | **X** | **X** | +| [プルリクエストの自動マージの有効化または無効化](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository) | | | **X** | **X** | **X** | +| マイルストーンの適用 | | **X** | **X** | **X** | **X** | +| [重複した Issue とプルリクエスト](/articles/about-duplicate-issues-and-pull-requests)のマーク付け | | **X** | **X** | **X** | **X** | +| [プルリクエストのレビュー](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review)の要求 | | **X** | **X** | **X** | **X** | +| [Pull Request](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)のマージ | | | **X** | **X** | **X** | +| 個人または Team の割り当てリポジトリへのプッシュ (書き込み) | | | **X** | **X** | **X** | +| コミット、プルリクエスト、Issue についての他者によるコメントの編集と削除 | | | **X** | **X** | **X** | +| [他者によるコメントの非表示](/communities/moderating-comments-and-conversations/managing-disruptive-comments) | | | **X** | **X** | **X** | +| [会話のロック](/communities/moderating-comments-and-conversations/locking-conversations) | | | **X** | **X** | **X** | +| Issue の移譲 (詳細は「[他のリポジトリへ Issue を移譲する](/articles/transferring-an-issue-to-another-repository)」を参照) | | | **X** | **X** | **X** | +| [リポジトリに指定されたコードオーナーとしてのアクション](/articles/about-code-owners) | | | **X** | **X** | **X** | +| [プルリクエストのドラフトに、レビューの準備ができたことを示すマークを付ける](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** | +| [プルリクエストをドラフトに変換する](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** | +| プルリクエストのマージ可能性に影響するレビューのサブミット | | | **X** | **X** | **X** | +| プルリクエストに[提案された変更を適用する](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request) | | | **X** | **X** | **X** | +| [ステータスチェック](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)の作成 | | | **X** | **X** | **X** |{% ifversion fpt or ghec %} +| [GitHub Actions ワークフロー](/actions/automating-your-workflow-with-github-actions/) の作成、編集、実行、再実行、キャンセル | | | **X** | **X** | **X** {% endif %} -| リリースの作成と編集 | | | **X** | **X** | **X** | -| ドラフトリリースの表示 | | | **X** | **X** | **X** | -| リポジトリの説明の編集 | | | | **X** | **X** |{% ifversion fpt or ghae or ghec %} -| [パッケージの表示とインストール](/packages/publishing-and-managing-packages) | **X** | **X** | **X** | **X** | **X** | -| [パッケージの公開](/packages/publishing-and-managing-packages/publishing-a-package) | | | **X** | **X** | **X** | -| [パッケージの削除および復元](/packages/learn-github-packages/deleting-and-restoring-a-package) | | | | | **X** |{% endif %} -| [Topics](/articles/classifying-your-repository-with-topics) の管理 | | | | **X** | **X** | -| Wiki の有効化および Wiki 編集者の制限 | | | | **X** | **X** | -| プロジェクトボードの有効化 | | | | **X** | **X** | -| [プルリクエストのマージ](/articles/configuring-pull-request-merges)の設定 | | | | **X** | **X** | -| [{% data variables.product.prodname_pages %} の公開ソース](/articles/configuring-a-publishing-source-for-github-pages)の設定 | | | | **X** | **X** | -| [保護されたブランチへのプッシュ](/articles/about-protected-branches) | | | | **X** | **X** | -| [リポジトリソーシャルカードの作成と編集](/articles/customizing-your-repositorys-social-media-preview) | | | | **X** | **X** |{% ifversion fpt or ghec %} -| [リポジトリでのインタラクション](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)を制限する | | | | **X** | **X** +| リリースの作成と編集 | | | **X** | **X** | **X** | +| ドラフトリリースの表示 | | | **X** | **X** | **X** | +| リポジトリの説明の編集 | | | | **X** | **X** |{% ifversion fpt or ghae or ghec %} +| [パッケージの表示とインストール](/packages/publishing-and-managing-packages) | **X** | **X** | **X** | **X** | **X** | +| [パッケージの公開](/packages/publishing-and-managing-packages/publishing-a-package) | | | **X** | **X** | **X** | +| [パッケージの削除および復元](/packages/learn-github-packages/deleting-and-restoring-a-package) | | | | | **X** |{% endif %} +| [Topics](/articles/classifying-your-repository-with-topics) の管理 | | | | **X** | **X** | +| Wiki の有効化および Wiki 編集者の制限 | | | | **X** | **X** | +| プロジェクトボードの有効化 | | | | **X** | **X** | +| [プルリクエストのマージ](/articles/configuring-pull-request-merges)の設定 | | | | **X** | **X** | +| [{% data variables.product.prodname_pages %} の公開ソース](/articles/configuring-a-publishing-source-for-github-pages)の設定 | | | | **X** | **X** | +| [ブランチ保護ルールの管理](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule) | | | | | **X** | +| [保護されたブランチへのプッシュ](/articles/about-protected-branches) | | | | **X** | **X** | +| 保護されたブランチでのプルリクエストのマージ（レビューの承認がなくても） | | | | | **X** |{% ifversion fpt or ghes > 3.4 or ghae-issue-6337 or ghec %} +| [タグ保護ルール](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)にマッチするタグの作成 | | | | **X** | **X** | +| [タグ保護ルール](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)にマッチするタグの削除 | | | | | **X** {% endif %} -| Issue の削除 (「[Issue を削除する](/articles/deleting-an-issue)」を参照) | | | | | **X** | -| 保護されたブランチでのプルリクエストのマージ（レビューの承認がなくても） | | | | | **X** | -| [リポジトリのコードオーナーの定義](/articles/about-code-owners) | | | | | **X** | -| リポジトリを Team に追加する (詳細は「[Organization リポジトリへの Team のアクセスを管理する](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)」を参照) | | | | | **X** | -| [外部のコラボレータのリポジトリへのアクセスの管理](/articles/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | -| [リポジトリの可視性の変更](/articles/restricting-repository-visibility-changes-in-your-organization) | | | | | **X** | -| リポジトリのテンプレート化 (「[テンプレートリポジトリを作成する](/articles/creating-a-template-repository)」を参照) | | | | | **X** | -| リポジトリ設定の変更 | | | | | **X** | -| Team およびコラボレータのリポジトリへのアクセス管理 | | | | | **X** | -| リポジトリのデフォルトブランチ編集 | | | | | **X** | -| リポジトリのデフォルトブランチの名前を変更する（「[ブランチの名前を変更する](/github/administering-a-repository/renaming-a-branch)」を参照） | | | | | **X** | -| リポジトリのデフォルトブランチを変更する（「[ブランチの名前を変更する](/github/administering-a-repository/renaming-a-branch)」を参照） | | | **X** | **X** | **X** | -| Webhookおよびデプロイキーの管理 | | | | | **X** |{% ifversion fpt or ghec %} -| [プライベートリポジトリ用のデータ利用設定を管理する](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository) | | | | | **X** +| [リポジトリソーシャルカードの作成と編集](/articles/customizing-your-repositorys-social-media-preview) | | | | **X** | **X** |{% ifversion fpt or ghec %} +| [リポジトリでのインタラクション](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)を制限する | | | | **X** | **X** {% endif %} -| [リポジトリのフォークポリシーを管理する](/github/administering-a-repository/managing-the-forking-policy-for-your-repository) | | | | | **X** | -| [リポジトリの Organization への移譲](/articles/restricting-repository-creation-in-your-organization) | | | | | **X** | -| [リポジトリの削除または Organization 外への移譲](/articles/setting-permissions-for-deleting-or-transferring-repositories) | | | | | **X** | -| [リポジトリのアーカイブ](/articles/about-archiving-repositories) | | | | | **X** |{% ifversion fpt or ghec %} -| スポンサーボタンの表示 (「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照) | | | | | **X** +| Issue の削除 (「[Issue を削除する](/articles/deleting-an-issue)」を参照) | | | | | **X** | +| [リポジトリのコードオーナーの定義](/articles/about-code-owners) | | | | | **X** | +| リポジトリを Team に追加する (詳細は「[Organization リポジトリへの Team のアクセスを管理する](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)」を参照) | | | | | **X** | +| [外部のコラボレータのリポジトリへのアクセスの管理](/articles/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | +| [リポジトリの可視性の変更](/articles/restricting-repository-visibility-changes-in-your-organization) | | | | | **X** | +| リポジトリのテンプレート化 (「[テンプレートリポジトリを作成する](/articles/creating-a-template-repository)」を参照) | | | | | **X** | +| リポジトリ設定の変更 | | | | | **X** | +| Team およびコラボレータのリポジトリへのアクセス管理 | | | | | **X** | +| リポジトリのデフォルトブランチ編集 | | | | | **X** | +| リポジトリのデフォルトブランチの名前を変更する（「[ブランチの名前を変更する](/github/administering-a-repository/renaming-a-branch)」を参照） | | | | | **X** | +| リポジトリのデフォルトブランチを変更する（「[ブランチの名前を変更する](/github/administering-a-repository/renaming-a-branch)」を参照） | | | **X** | **X** | **X** | +| Webhookおよびデプロイキーの管理 | | | | | **X** |{% ifversion fpt or ghec %} +| [プライベートリポジトリ用のデータ利用設定を管理する](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository) | | | | | **X** {% endif %} -| JiraやZendeskなどの外部リソースに対する自動リンク参照の作成 (「[外部リソースを参照する自動リンクの設定](/articles/configuring-autolinks-to-reference-external-resources)」を参照)。 | | | | | **X** |{% ifversion fpt or ghec %} -| リポジトリの [{% data variables.product.prodname_discussions %} の有効化](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository) | | | | **X** | **X** | -| {% data variables.product.prodname_discussions %} の[カテゴリの作成および編集](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository) | | | | **X** | **X** | -| [ディスカッションを別のカテゴリに移動する](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | -| 新しいリポジトリに[ディスカッションを転送する](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | -| [ピン止めされたディスカッションを管理する](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | -| [Issue をまとめてディスカッションに変換する](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | -| [ディスカッションのロックとロック解除](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** | -| [Issue を個別にディスカッションに変換する](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** | -| [新しいディスカッションを作成し、既存のディスカッションにコメントする](/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion) | **X** | **X** | **X** | **X** | **X** | -| [ディスカッションの削除](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#deleting-a-discussion) | | **X** | | **X** | **X** |{% endif %}{% ifversion fpt or ghec %} -| [codespaces](/codespaces/about-codespaces)の作成 | | | **X** | **X** | **X** +| [リポジトリのフォークポリシーを管理する](/github/administering-a-repository/managing-the-forking-policy-for-your-repository) | | | | | **X** | +| [リポジトリの Organization への移譲](/articles/restricting-repository-creation-in-your-organization) | | | | | **X** | +| [リポジトリの削除または Organization 外への移譲](/articles/setting-permissions-for-deleting-or-transferring-repositories) | | | | | **X** | +| [リポジトリのアーカイブ](/articles/about-archiving-repositories) | | | | | **X** |{% ifversion fpt or ghec %} +| スポンサーボタンの表示 (「[リポジトリにスポンサーボタンを表示する](/articles/displaying-a-sponsor-button-in-your-repository)」を参照) | | | | | **X** +{% endif %} +| JiraやZendeskなどの外部リソースに対する自動リンク参照の作成 (「[外部リソースを参照する自動リンクの設定](/articles/configuring-autolinks-to-reference-external-resources)」を参照)。 | | | | | **X** |{% ifversion fpt or ghec %} +| リポジトリの [{% data variables.product.prodname_discussions %} の有効化](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository) | | | | **X** | **X** | +| {% data variables.product.prodname_discussions %} の[カテゴリの作成および編集](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository) | | | | **X** | **X** | +| [ディスカッションを別のカテゴリに移動する](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | +| 新しいリポジトリに[ディスカッションを転送する](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | +| [ピン止めされたディスカッションを管理する](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | +| [Issue をまとめてディスカッションに変換する](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | +| [ディスカッションのロックとロック解除](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** | +| [Issue を個別にディスカッションに変換する](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** | +| [新しいディスカッションを作成し、既存のディスカッションにコメントする](/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion) | **X** | **X** | **X** | **X** | **X** | +| [ディスカッションの削除](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#deleting-a-discussion) | | **X** | | **X** | **X** |{% endif %}{% ifversion fpt or ghec %} +| [codespaces](/codespaces/about-codespaces)の作成 | | | **X** | **X** | **X** {% endif %} ### セキュリティ機能のためのアクセス要件 diff --git a/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md b/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md index 04cabfd32df7..1b8ab209bed7 100644 --- a/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md +++ b/translations/ja-JP/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md @@ -1,6 +1,6 @@ --- title: 自分のリポジトリにアクセスできる人を表示する -intro: 'Organization のオーナーは、Organization 内のリポジトリへの人のアクセスを表示できます。 {% data variables.product.prodname_ghe_cloud %} または {% data variables.product.prodname_ghe_server %} を使用して、Organization のオーナーは、リポジトリにアクセスできる人の CSV リストをエクスポートすることもできます。' +intro: 'Organization内のリポジトリにアクセスできる人のリストを表示{% ifversion ghec or ghes or ghae %}及びエクスポート{% endif %}できます。' redirect_from: - /articles/viewing-people-with-access-to-your-repository - /github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository @@ -13,9 +13,17 @@ topics: - Organizations - Teams shortTitle: アクセス権を持つ人の表示 +permissions: Organization owners can view people with access to a repository. --- -管理者はこの情報を使用して、社外の人の支援、コンプライアンスのためのデータ収集、およびその他の一般的なセキュリティチェックを行うことができます。 +## リポジトリにアクセスできる人のリストについて + +この情報は、外部の人の支援、コンプライアンスのデータ収集、その他の一般的なセキュリティチェックに利用できます。 + +{% ifversion fpt %} +{% data variables.product.prodname_ghe_cloud %}を使うOrganizationは、リポジトリにアクセスできる人のCSVリストをエクスポートすることもできます。 詳しい情報については[{% data variables.product.prodname_ghe_cloud %}のドキュメンテーション](/enterprise-cloud@latest/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository)を参照してください。 +{% endif %} + {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %} ![アクセス管理の概要](/assets/images/help/repository/manage-access-overview.png) {% else %} @@ -24,17 +32,26 @@ shortTitle: アクセス権を持つ人の表示 ## 自分のリポジトリにアクセスできる人を表示する {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %} -リポジトリ設定では、リポジトリへのアクセス権を持つTeamと人が組み合わさった概要を見ることができます。 詳細は、「[リポジトリへのアクセス権を持つ Team と人を管理する](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#about-access-management-for-repositories)」を参照してください。 +リポジトリ設定では、リポジトリへのアクセス権を持つTeamと人が組み合わさった概要を見ることができます。 詳しい情報については「[リポジトリへのアクセスを持つTeamや人の管理](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#about-access-management-for-repositories)」を参照してください。 {% else %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.accessing-repository-graphs %} {% data reusables.repositories.accessing-repository-people %} {% endif %} + +{% ifversion ghec or ghes or ghae %} ## リポジトリへのアクセス権を持つ人のリストをエクスポートする -{% data variables.product.prodname_ghe_cloud %} または {% data variables.product.prodname_ghe_server %} の Organization のオーナーは、リポジトリにアクセスできる人の CSV リストをエクスポートできます。 +{% ifversion ghec %} +{% note %} + +**ノート:** {% data variables.product.prodname_ghe_cloud %}を使うOrganizationだけが、リポジトリにアクセスできる人のリストをエクスポートできます。 {% data reusables.enterprise.link-to-ghec-trial %} + +{% endnote %} +{% endif %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.accessing-repository-graphs %} {% data reusables.repositories.accessing-repository-people %} 4. [**Export CSV**] をクリックします。 ![リポジトリサイドバーの人タブ](/assets/images/help/repository/export-repository-permissions.png) +{% endif %} diff --git a/translations/ja-JP/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md b/translations/ja-JP/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md index d907688b798e..0946ea752ff3 100644 --- a/translations/ja-JP/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md +++ b/translations/ja-JP/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md @@ -1,13 +1,11 @@ --- title: 外部のコラボレーターを追加するための権限を設定する intro: Organization のデータを保護し、Organization 内で使用されている有料ライセンスの数が無駄遣いされないようにするために、外部コラボレーターを Organization のリポジトリに招待することをオーナーのみに許可できます。 -product: '{% data reusables.gated-features.restrict-add-collaborator %}' redirect_from: - /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories - /articles/setting-permissions-for-adding-outside-collaborators - /github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators versions: - fpt: '*' ghes: '*' ghae: '*' ghec: '*' @@ -17,7 +15,16 @@ topics: shortTitle: コラボレータポリシーの設定 --- -リポジトリに対する管理者権限を持つ Organization のオーナーとメンバーは、リポジトリで作業するように外部のコラボレーターを招待できます。 外部のコラボレーターの招待権限を、Organization のオーナーに制限することもできます。 +デフォルトでは、リポジトリへの管理アクセスを持つ人は、そのリポジトリで作業してもらうために外部のコラボレータを招待できます。 外部のコラボレータを招待する機能は、Organizationのオーナーのみに制限することもできます。 + + +{% ifversion ghec %} +{% note %} + +**ノート:**{% data variables.product.prodname_ghe_cloud %}を使うOrganizationだけが、外部のコラボレータを招待する機能をOrganizationのオーナーに制限できます。 {% data reusables.enterprise.link-to-ghec-trial %} + +{% endnote %} +{% endif %} {% data reusables.organizations.outside-collaborators-use-seats %} diff --git a/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md b/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md index 96179bb4a3bd..1980274f8389 100644 --- a/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md +++ b/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md @@ -84,6 +84,8 @@ Organizationが{% data variables.product.prodname_ghe_cloud %}を使っている - **Set interaction limits（インタラクションの制限を設定）**: 自分のパブリックリポジトリで特定のユーザによるコメント、Issueのオープン、Pull Requestの作成を一時的に制限し、アクティビティの制限期間を施行。 詳しい情報については「[リポジトリでのインタラクションの制限](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)」を参照してください。 - **Set the social preview（ソーシャルプレビューの設定）**: リポジトリがリンクされたときにソーシャルメディア上に表示される識別画像をリポジトリに追加。 詳細は「[リポジトリのソーシャルメディア向けプレビューをカスタマイズする](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview)」を参照してください。 - **Push commits to protected branches（保護されたブランチにコミットをプッシュ）**: 保護されたブランチとしてマークされているブランチにプッシュ。 +- **Create protected tags（保護されたタグの作成）**: タグの保護ルールにマッチしたタグの作成。 詳しい情報については「[タグ保護ルールの設定](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)」を参照してください。 +- **Delete protected tags（タグ保護ルールの削除）**: タグ保護ルールにマッチしたタグの削除。 詳しい情報については「[タグ保護ルールの設定](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)」を参照してください。 ### セキュリティ diff --git a/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md b/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md index 2b99f005e897..01a93bacbc51 100644 --- a/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md +++ b/translations/ja-JP/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md @@ -75,66 +75,67 @@ Organizationでの{% data variables.product.prodname_github_app %}マネージ {% ifversion fpt or ghec %} -| Organizationの権限 | オーナー | メンバー | 支払いマネージャー | セキュリティマネージャー | -|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:-----:|:---------:|:---------------------------:| -| リポジトリの作成 (詳細については「[Organization 内でリポジトリの作成を制限する](/articles/restricting-repository-creation-in-your-organization)」を参照) | **X** | **X** | | **X** | -| 支払い情報を表示および編集する | **X** | | **X** | | -| Organization に参加するようユーザを招待する | **X** | | | | -| Organization に参加する招待を編集およびキャンセルする | **X** | | | | -| Organization からメンバーを削除する | **X** | | | | -| 以前のメンバーを Oraganization に復帰させる | **X** | | | | -| **すべての Team** に対してユーザーを追加および削除する | **X** | | | | -| Organization メンバーを*チームメンテナ*に昇格させる | **X** | | | | -| コードレビューの割り当てを設定する ([「Team のコードレビューの割り当てを管理する」](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)を参照) | **X** | | | | -| スケジュールされたリマインダーを設定する (「[プルリクエストのスケジュールされたリマインダーを管理する](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests)」を参照) | **X** | | | | -| **すべてのリポジトリに**コラボレーターを追加する | **X** | | | | -| Organization 参加ログにアクセスする | **X** | | | | -| Organization のプロフィールページを変更する (詳細は「[Organization のプロフィールについて](/github/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile)」を参照) | **X** | | | | -| Organization のドメインを検証する (詳細は「[Organization のドメインを検証する](/articles/verifying-your-organization-s-domain)」を参照) | **X** | | | | -| メール通知を検証済みあるいは承認済みドメインに制限する（詳細については[Organizationのメール通知を制限する](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)を参照してください） | **X** | | | | -| **すべての Team** を削除する | **X** | | | | -| すべてのリポジトリを含めて Organization のアカウントを削除する | **X** | | | | -| Team を作成する (詳細は「[Organization のチーム作成権限を設定する](/articles/setting-team-creation-permissions-in-your-organization)」を参照) | **X** | **X** | | **X** | -| [Organization の階層で Team を移動する](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | | -| プロジェクトボードを作成する (詳細は「[Organization のプロジェクトボード権限](/articles/project-board-permissions-for-an-oganization)」を参照) | **X** | **X** | | **X** | -| Organization の全メンバーおよび Team の表示 | **X** | **X** | | **X** | -| 参照可能なチームへの @メンション | **X** | **X** | | **X** | -| *チームメンテナ*に指定できる | **X** | **X** | | **X** | -| Organization のインサイトを表示する (詳細は「[Organization のインサイトを表示する](/articles/viewing-insights-for-your-organization)」を参照) | **X** | **X** | | **X** | -| パブリック Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/organizations/collaborating-with-your-team/about-team-discussions)」を参照) | **X** | **X** | | **X** | -| プライベート Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/organizations/collaborating-with-your-team/about-team-discussions)」を参照) | **X** | | | | -| **すべての Team** で Team ディスカッションを編集および削除する (詳細は「[混乱を生むコメントを管理する](/communities/moderating-comments-and-conversations/managing-disruptive-comments)」を参照) | **X** | | | | -| コミット、プルリクエスト、Issue についてコメントを非表示にする (詳細は「[混乱を生むコメントを管理する](/communities/moderating-comments-and-conversations/managing-disruptive-comments/#hiding-a-comment)」を参照) | **X** | **X** | | **X** | -| Organization の Team ディスカッションを無効にする (詳細は「[Organization の Team ディスカッションを無効化する](/articles/disabling-team-discussions-for-your-organization)」を参照) | **X** | | | | -| Organization dependency insights の可視性を管理する (詳細は「[Organization dependency insights の可視性を変更する](/articles/changing-the-visibility-of-your-organizations-dependency-insights)」を参照) | **X** | | | | -| **すべての Team** で Team プロフィール画像を設定する (詳細は「[Team のプロフィール画像を設定する](/articles/setting-your-team-s-profile-picture)」を参照) | **X** | | | | -| アカウントをスポンサーし、Organization のスポンサーシップを管理する（詳細は、「[オープンソースコントリビューターをスポンサーする](/sponsors/sponsoring-open-source-contributors)」を参照） | **X** | | **X** | **X** | -| スポンサーアカウントからのメール更新の管理（詳細は、「[Organization のスポンサーアカウントからの更新を管理する](/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors)」を参照） | **X** | | | | -| スポンサーシップを別の Organization に関連付ける（詳細は、「[Organization へのスポンサーシップの関連付け](/sponsors/sponsoring-open-source-contributors/attributing-sponsorships-to-your-organization)」を参照してください）。 | **X** | | | | -| Organization 内のリポジトリからの {% data variables.product.prodname_pages %} サイトの公開を管理する（詳細は、「[Organization の {% data variables.product.prodname_pages %} サイトの公開を管理する](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)」を参照） | **X** | | | | -| Organization のセキュリティおよび分析設定を管理する (詳細は「[Organization のセキュリティおよび分析設定を管理する](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)」を参照) | **X** | | | **X** | -| Organizationのセキュリティの概要を表示（詳細については「[セキュリティの概要について](/code-security/security-overview/about-the-security-overview)」を参照） | **X** | | | **X** |{% ifversion ghec %} -| [SAML シングルサインオン](/articles/about-identity-and-access-management-with-saml-single-sign-on)を有効にして強制する | **X** | | | | -| [組織へのユーザーの SAML アクセスを管理する](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | | -| Organization の SSH 認証局を管理する (詳細は「[Organization の SSH 認証局を管理する](/articles/managing-your-organizations-ssh-certificate-authorities)」を参照) | **X** | | | +| Organizationの権限 | オーナー | メンバー | 支払いマネージャー | セキュリティマネージャー | +|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:-----:|:---------:|:-------------------------------------:| +| リポジトリの作成 (詳細については「[Organization 内でリポジトリの作成を制限する](/articles/restricting-repository-creation-in-your-organization)」を参照) | **X** | **X** | | **X** | +| 支払い情報を表示および編集する | **X** | | **X** | | +| Organization に参加するようユーザを招待する | **X** | | | | +| Organization に参加する招待を編集およびキャンセルする | **X** | | | | +| Organization からメンバーを削除する | **X** | | | | +| 以前のメンバーを Oraganization に復帰させる | **X** | | | | +| **すべての Team** に対してユーザーを追加および削除する | **X** | | | | +| Organization メンバーを*チームメンテナ*に昇格させる | **X** | | | | +| コードレビューの割り当てを設定する ([「Team のコードレビューの割り当てを管理する」](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)を参照) | **X** | | | | +| スケジュールされたリマインダーを設定する (「[プルリクエストのスケジュールされたリマインダーを管理する](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests)」を参照) | **X** | | | | +| **すべてのリポジトリに**コラボレーターを追加する | **X** | | | | +| Organization 参加ログにアクセスする | **X** | | | | +| Organization のプロフィールページを変更する (詳細は「[Organization のプロフィールについて](/github/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile)」を参照) | **X** | | | | +| Organization のドメインを検証する (詳細は「[Organization のドメインを検証する](/articles/verifying-your-organization-s-domain)」を参照) | **X** | | | | +| メール通知を検証済みあるいは承認済みドメインに制限する（詳細については[Organizationのメール通知を制限する](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)を参照してください） | **X** | | | | +| **すべての Team** を削除する | **X** | | | | +| すべてのリポジトリを含めて Organization のアカウントを削除する | **X** | | | | +| Team を作成する (詳細は「[Organization のチーム作成権限を設定する](/articles/setting-team-creation-permissions-in-your-organization)」を参照) | **X** | **X** | | **X** | +| [Organization の階層で Team を移動する](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | | +| プロジェクトボードを作成する (詳細は「[Organization のプロジェクトボード権限](/articles/project-board-permissions-for-an-oganization)」を参照) | **X** | **X** | | **X** | +| Organization の全メンバーおよび Team の表示 | **X** | **X** | | **X** | +| 参照可能なチームへの @メンション | **X** | **X** | | **X** | +| *チームメンテナ*に指定できる | **X** | **X** | | **X** | +| Organization のインサイトを表示する (詳細は「[Organization のインサイトを表示する](/articles/viewing-insights-for-your-organization)」を参照) | **X** | **X** | | **X** | +| パブリック Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/organizations/collaborating-with-your-team/about-team-discussions)」を参照) | **X** | **X** | | **X** | +| プライベート Team のディスカッションを表示し、**すべての Team** に投稿する (詳細は「[Team ディスカッションについて](/organizations/collaborating-with-your-team/about-team-discussions)」を参照) | **X** | | | | +| **すべての Team** で Team ディスカッションを編集および削除する (詳細は「[混乱を生むコメントを管理する](/communities/moderating-comments-and-conversations/managing-disruptive-comments)」を参照) | **X** | | | | +| コミット、プルリクエスト、Issue についてコメントを非表示にする (詳細は「[混乱を生むコメントを管理する](/communities/moderating-comments-and-conversations/managing-disruptive-comments/#hiding-a-comment)」を参照) | **X** | **X** | | **X** | +| Organization の Team ディスカッションを無効にする (詳細は「[Organization の Team ディスカッションを無効化する](/articles/disabling-team-discussions-for-your-organization)」を参照) | **X** | | | | +| Organization dependency insights の可視性を管理する (詳細は「[Organization dependency insights の可視性を変更する](/articles/changing-the-visibility-of-your-organizations-dependency-insights)」を参照) | **X** | | | | +| **すべての Team** で Team プロフィール画像を設定する (詳細は「[Team のプロフィール画像を設定する](/articles/setting-your-team-s-profile-picture)」を参照) | **X** | | | | +| アカウントをスポンサーし、Organization のスポンサーシップを管理する（詳細は、「[オープンソースコントリビューターをスポンサーする](/sponsors/sponsoring-open-source-contributors)」を参照） | **X** | | **X** | **X** | +| スポンサーアカウントからのメール更新の管理（詳細は、「[Organization のスポンサーアカウントからの更新を管理する](/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors)」を参照） | **X** | | | | +| スポンサーシップを別の Organization に関連付ける（詳細は、「[Organization へのスポンサーシップの関連付け](/sponsors/sponsoring-open-source-contributors/attributing-sponsorships-to-your-organization)」を参照してください）。 | **X** | | | | +| Organization 内のリポジトリからの {% data variables.product.prodname_pages %} サイトの公開を管理する（詳細は、「[Organization の {% data variables.product.prodname_pages %} サイトの公開を管理する](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)」を参照） | **X** | | | | +| Organization のセキュリティおよび分析設定を管理する (詳細は「[Organization のセキュリティおよび分析設定を管理する](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)」を参照) | **X** | | | **X** | +| Organizationのセキュリティの概要を表示（詳細については「[セキュリティの概要について](/code-security/security-overview/about-the-security-overview)」を参照） | **X** | | | **X** |{% ifversion ghec %} +| [SAML シングルサインオン](/articles/about-identity-and-access-management-with-saml-single-sign-on)を有効にして強制する | **X** | | | | +| [組織へのユーザーの SAML アクセスを管理する](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | | +| Organization の SSH 認証局を管理する (詳細は「[Organization の SSH 認証局を管理する](/articles/managing-your-organizations-ssh-certificate-authorities)」を参照) | **X** | | | {% endif %} -| リポジトリを移譲する | **X** | | | | -| {% data variables.product.prodname_marketplace %} アプリケーションを購入、インストール、支払い管理、キャンセルする | **X** | | | | -| {% data variables.product.prodname_marketplace %} のアプリケーションをリストする | **X** | | | | -| Organization のリポジトリすべてについて、脆弱な依存関係についての [{% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) アラートを受け取る | **X** | | | **X** | -| {% data variables.product.prodname_dependabot_security_updates %} の管理 (「[{% data variables.product.prodname_dependabot_security_updates %} について](/github/managing-security-vulnerabilities/about-dependabot-security-updates)」を参照) | **X** | | | **X** | -| [フォークポリシーの管理](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization) | **X** | | | | -| [Organization のパブリックリポジトリでのアクティビティを制限する](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization) | **X** | | | | -| Organizationの*すべてのリポジトリ*をプル（読み取り） | **X** | | | **X** | -| Organizationの*すべてのリポジトリ*のプッシュ（書き込み）及びクローン（コピー） | **X** | | | | -| Organization メンバーの[外部コラボレーター](#outside-collaborators)への変換 | **X** | | | | -| [Organization リポジトリへのアクセス権がある人を表示する](/articles/viewing-people-with-access-to-your-repository) | **X** | | | | -| [Organization リポジトリへのアクセス権がある人のリストをエクスポートする](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | | | -| デフォルブランチ名を管理する (「[Organization のリポジトリのデフォルブランチ名を管理する](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)」を参照) | **X** | | | | -| デフォルトラベルの管理 (「[Organization 内のリポジトリのためのデフォルトラベルを管理する](/articles/managing-default-labels-for-repositories-in-your-organization)」を参照) | **X** | | | |{% ifversion ghec %} -| Team の同期を有効化する (「[Organization の Team 同期を管理する](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)」を参照) | **X** | | | +| リポジトリを移譲する | **X** | | | | +| {% data variables.product.prodname_marketplace %} アプリケーションを購入、インストール、支払い管理、キャンセルする | **X** | | | | +| {% data variables.product.prodname_marketplace %} のアプリケーションをリストする | **X** | | | | +| Organization のリポジトリすべてについて、脆弱な依存関係についての [{% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) アラートを受け取る | **X** | | | **X** | +| {% data variables.product.prodname_dependabot_security_updates %} の管理 (「[{% data variables.product.prodname_dependabot_security_updates %} について](/github/managing-security-vulnerabilities/about-dependabot-security-updates)」を参照) | **X** | | | **X** | +| [フォークポリシーの管理](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization) | **X** | | | | +| [Organization のパブリックリポジトリでのアクティビティを制限する](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization) | **X** | | | | +| Organizationの*すべてのリポジトリ*をプル（読み取り） | **X** | | | **X** | +| Organizationの*すべてのリポジトリ*のプッシュ（書き込み）及びクローン（コピー） | **X** | | | | +| Organization メンバーの[外部コラボレーター](#outside-collaborators)への変換 | **X** | | | | +| [Organization リポジトリへのアクセス権がある人を表示する](/articles/viewing-people-with-access-to-your-repository) | **X** | | | |{% ifversion ghec or ghes or ghae %} +| [Organization リポジトリへのアクセス権がある人のリストをエクスポートする](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | | {% endif %} -| OrganizationのPull Requestレビューを管理（[OrganizationでのPull Requestのレビューの管理](/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization)」を参照） | **X** | | | | +| デフォルブランチ名を管理する (「[Organization のリポジトリのデフォルブランチ名を管理する](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)」を参照) | **X** | | | | +| デフォルトラベルの管理 (「[Organization 内のリポジトリのためのデフォルトラベルを管理する](/articles/managing-default-labels-for-repositories-in-your-organization)」を参照) | **X** | | | |{% ifversion ghec %} +| Team の同期を有効化する (「[Organization の Team 同期を管理する](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)」を参照) | **X** | | | +{% endif %} +| OrganizationのPull Requestレビューを管理（[OrganizationでのPull Requestのレビューの管理](/organizations/managing-organization-settings/managing-pull-request-reviews-in-your-organization)」を参照） | **X** | | | | {% elsif ghes > 3.2 or ghae-issue-4999 %} diff --git a/translations/ja-JP/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md b/translations/ja-JP/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md index 2c9afdcfa13a..7c0e4a34f3eb 100644 --- a/translations/ja-JP/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md +++ b/translations/ja-JP/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md @@ -22,8 +22,6 @@ SAML SSO を有効化しても強制はしない場合、SAML SSO を使用し {% data reusables.saml.saml-disabled-linked-identities-removed %} -{% data reusables.saml.cannot-update-existing-saml-settings %} - ## Organization 向けの SAML シングルサインオンを有効化してテストする OrganizationでSAML SSOを施行する前に、Organizationの準備ができていることを確認してください。 詳細は「[Organization での SAML シングルサインオンの施行を準備する](/articles/preparing-to-enforce-saml-single-sign-on-in-your-organization)」を参照してください。 diff --git a/translations/ja-JP/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md b/translations/ja-JP/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md index 9606bfa9f62d..c2dca83a459b 100644 --- a/translations/ja-JP/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md +++ b/translations/ja-JP/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md @@ -36,10 +36,6 @@ Teamのノイズを減らし、Pull Requestレビューに対する個人の責 コードオーナーが自動的にレビューをリクエストされた場合でも、ブランチ保護ルールがコードオーナーからのレビューを必須として設定されていないかぎり、やはりTeamは外され、個人に置き換えられます。 そういったブランチ保護ルールがある場合、Teamへのリクエストは削除できないので、個人へのリクエストは追加されることになります。 -{% ifversion fpt %} -Teamのコラボレーション能力をさらに拡大するために、保護されたブランチやプライベートリポジトリのコードオーナーといった機能を含む{% data variables.product.prodname_ghe_cloud %}へのアップグレードが可能です。 {% data reusables.enterprise.link-to-ghec-trial %} -{% endif %} - ### ルーティングアルゴリズム コードレビューの割り当てでは、2 つの可能なアルゴリズムのいずれかに基づいて、レビュー担当者が自動的に選択されて割り当てられます。 diff --git a/translations/ja-JP/content/packages/index.md b/translations/ja-JP/content/packages/index.md index 78a3e49a07ec..aa85790b2fda 100644 --- a/translations/ja-JP/content/packages/index.md +++ b/translations/ja-JP/content/packages/index.md @@ -12,11 +12,11 @@ featuredLinks: - /packages/learn-github-packages/installing-a-package popular: - /packages/working-with-a-github-packages-registry/working-with-the-npm-registry - - '{% ifversion fpt %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}' + - '{% ifversion fpt or ghec%}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}' - /packages/learn-github-packages - /packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry guideCards: - - '{% ifversion fpt %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}' + - '{% ifversion fpt or ghec %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}' - /packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry changelog: label: packages diff --git a/translations/ja-JP/content/packages/learn-github-packages/deleting-and-restoring-a-package.md b/translations/ja-JP/content/packages/learn-github-packages/deleting-and-restoring-a-package.md index ca2eb682335d..0ed0c29f1818 100644 --- a/translations/ja-JP/content/packages/learn-github-packages/deleting-and-restoring-a-package.md +++ b/translations/ja-JP/content/packages/learn-github-packages/deleting-and-restoring-a-package.md @@ -46,7 +46,7 @@ REST APIを使用してパッケージを管理できます。 詳しい情報 {% endif %} -For packages that inherit their permissions and access from repositories, you can use GraphQL to delete a specific package version.{% ifversion fpt or ghec %} The {% data variables.product.prodname_registry %} GraphQL API does not support containers or Docker images that use the package namespace `https://ghcr.io/OWNER/PACKAGE-NAME`.{% endif %} For more information about GraphQL support, see "[Deleting a version of a repository-scoped package with GraphQL](#deleting-a-version-of-a-repository-scoped-package-with-graphql)." +権限とアクセスをリポジトリから継承するパッケージでは、GraphQLを使って特定のパッケージバージョンを削除できます。{% ifversion fpt or ghec %}{% data variables.product.prodname_registry %}GraphQL APIは、パッケージの名前空間`https://ghcr.io/OWNER/PACKAGE-NAME`を使うコンテナあるいはDockerイメージをサポートしません。{% endif %}GraphQLサポートに関する詳しい情報については「[GraphQLでリポジトリをスコープとするパッケージのバージョンを削除する](#deleting-a-version-of-a-repository-scoped-package-with-graphql)」を参照してください。 {% endif %} @@ -87,7 +87,7 @@ For packages that inherit their permissions and access from repositories, you ca リポジトリから権限とアクセスを継承しているパッケージの場合、GraphQLを使用して特定のパッケージバージョンを削除できます。 {% ifversion fpt or ghec %} -For containers or Docker images at `ghcr.io`, GraphQL is not supported but you can use the REST API. 詳しい情報については、「[{% data variables.product.prodname_registry %} API](/rest/reference/packages)」を参照してください。 +`ghcr.io`にあるコンテナあるいはDockerイメージについては、GraphQLはサポートされていませんがREST APIが使えます。 詳しい情報については、「[{% data variables.product.prodname_registry %} API](/rest/reference/packages)」を参照してください。 {% endif %} GraphQL APIの`deletePackageVersion`ミューテーションを使ってください。 `read:packages`、`delete:packages`、`repo`スコープを持つトークンを使わなければなりません。 トークンに関する詳しい情報については「[{% data variables.product.prodname_registry %}について](/packages/publishing-and-managing-packages/about-github-packages#authenticating-to-github-packages)」を参照してください。 @@ -102,9 +102,9 @@ curl -X POST \ HOSTNAME/graphql ``` -To find all of the private packages you have published to {% data variables.product.prodname_registry %}, along with the version IDs for the packages, you can use the `packages` connection through the `repository` object. `read:packages`及び`repo`のスコープを持つトークンが必要です。 For more information, see the [`packages`]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql/reference/objects#repository) connection or the [`PackageOwner`]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql/reference/interfaces#packageowner) interface. +{% data variables.product.prodname_registry %}に公開したすべてのプライベートパッケージをバージョンIDと合わせて見つけるには、`repository`オブジェクトを通じて`packages`コネクションを使うことができます。 `read:packages`及び`repo`のスコープを持つトークンが必要です。 詳しい情報については[`packages`]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql/reference/objects#repository)コネクションあるいは[`PackageOwner`]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql/reference/interfaces#packageowner)インターフェースを参照してください。 -For more information about the `deletePackageVersion` mutation, see "[`deletePackageVersion`]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql/reference/mutations#deletepackageversion)." +`deletePackageVersion`ミューテーションに関する詳しい情報については「[`deletePackageVersion`]({% ifversion ghec %}/free-pro-team@latest{% endif %}/graphql/reference/mutations#deletepackageversion)」を参照してください。 GraphQLを使用してパッケージ全体を直接削除することはできませんが、パッケージのすべてのバージョンを削除すれば、パッケージは{% data variables.product.product_name %}上に表示されなくなります。 @@ -123,11 +123,11 @@ GraphQLを使用してパッケージ全体を直接削除することはでき 5. 削除するバージョンの右側で、{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} をクリックした後、[**Delete version**] を選択します。 ![パッケージバージョンの削除ボタン](/assets/images/help/package-registry/delete-container-package-version.png) 6. 削除を確認するために、パッケージ名を入力して**I understand the consequences, delete this version（生じることを理解したので、このバージョンを削除してください）**をクリックしてください。 ![パッケージの削除の確認ボタン](/assets/images/help/package-registry/confirm-container-package-version-deletion.png) -### Deleting a version of an organization-scoped package on {% data variables.product.prodname_dotcom %} +### {% data variables.product.prodname_dotcom %}上のOrganizationスコープのパッケージのバージョンの削除 `ghcr.io`にあるDockerイメージなどで、{% data variables.product.prodname_dotcom %}上のOrganizationのスコープが付いたパッケージの、特定のバージョンを削除するには、以下のステップに従ってください。 パッケージ全体を削除するには、「[{% data variables.product.prodname_dotcom %}上でOrganizationのスコープが付いたパッケージ全体を削除する](#deleting-an-entire-organization-scoped-package-on-github)」を参照してください。 -To review who can delete a package version, see "[Required permissions to delete or restore a package](#required-permissions-to-delete-or-restore-a-package)." +パッケージバージョンを削除できる人をレビューするには、「[パッケージの削除あるいは復元に必要な権限](#required-permissions-to-delete-or-restore-a-package)」を参照してください。 {% data reusables.package_registry.package-settings-from-org-level %} {% data reusables.package_registry.package-settings-option %} @@ -176,17 +176,17 @@ To review who can delete a package version, see "[Required permissions to delete - 削除後30日以内にパッケージを復元する。 - 同一のパッケージ名前空間がまだ使用可能であり、新しいパッケージで再使用されていない。 -For example, if you have a deleted RubyGems package named `octo-package` that was scoped to the repo `octo-repo-owner/octo-repo`, then you can only restore the package if the package namespace `rubygem.pkg.github.com/octo-repo-owner/octo-repo/octo-package` is still available, and 30 days have not yet passed. +たとえば、リポジトリ`octo-repo-owner/octo-repo`のスコープが付いていた、`octo-package`という名前のRubygemパッケージを削除した場合、パッケージ名前空間`rubygem.pkg.github.com/octo-repo-owner/octo-repo/octo-package` がまだ使用可能で、かつ30日間が経過していない場合にのみ、そのパッケージを復元できます。 {% ifversion fpt or ghec %} -To restore a deleted package, you must also meet one of these permission requirements: - - For repository-scoped packages: You have admin permissions to the repository that owns the deleted package.{% ifversion fpt or ghec %} +削除されたパッケージを復元するには、以下の権限の要求のいずれかを満たす必要もあります。 + - リポジトリをスコープとするパッケージ: 削除されたパッケージを所有するリポジトリの管理権限を持っている。{% ifversion fpt or ghec %} - ユーザアカウントのスコープが付いたパッケージ: ユーザアカウントが削除したパッケージを所有している。 - - For organization-scoped packages: You have admin permissions to the deleted package in the organization that owns the package.{% endif %} + - Organizationをスコープとするパッケージ: パッケージを所有するOrganization中で削除されたパッケージに対する管理権限を持っている。{% endif %} {% endif %} {% ifversion ghae or ghes %} -To delete a package, you must also have admin permissions to the repository that owns the deleted package. +削除されたパッケージについては、その削除されたパッケージを所有するリポジトリに対する管理権限も持っていなければなりません。 {% endif %} 詳しい情報については、「[必要な権限](#required-permissions-to-delete-or-restore-a-package)」を参照してください。 @@ -195,7 +195,7 @@ To delete a package, you must also have admin permissions to the repository that ### Organization内のパッケージを復元する - You can restore a deleted package through your organization account settings, as long as the package was in a repository owned by the organizaton{% ifversion fpt or ghec %} or had granular permissions and was scoped to your organization account{% endif %}. + 削除されたパッケージは、そのパッケージがOrganizationの所有するリポジトリ内にあった{% ifversion fpt or ghec %}か、Organizationアカウントをスコープとする詳細な権限を持っていた{% endif %}なら、Organizationアカウントの設定を通じて復元できます。 Organizationでパッケージを復元できるユーザを確認するには、「[必要な権限](#required-permissions-to-delete-or-restore-a-package)」を参照してください。 diff --git a/translations/ja-JP/content/packages/learn-github-packages/publishing-a-package.md b/translations/ja-JP/content/packages/learn-github-packages/publishing-a-package.md index daac3f732137..d0f92d9ccbac 100644 --- a/translations/ja-JP/content/packages/learn-github-packages/publishing-a-package.md +++ b/translations/ja-JP/content/packages/learn-github-packages/publishing-a-package.md @@ -1,6 +1,6 @@ --- -title: パッケージを公開する -intro: '{% data variables.product.prodname_registry %}にパッケージを公開し、そのパッケージを他者がダウンロードして再利用できるようにすることができます。' +title: Publishing a package +intro: 'You can publish a package to {% data variables.product.prodname_registry %} to make the package available for others to download and re-use.' product: '{% data reusables.gated-features.packages %}' redirect_from: - /github/managing-packages-with-github-packages/publishing-a-package @@ -16,25 +16,24 @@ versions: {% data reusables.package_registry.packages-ghes-release-stage %} {% data reusables.package_registry.packages-ghae-release-stage %} -## 公開されたパッケージについて +## About published packages -パッケージページ上のインストール及び利用方法の説明といった、説明やその他の詳細を提供することによって、パッケージを理解して利用しやすくできます。 {% data variables.product.product_name %} は各バージョンについて、公開日、ダウンロードのアクティビティ、最近のバージョンなどのメタデータを提供します。 パッケージページの例としては、[@Codertocat/hello-world-npm](https://github.com/Codertocat/hello-world-npm/packages/10696?version=1.0.1)を参照してください。 +You can help people understand and use your package by providing a description and other details like installation and usage instructions on the package page. {% data variables.product.product_name %} provides metadata for each version, such as the publication date, download activity, and recent versions. For an example package page, see [@Codertocat/hello-world-npm](https://github.com/Codertocat/hello-world-npm/packages/10696?version=1.0.1). -{% data reusables.package_registry.public-or-private-packages %} リポジトリは複数のパッケージに接続できます。 混乱を避けるため、READMEと説明で各パッケージに関する情報を明確に提供してください。 +{% data reusables.package_registry.public-or-private-packages %} A repository can be connected to more than one package. To prevent confusion, make sure the README and description clearly provide information about each package. {% ifversion fpt or ghec %} -新しいバージョンのパッケージでセキュリティの脆弱性が解決される場合は、リポジトリでセキュリティアドバイザリを公開する必要があります。 -{% data variables.product.prodname_dotcom %} は公開された各セキュリティアドバイザリを確認し、それを使用して、影響を受けるリポジトリに {% data variables.product.prodname_dependabot_alerts %} を送信できます。 詳しい情報については、「[GitHub セキュリティアドバイザリについて](/github/managing-security-vulnerabilities/about-github-security-advisories)」 を参照してください。 +If a new version of a package fixes a security vulnerability, you should publish a security advisory in your repository. {% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_alerts %} to affected repositories. For more information, see "[About GitHub Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)." {% endif %} -## パッケージを公開する +## Publishing a package You can publish a package to {% data variables.product.prodname_registry %} using any {% ifversion fpt or ghae or ghec %}supported package client{% else %}package type enabled for your instance{% endif %} by following the same general guidelines. -1. 実行したいタスクに対して適切なスコープを持つ既存のアクセストークンを作成もしくは利用してください。 詳しい情報については「[{% data variables.product.prodname_registry %}の権限について](/packages/learn-github-packages/about-permissions-for-github-packages)」を参照してください。 -2. 使用するパッケージクライアントについての指示に従って、アクセストークンを使って{% data variables.product.prodname_registry %}の認証をしてください。 -3. 使用するパッケージクライアントに関する指示に従って、パッケージを公開してください。 +1. Create or use an existing access token with the appropriate scopes for the task you want to accomplish. For more information, see "[About permissions for {% data variables.product.prodname_registry %}](/packages/learn-github-packages/about-permissions-for-github-packages)." +2. Authenticate to {% data variables.product.prodname_registry %} using your access token and the instructions for your package client. +3. Publish the package using the instructions for your package client. -使用するパッケージクライアント固有の指示については「[GitHub Packagesレジストリの利用](/packages/working-with-a-github-packages-registry)」を参照してください。 +For instructions specific to your package client, see "[Working with a GitHub Packages registry](/packages/working-with-a-github-packages-registry)." -パッケージを公開した後は、{% data variables.product.prodname_dotcom %}上でそのパッケージを見ることができます。 詳しい情報については「[パッケージの表示](/packages/learn-github-packages/viewing-packages)」を参照してください。 +After you publish a package, you can view the package on {% data variables.product.prodname_dotcom %}. For more information, see "[Viewing packages](/packages/learn-github-packages/viewing-packages)." diff --git a/translations/ja-JP/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md b/translations/ja-JP/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md index b7650ff4b410..dc433c384c01 100644 --- a/translations/ja-JP/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md +++ b/translations/ja-JP/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md @@ -1,6 +1,6 @@ --- title: Working with the Docker registry -intro: '{% ifversion fpt or ghec %}The Docker registry has now been replaced by the {% data variables.product.prodname_container_registry %}.{% else %}You can push and pull your Docker images using the {% data variables.product.prodname_registry %} Docker registry, which uses the package namespace `https://docker.pkg.github.com`.{% endif %}' +intro: '{% ifversion fpt or ghec %}The Docker registry has now been replaced by the {% data variables.product.prodname_container_registry %}.{% else %}You can push and pull your Docker images using the {% data variables.product.prodname_registry %} Docker registry.{% endif %}' product: '{% data reusables.gated-features.packages %}' redirect_from: - /articles/configuring-docker-for-use-with-github-package-registry diff --git a/translations/ja-JP/content/pages/getting-started-with-github-pages/about-github-pages.md b/translations/ja-JP/content/pages/getting-started-with-github-pages/about-github-pages.md index 6f05a8fd66f6..72814d049409 100644 --- a/translations/ja-JP/content/pages/getting-started-with-github-pages/about-github-pages.md +++ b/translations/ja-JP/content/pages/getting-started-with-github-pages/about-github-pages.md @@ -92,21 +92,21 @@ If you choose the `/docs` folder of any branch as your publishing source, {% dat ## Limits on use of {% data variables.product.prodname_pages %} {% ifversion fpt or ghec %} -{% data variables.product.prodname_pages %} sites created after June 15, 2016 and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)." +{% data variables.product.prodname_pages %} sites created after June 15, 2016, and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)." ### Prohibited uses {% endif %} -{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %} +{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web-hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %} -In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get rich quick schemes, sexually obscene content, and violent or threatening content or activity. +In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get-rich-quick schemes, sexually obscene content, and violent or threatening content or activity. ### Usage limits {% data variables.product.prodname_pages %} sites are subject to the following usage limits: - - {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?"](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations){% endif %} + - {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1 GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations)"{% endif %} - Published {% data variables.product.prodname_pages %} sites may be no larger than 1 GB. {% ifversion fpt or ghec %} - - {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100GB per month. + - {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100 GB per month. - {% data variables.product.prodname_pages %} sites have a *soft* limit of 10 builds per hour. If your site exceeds these usage quotas, we may not be able to serve your site, or you may receive a polite email from {% data variables.contact.contact_support %} suggesting strategies for reducing your site's impact on our servers, including putting a third-party content distribution network (CDN) in front of your site, making use of other {% data variables.product.prodname_dotcom %} features such as releases, or moving to a different hosting service that might better fit your needs. diff --git a/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md b/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md index db37fdb89343..53409418ac4e 100644 --- a/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md +++ b/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md @@ -29,6 +29,8 @@ shortTitle: Review dependency changes {% data reusables.dependency-review.feature-overview %} +{% ifversion ghec %}Before you can use dependency review in a private repository, you must enable the dependency graph. For more information, see "[Exploring the dependencies of a repository](/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository)."{% endif %} + {% ifversion ghes > 3.1 %} Before you can use dependency review, you must enable the dependency graph and connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. 詳しい情報については、「[{% data variables.product.prodname_ghe_server %}の脆弱性のある依存関係に関するセキュリティアラートの有効化](/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)」を参照してください。 {% endif %} 依存関係のレビューでは、「左にシフト」することができます。 提供された予測情報を使用して、本番環境に至る前に脆弱性のある依存関係をキャッチできます。 詳しい情報については「[依存関係のレビュー](/code-security/supply-chain-security/about-dependency-review)」を参照してください。 diff --git a/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md b/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md index fb333550a56b..52f6706ada59 100644 --- a/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md +++ b/translations/ja-JP/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md @@ -68,7 +68,7 @@ For more information on reviewing pull requests in {% data variables.product.pro {% data reusables.dependency-review.beta %} -プルリクエストに依存関係への変更が含まれている場合は、マニフェストまたはロックファイルの依存関係のレビューを使用して、何が変更されたかを確認し、変更によるセキュリティの脆弱性の発生の有無を確認できます。 詳しい情報については「[Pull Request中の依存関係の変更のレビュー](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request)」を参照してください。 +プルリクエストに依存関係への変更が含まれている場合は、マニフェストまたはロックファイルの依存関係のレビューを使用して、何が変更されたかを確認し、変更によるセキュリティの脆弱性の発生の有無を確認できます。 詳しい情報については「[Pull Request中の依存関係の変更のレビュー](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request)」を参照してください。 {% data reusables.repositories.changed-files %} diff --git a/translations/ja-JP/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md b/translations/ja-JP/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md index 83b3192cc39c..1563308d598f 100644 --- a/translations/ja-JP/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md +++ b/translations/ja-JP/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md @@ -36,13 +36,13 @@ Before you can push the original repository to your new copy, or _mirror_, of th ``` 3. 新しいリポジトリをミラープッシュします。 ```shell - $ cd old-repository + $ cd old-repository.git $ git push --mirror https://{% data variables.command_line.codeblock %}/exampleuser/new-repository.git ``` 4. 先ほど作成した一時ローカルリポジトリを削除します。 ```shell $ cd .. - $ rm -rf old-repository + $ rm -rf old-repository.git ``` ## {% data variables.large_files.product_name_long %} オブジェクトを含むリポジトリをミラーする @@ -54,7 +54,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th ``` 3. クローンしたリポジトリに移動します。 ```shell - $ cd old-repository + $ cd old-repository.git ``` 4. リポジトリの {% data variables.large_files.product_name_long %} オブジェクトをプルします。 ```shell @@ -71,7 +71,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th 7. 先ほど作成した一時ローカルリポジトリを削除します。 ```shell $ cd .. - $ rm -rf old-repository + $ rm -rf old-repository.git ``` ## 別の場所にあるリポジトリをミラーする diff --git a/translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md b/translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md new file mode 100644 index 000000000000..740161495d73 --- /dev/null +++ b/translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md @@ -0,0 +1,28 @@ +--- +title: Configuring tag protection rules +shortTitle: Tag protection rules +intro: You can configure tag protection rules for your repository to prevent contributors from creating or deleting tags. +product: '{% data reusables.gated-features.tag-protection-rules %}' +versions: + fpt: '*' + ghes: '>3.4' + ghae: issue-6337 + ghec: '*' +--- + +{% note %} + +**Note:** Tag protection rules are currently in beta and subject to change. + +{% endnote %} + +When you add a tag protection rule, all tags that match the pattern provided will be protected. Only users with admin or maintain permissions in the repository will be able to create protected tags, and only users with admin permissions in the repository will be able to delete protected tags. 詳しい情報については「[Organizationのリポジトリロール](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization#permissions-for-each-role)」を参照してください。 + +Additionally, you can create custom repository roles to allow other groups of users to create or delete tags that match tag protection rules. 詳しい情報については「[Organizationのカスタムリポジトリロールの管理](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)」を参照してください。 + +{% data reusables.repositories.navigate-to-repo %} +{% data reusables.repositories.sidebar-settings %} +1. In the "Code and automation" section of the sidebar, click **{% octicon "tag" aria-label="The tag icon" %} Tags**. +1. Click **New rule**. ![New tag protection rule](/assets/images/help/repository/new-tag-protection-rule.png) +1. Under "Tag name pattern", type the pattern of the tags you want to protect. In this example, typing "\*" protects all tags. ![Set tag protection pattern](/assets/images/help/repository/set-tag-protection-pattern.png) +1. Click **Add rule**. ![Add tag protection rule](/assets/images/help/repository/add-tag-protection-rule.png) diff --git a/translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md b/translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md index 1954df6fcffc..b22a9ce9ea1f 100644 --- a/translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md +++ b/translations/ja-JP/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md @@ -17,6 +17,7 @@ children: - /enabling-anonymous-git-read-access-for-a-repository - /about-email-notifications-for-pushes-to-your-repository - /configuring-autolinks-to-reference-external-resources + - /configuring-tag-protection-rules shortTitle: Manage repository settings --- diff --git a/translations/ja-JP/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md b/translations/ja-JP/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md index 2f58e41a0d8f..d7adf46d72a4 100644 --- a/translations/ja-JP/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md +++ b/translations/ja-JP/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md @@ -69,4 +69,4 @@ You can upload an existing file to a repository on {% ifversion ghae %}{% data v ## 参考リンク -- [コマンドラインを使った既存のプロジェクトの GitHub への追加](/articles/adding-an-existing-project-to-github-using-the-command-line) +- "[Adding locally hosted code to {% data variables.product.product_name %}](/get-started/importing-your-projects-to-github/importing-source-code-to-github//adding-locally-hosted-code-to-github)" diff --git a/translations/ja-JP/content/rest/guides/basics-of-authentication.md b/translations/ja-JP/content/rest/guides/basics-of-authentication.md index 8bc1941b2514..a097b81c31d4 100644 --- a/translations/ja-JP/content/rest/guides/basics-of-authentication.md +++ b/translations/ja-JP/content/rest/guides/basics-of-authentication.md @@ -29,7 +29,7 @@ topics: どのような情報を入力しても構いませんが、**認証コールバック URL** は例外です。 これが、アプリケーションの設定にあたってもっとも重要な情報と言えるでしょう。 認証の成功後に {% data variables.product.product_name %} がユーザに返すのは、コールバックURLなのです。 -通常の Sinatra サーバーを実行しているので、ローカルインスタンスの場所は `http://localhost:4567` に設定されています。 コールバック URL を `http://localhost:4567/callback` と入力しましょう。 +通常の Sinatra サーバーを実行しているので、ローカルインスタンスの場所は `http://127.0.0.1:4567` に設定されています。 コールバック URL を `http://127.0.0.1:4567/callback` と入力しましょう。 ## ユーザ認証の承認 @@ -51,7 +51,7 @@ end ``` クライアント ID とクライアントシークレットは、[アプリケーションの設定ページ][app settings]から取得されます。 -{% ifversion fpt or ghec %} You should **never, _ever_** store these values in +{% ifversion fpt or ghec %}これらの値は**いかなる場合も_決して_** {% data variables.product.product_name %} や、それに限らず公開の場に保存しないでください。{% endif %}これらは [環境変数][about env vars]として保存することをお勧めします。この例でも、そのようにしています。 @@ -76,11 +76,11 @@ end ``` -(シナトラの仕組みに詳しくない方は、[Sinatraのガイド][Sinatra guide]を読むことをお勧めします。) +(Sinatraの仕組みに詳しくない方は、[Sinatraのガイド][Sinatra guide]を読むことをお勧めします。) URLはアプリケーションに要求された[スコープ][oauth scopes]を`scope`クエリパラメータで定義していることにも注目しましょう。 このアプリケーションでは、プライベートのメールアドレスを読み込むため、`user:email`スコープをリクエストしています。 -ブラウザで`http://localhost:4567`に移動します。 リンクをクリックすると、{% data variables.product.product_name %}に移動し、以下のようなダイアログが表示されます。 ![GitHubのOAuthプロンプト](/assets/images/oauth_prompt.png) +ブラウザで`http://127.0.0.1:4567`にアクセスしてください。 リンクをクリックすると、{% data variables.product.product_name %}に移動し、以下のようなダイアログが表示されます。 ![GitHubのOAuthプロンプト](/assets/images/oauth_prompt.png) あなた自身を信用する場合は、[**Authorize App**]をクリックします。 おっと、 Sinatraが`404`エラーを吐き出しました。 いったい何が起こったのでしょうか。 @@ -133,7 +133,7 @@ end リクエストを行う前にのみスコープを確認するだけでは不十分です。確認時と実際のリクエスト時の間に、ユーザがスコープを変更する可能性があります。 このような場合には、成功すると思っていたAPIの呼び出しが`404`または`401`ステータスになって失敗したり、情報の別のサブセットを返したりします。 -この状況にうまく対応できるように、有効なトークンによるリクエストに対するすべてのAPIレスポンスには、[`X-OAuth-Scopes`ヘッダ][oauth scopes]も含まれています。 このヘッダには、リクエストを行うために使用されたトークンのスコープのリストが含まれています。 In addition to that, the OAuth Applications API provides an endpoint to {% ifversion fpt or ghes or ghec %} [check a token for validity](/rest/reference/apps#check-a-token){% else %}[check a token for validity](/rest/reference/apps#check-an-authorization){% endif %}. この情報を使用してトークンのスコープにおける変更を検出し、利用可能なアプリケーション機能の変更をユーザに通知します。 +この状況にうまく対応できるように、有効なトークンによるリクエストに対するすべてのAPIレスポンスには、[`X-OAuth-Scopes`ヘッダ][oauth scopes]も含まれています。 このヘッダには、リクエストを行うために使用されたトークンのスコープのリストが含まれています。 それに加えて、OAuthアプリケーションAPIは、{% ifversion fpt or ghes or ghec %}[トークンの有効性のチェック](/rest/reference/apps#check-a-token){% else %}[トークンの有効性のチェック](/rest/reference/apps#check-an-authorization){% endif %}のためのエンドポイントを提供します。 この情報を使用してトークンのスコープにおける変更を検出し、利用可能なアプリケーション機能の変更をユーザに通知します。 ### 認証リクエストの実施 @@ -175,7 +175,7 @@ erb :basic, :locals => auth_result ## 「永続的な」認証の実装 -ウェブページにアクセスするたびに、ユーザにアプリケーションへのログインを求めるというのは非常に悪いモデルです。 たとえば、`http://localhost:4567/basic`に直接移動してみてください。 エラーになるでしょう。 +ウェブページにアクセスするたびに、ユーザにアプリケーションへのログインを求めるというのは非常に悪いモデルです。 たとえば、`http://127.0.0.1:4567/basic`に直接アクセスしてみてください。 エラーになるでしょう。 「ここをクリック」というプロセスをすべてなくし、ユーザが__ {% data variables.product.product_name %} にログインしている限りそれを記憶して、このアプリケーションにアクセスできるとしたらどうでしょうか。 実のところ、 @@ -265,7 +265,7 @@ get '/callback' do end ``` -コードの大部分は見慣れたもののはずです。 For example, we're still using `RestClient.get` to call out to the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, and we're still passing our results to be rendered in an ERB template (this time, it's called `advanced.erb`). +コードの大部分は見慣れたもののはずです。 たとえば、ここでも{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} APIを呼び出すために`RestClient.get`を使用し、 またERBテンプレート (この例では`advanced.erb`) に結果をレンダリングするため結果を渡しています。 また、ここでは`authenticated?`メソッドを使い、ユーザがすでに認証されているかを確認しています。 認証されていない場合は、`authenticate!`メソッドが呼び出され、OAuthのフローを実行して、付与されたトークンとスコープでセッションを更新します。 @@ -294,7 +294,7 @@ end ``` -コマンドラインから`ruby advanced_server.rb`を呼び出します。このコマンドは、ポート`4567` (単純なSinatraアプリケーションを使用していた時と同じポート) でサーバーを起動します。 `http://localhost:4567` に移動すると、アプリケーションは`authenticate!`を呼び出し、`/callback`にリダイレクトします。 そして`/callback`で`/`に戻され、認証が終わっているので_advanced.erb_がレンダリングされます。 +コマンドラインから`ruby advanced_server.rb`を呼び出します。このコマンドは、ポート`4567` (単純なSinatraアプリケーションを使用していた時と同じポート) でサーバーを起動します。 `http://127.0.0.1:4567` にアクセスすると、アプリケーションは`authenticate!`を呼び出し、`/callback`にリダイレクトします。 そして`/callback`で`/`に戻され、認証が終わっているので_advanced.erb_がレンダリングされます。 {% data variables.product.product_name %}のコールバックURLを`/`にするだけで、このラウンドトリップ経路を単純化できました。 ただし、_server.rb_と_advanced.rb_の両方が同じコールバックURLに依存しているため、動作は少し不安定になります。 diff --git a/translations/ja-JP/content/rest/guides/best-practices-for-integrators.md b/translations/ja-JP/content/rest/guides/best-practices-for-integrators.md index 6c48cbdddb87..80b8931a40cd 100644 --- a/translations/ja-JP/content/rest/guides/best-practices-for-integrators.md +++ b/translations/ja-JP/content/rest/guides/best-practices-for-integrators.md @@ -1,6 +1,6 @@ --- title: インテグレーターのためのベストプラクティス -intro: 'Build an app that reliably interacts with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API and provides the best experience for your users.' +intro: '信頼性を持って{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} APIとやりとりをするアプリケーションを構築し、ユーザに最善の体験を提供してください。' redirect_from: - /guides/best-practices-for-integrators - /v3/guides/best-practices-for-integrators @@ -143,11 +143,11 @@ GitHub APIの[レート制限](/rest/overview/resources-in-the-rest-api#rate-lim [レート制限ステータスの確認](/rest/reference/rate-limit)はいつでも可能です。 レート制限を確認しても、その通信量はレート制限に影響しません。 -## Dealing with secondary rate limits +## セカンダリレート制限の扱い -[Secondary rate limits](/rest/overview/resources-in-the-rest-api#secondary-rate-limits) are another way we ensure the API's availability. この制限に到達することを避けるため、アプリケーションは以下のガイドラインに従うようにしてください。 +[セカンダリレート制限](/rest/overview/resources-in-the-rest-api#secondary-rate-limits)は、APIの可用性を保証するもう1つの方法です。 この制限に到達することを避けるため、アプリケーションは以下のガイドラインに従うようにしてください。 -* 認証済みのリクエストを行うか、アプリケーションのクライアントIDとシークレットを使用してください。 Unauthenticated requests are subject to more aggressive secondary rate limiting. +* 認証済みのリクエストを行うか、アプリケーションのクライアントIDとシークレットを使用してください。 認証されていないリクエストには、より強いセカンダリレート制限が適用されます。 * 単一のユーザまたはクライアントIDに順番にリクエストを行ってください。 単一のユーザまたはクライアントIDのリクエストは同時に行わないでください。 * 単一のユーザまたはクライアントIDで多数の`POST`、`PATCH`、`PUT`、`DELETE`リクエストを行う場合には、リクエストごとに少なくとも1秒の間隔をとってください。 * 制限がかかっている間は、速さを遅くするため`Retry-After`レスポンスヘッダを使用します。 `Retry-After`ヘッダの値は常に整数とします。この値は、再度リクエストを行う前に待機すべき秒数を示します。 たとえば、`Retry-After: 30`は、次のリクエストを送信するまで30秒待機する必要があることを意味します。 diff --git a/translations/ja-JP/content/rest/guides/building-a-ci-server.md b/translations/ja-JP/content/rest/guides/building-a-ci-server.md index 00f2189119df..fde0cde7d8d7 100644 --- a/translations/ja-JP/content/rest/guides/building-a-ci-server.md +++ b/translations/ja-JP/content/rest/guides/building-a-ci-server.md @@ -84,7 +84,7 @@ end サーバーの環境を整えたところで、最初の要件、すなわちCIステータスの設定 (および更新) を行う準備が整いました。 サーバーを更新するごとに、[**Redeliver**]をクリックして同じペイロードを送信できます。 変更を行うたびに新しいプルリクエストを作成する必要はありません。 -Since we're interacting with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, we'll use [Octokit.rb][octokit.rb] to manage our interactions. そのクライアントは、以下のように構成します。 +{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} APIとやりとりをしているので、そのやりとりを管理するために[Octokit.rb][octokit.rb]を使います。 そのクライアントは、以下のように構成します。 ``` ruby # !!! DO NOT EVER USE HARD-CODED VALUES IN A REAL APP !!! diff --git a/translations/ja-JP/content/rest/guides/delivering-deployments.md b/translations/ja-JP/content/rest/guides/delivering-deployments.md index 4f00fc39ba34..4add179b01f4 100644 --- a/translations/ja-JP/content/rest/guides/delivering-deployments.md +++ b/translations/ja-JP/content/rest/guides/delivering-deployments.md @@ -20,7 +20,7 @@ topics: このAPIでは、ステータスAPIを使って、利用できる設定を示します。 このシナリオでは、以下を行います。 -* Merge a pull request. +* Pull Requestをマージします。 * CIが終了したら、それに応じてプルリクエストのステータスを設定します。 * プルリクエストがマージされたら、サーバーでデプロイメントを実行します。 @@ -139,11 +139,11 @@ end ## おわりに -GitHubでは長年、デプロイメントを管理するため[Heaven][heaven]の特定のバージョンを使用してきました。 A common flow is essentially the same as the server we've built above: +GitHubでは長年、デプロイメントを管理するため[Heaven][heaven]の特定のバージョンを使用してきました。 一般的なフローは、上で構築したサーバーと本質的に同じです。 -* Wait for a response on the state of the CI checks (success or failure) -* If the required checks succeed, merge the pull request -* Heaven takes the merged code, and deploys it to staging and production servers +* CIチェックのステータスに対する応答（成功もしくは失敗）を待つ +* 必要なチェックが成功していれば、Pull Requestをマージする +* Heavenはマージされたコードを取り込み、ステージング及びプロダクションサーバーにデプロイする * その間にHeavenは、当社のチャットルームに居座っている[Hubot][hubot]を通じて全員にビルドについて通知する これで完了です。 この例を使用するために、独自のデプロイメントを構築する必要はありません。 いつでも[GitHubインテグレーション][integrations]に頼ることができます。 diff --git a/translations/ja-JP/content/rest/guides/discovering-resources-for-a-user.md b/translations/ja-JP/content/rest/guides/discovering-resources-for-a-user.md index 23beafc90367..a7c7ac3c1cc1 100644 --- a/translations/ja-JP/content/rest/guides/discovering-resources-for-a-user.md +++ b/translations/ja-JP/content/rest/guides/discovering-resources-for-a-user.md @@ -16,9 +16,9 @@ shortTitle: ユーザのリソースを見つける -When making authenticated requests to the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, applications often need to fetch the current user's repositories and organizations. このガイドでは、これらのリソースを確実に調べる方法について説明します。 +{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} APIに対して認証済みのリクエストを行う際には、アプリケーションがカレントユーザのリポジトリやOrganizationをフェッチしなければならないことがしばしばあります。 このガイドでは、これらのリソースを確実に調べる方法について説明します。 -To interact with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, we'll be using [Octokit.rb][octokit.rb]. このプロジェクトの完全なソースコードは、[platform-samples][platform samples]リポジトリにあります。 +{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} APIとやりとりをするために、[Octokit.rb][octokit.rb]を使います。 このプロジェクトの完全なソースコードは、[platform-samples][platform samples]リポジトリにあります。 ## はじめましょう @@ -26,7 +26,7 @@ To interact with the {% ifversion fpt or ghec %}{% data variables.product.prodna ## アプリケーションでアクセス可能なユーザのリポジトリを調べる -ユーザは、個人でリポジトリを所有する他に、別のユーザやOrganizationが所有するリポジトリのコラボレータであることもあります。 Collectively, these are the repositories where the user has privileged access: either it's a private repository where the user has read or write access, or it's {% ifversion fpt %}a public{% elsif ghec or ghes %}a public or internal{% elsif ghae %}an internal{% endif %} repository where the user has write access. +ユーザは、個人でリポジトリを所有する他に、別のユーザやOrganizationが所有するリポジトリのコラボレータであることもあります。 まとめると、ユーザが権限を持ってアクセスできるリポジトリがあります。それはユーザが読み取りあるいは書き込みアクセスを持つプライベートリポジトリであったり、ユーザが書き込み権限を持つ{% ifversion fpt %}パブリック{% elsif ghec or ghes %}パブリックもしくはインターナル{% elsif ghae %}インターナル{% endif %}リポジトリであったりします。 アプリがユーザのどのリポジトリにアクセスできるかを決めるのは、[OAuthスコープ][scopes]および[Organizationのアプリケーションポリシー][oap]です。 以下のワークフローを使用して、これらのリポジトリを調べます。 diff --git a/translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md b/translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md index bc3943fa8b2e..4791afc21213 100644 --- a/translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md +++ b/translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md @@ -1,6 +1,6 @@ --- -title: REST APIを使ってみる -intro: 認証とエンドポイントの例から始めて、REST APIを使用するための基礎を学びます。 +title: Getting started with the REST API +intro: 'Learn the foundations for using the REST API, starting with authentication and some endpoint examples.' redirect_from: - /guides/getting-started - /v3/guides/getting-started @@ -11,23 +11,28 @@ versions: ghec: '*' topics: - API -shortTitle: 始めましょう - REST API +shortTitle: Get started - REST API --- -日常的なユースケースに取り組みながら、APIの中心的な概念を見ていきましょう。 +Let's walk through core API concepts as we tackle some everyday use cases. {% data reusables.rest-api.dotcom-only-guide-note %} -## 概要 +## Overview -ほとんどのアプリケーションは、任意の言語において既存の[ラッパーライブラリ][wrappers]を使用しています。ただ、まずは基底となっているAPI HTTPメソッドについて知ることが大切です。 +Most applications will use an existing [wrapper library][wrappers] in the language +of your choice, but it's important to familiarize yourself with the underlying API +HTTP methods first. -ちょっと試しにやってみるだけなら、[cURL][curl]を使うのが一番簡単です。{% ifversion fpt or ghec %}別のクライアントを使用している場合、リクエストで有効な [ユーザエージェントのヘッダ](/rest/overview/resources-in-the-rest-api#user-agent-required)を送信する必要があることに注意してください。{% endif %} +There's no easier way to kick the tires than through [cURL][curl].{% ifversion fpt or ghec %} If you are using +an alternative client, note that you are required to send a valid +[User Agent header](/rest/overview/resources-in-the-rest-api#user-agent-required) in your request.{% endif %} ### Hello World -まずはセットアップをテストすることから始めましょう。 コマンドプロンプトを開き、次のコマンドを入力します。 +Let's start by testing our setup. Open up a command prompt and enter the +following command: ```shell $ curl https://api.github.com/zen @@ -35,9 +40,9 @@ $ curl https://api.github.com/zen > Keep it logically awesome. ``` -レスポンスは、私たちの設計思想からランダムに選択されます。 +The response will be a random selection from our design philosophies. -次に、[Chris Wanstrathの][defunkt github][GitHubプロフィール][users api]を`GET`します。 +Next, let's `GET` [Chris Wanstrath's][defunkt github] [GitHub profile][users api]: ```shell # GET /users/defunkt @@ -55,7 +60,7 @@ $ curl https://api.github.com/users/defunkt > } ``` -うーん、[JSON][json]っぽいですね。 `-i`フラグを追加して、ヘッダを入れてみましょう。 +Mmmmm, tastes like [JSON][json]. Let's add the `-i` flag to include headers: ```shell $ curl -i https://api.github.com/users/defunkt @@ -99,29 +104,38 @@ $ curl -i https://api.github.com/users/defunkt > } ``` -レスポンスヘッダの中に、ちょっと面白いものがありますね。 思っていたとおり、`Content-Type`は`application/json`です。 +There are a few interesting bits in the response headers. As expected, the +`Content-Type` is `application/json`. -`X-`で始まるヘッダはすべてカスタムヘッダで、HTTPの仕様にはありません。 例: +Any headers beginning with `X-` are custom headers, and are not included in the +HTTP spec. For example: -* `X-GitHub-Media-Type`の値は`github.v3`です。 これは、レスポンスの[メディアタイプ][media types]を伝えています。 メディアタイプは、出力をAPI v3にするために役立ちました。 これについては、後ほど詳しく説明します。 -* `X-RateLimit-Limit`と`X-RateLimit-Remaining`のヘッダに注目してください。 This pair of headers indicate [how many requests a client can make][rate-limiting] in a rolling time period (typically an hour) and how many of those requests the client has already spent. +* `X-GitHub-Media-Type` has a value of `github.v3`. This lets us know the [media type][media types] +for the response. Media types have helped us version our output in API v3. We'll +talk more about that later. +* Take note of the `X-RateLimit-Limit` and `X-RateLimit-Remaining` headers. This +pair of headers indicate [how many requests a client can make][rate-limiting] in +a rolling time period (typically an hour) and how many of those requests the +client has already spent. -## 認証 +## Authentication -認証されていないクライアントは、1時間に60件のリクエストを行うことができます。 1時間あたりのリクエストを増やすには、_認証_が必要です。 In fact, doing anything interesting with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API requires [authentication][authentication]. +Unauthenticated clients can make 60 requests per hour. To get more requests per hour, we'll need to +_authenticate_. In fact, doing anything interesting with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API requires +[authentication][authentication]. -### 個人アクセストークンの使用 +### Using personal access tokens -The easiest and best way to authenticate with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API is by using Basic Authentication [via OAuth tokens](/rest/overview/other-authentication-methods#via-oauth-and-personal-access-tokens). OAuthトークンには[個人アクセストークン][personal token]が含まれています。 +The easiest and best way to authenticate with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API is by using Basic Authentication [via OAuth tokens](/rest/overview/other-authentication-methods#via-oauth-and-personal-access-tokens). OAuth tokens include [personal access tokens][personal token]. -`-u`フラグを使って、ユーザ名を設定します。 +Use a `-u` flag to set your username: ```shell $ curl -i -u your_username {% data variables.product.api_url_pre %}/users/octocat ``` -プロンプトが表示されたらOAuthトークンを入力できますが、そのための変数を設定することをお勧めします。 +When prompted, you can enter your OAuth token, but we recommend you set up a variable for it: You can use `-u "your_username:$token"` and set up a variable for `token` to avoid leaving your token in shell history, which should be avoided. @@ -130,9 +144,9 @@ $ curl -i -u your_username:$token {% data variables.product.api_url_pre ``` -認証の際、`X-RateLimit-Limit`ヘッダが示す通り、レート制限が1時間に5,000リクエストに上がったことがわかるはずです。 1時間あたりの呼び出し数が増えるだけでなく、認証するとAPIを使用してプライベート情報を読み書きできます。 +When authenticating, you should see your rate limit bumped to 5,000 requests an hour, as indicated in the `X-RateLimit-Limit` header. In addition to providing more calls per hour, authentication enables you to read and write private information using the API. -[個人アクセストークンの設定ページ][tokens settings]から、簡単に[**個人アクセストークン**を作成][personal token]できます。 +You can easily [create a **personal access token**][personal token] using your [Personal access tokens settings page][tokens settings]: {% ifversion fpt or ghes > 3.1 or ghae-issue-4374 or ghec %} {% warning %} @@ -143,20 +157,22 @@ To help keep your information secure, we highly recommend setting an expiration {% endif %} {% ifversion fpt or ghes or ghec %} -![個人トークンの選択](/assets/images/personal_token.png) +![Personal Token selection](/assets/images/personal_token.png) {% endif %} {% ifversion ghae %} -![個人トークンの選択](/assets/images/help/personal_token_ghae.png) +![Personal Token selection](/assets/images/help/personal_token_ghae.png) {% endif %} {% ifversion fpt or ghes > 3.1 or ghae-issue-4374 or ghec %} API requests using an expiring personal access token will return that token's expiration date via the `GitHub-Authentication-Token-Expiration` header. You can use the header in your scripts to provide a warning message when the token is close to its expiration date. {% endif %} -### ユーザプロフィールの取得 +### Get your own user profile -When properly authenticated, you can take advantage of the permissions associated with your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}. たとえば、あなたのプロフィールを取得してみましょう。 +When properly authenticated, you can take advantage of the permissions +associated with your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}. For example, try getting +[your own user profile][auth user api]: ```shell $ curl -i -u your_username:your_token {% data variables.product.api_url_pre %}/user @@ -173,72 +189,89 @@ $ curl -i -u your_username:your_token {% data variables.produc > } ``` -今回は、以前に[@defunkt][defunkt github]について取得した公開情報の同じセットに加えて、あなたのユーザプロフィールのパブリックではない情報もあるはずです。 たとえば、アカウントの{% data variables.product.product_name %}プランに関する詳細を持つ`plan`オブジェクトがレスポンス中にあります。 +This time, in addition to the same set of public information we +retrieved for [@defunkt][defunkt github] earlier, you should also see the non-public information for your user profile. For example, you'll see a `plan` object in the response which gives details about the {% data variables.product.product_name %} plan for the account. -### OAuthトークンのアプリケーションへの使用 +### Using OAuth tokens for apps -他のユーザに代わりAPIを使用してプライベートな情報を読み書きする必要があるアプリは、 [OAuth][oauth]を使用すべきです。 +Apps that need to read or write private information using the API on behalf of another user should use [OAuth][oauth]. -OAuthは_トークン_を使用します。 トークンには、次の2つの重要な機能があります。 +OAuth uses _tokens_. Tokens provide two big features: -* **アクセスを取り消せる**: ユーザはサードパーティアプリケーションへの認可をいつでも取り消すことができます -* **制限付きアクセス**: ユーザはサードパーティーアプリケーションを認可する前に、トークンが提供する特定のアクセスを確認できます +* **Revokable access**: users can revoke authorization to third party apps at any time +* **Limited access**: users can review the specific access that a token + will provide before authorizing a third party app -トークンは[web フロー][webflow]から作成してください。 アプリケーションはユーザを{% data variables.product.product_name %}に送信してログインします。 それから{% data variables.product.product_name %}はアプリケーションの名前と、ユーザが認可した場合のアクセス権レベルを示すダイアログを表示します。 ユーザがアクセスを認可すると、{% data variables.product.product_name %}はユーザをアプリケーションにリダイレクトします。 +Tokens should be created via a [web flow][webflow]. An application +sends users to {% data variables.product.product_name %} to log in. {% data variables.product.product_name %} then presents a dialog +indicating the name of the app, as well as the level of access the app +has once it's authorized by the user. After a user authorizes access, {% data variables.product.product_name %} +redirects the user back to the application: -![GitHubのOAuthプロンプト](/assets/images/oauth_prompt.png) +![GitHub's OAuth Prompt](/assets/images/oauth_prompt.png) -**OAuthトークンはパスワードと同様に扱ってください。**他のユーザと共有したり、安全でない場所に保存したりしてはいけません。 ここにあるトークンのサンプルは架空のものであり、不要な被害を防ぐため名前を変更しています。 +**Treat OAuth tokens like passwords!** Don't share them with other users or store +them in insecure places. The tokens in these examples are fake and the names have +been changed to protect the innocent. -さて、これで認証された呼び出しのコツをつかみました。それでは次は[リポジトリ API][repos-api]に進みましょう。 +Now that we've got the hang of making authenticated calls, let's move along to +the [Repositories API][repos-api]. -## リポジトリ +## Repositories -Almost any meaningful use of the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API will involve some level of Repository information. 以前にユーザ情報をフェッチしたのと同じ方法で、[リポジトリの詳細を`GET`][get repo]できます。 +Almost any meaningful use of the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API will involve some level of Repository +information. We can [`GET` repository details][get repo] in the same way we fetched user +details earlier: ```shell $ curl -i {% data variables.product.api_url_pre %}/repos/twbs/bootstrap ``` -同様に、[認証済みのユーザのリポジトリを表示][user repos api]できます。 +In the same way, we can [view repositories for the authenticated user][user repos api]: ```shell $ curl -i -H "Authorization: token {% ifversion fpt or ghes > 3.1 or ghae or ghec %}ghp_16C7e42F292c6912E7710c838347Ae178B4a{% else %}5199831f4dd3b79e7c5b7e0ebe75d67aa66e79d4{% endif %}" \ {% data variables.product.api_url_pre %}/user/repos ``` -また、[別のユーザのリポジトリを一覧表示][other user repos api]できます。 +Or, we can [list repositories for another user][other user repos api]: ```shell $ curl -i {% data variables.product.api_url_pre %}/users/octocat/repos ``` -あるいは、[Organizationのリポジトリを一覧表示][org repos api]することもできます。 +Or, we can [list repositories for an organization][org repos api]: ```shell $ curl -i {% data variables.product.api_url_pre %}/orgs/octo-org/repos ``` -これらの呼び出しから返される情報は、認証時にトークンが持っているスコープにより異なります。 +The information returned from these calls will depend on which scopes our token has when we authenticate: {%- ifversion fpt or ghec or ghes %} * A token with `public_repo` [scope][scopes] returns a response that includes all public repositories we have access to see on {% data variables.product.product_location %}. {%- endif %} * A token with `repo` [scope][scopes] returns a response that includes all {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories we have access to see on {% data variables.product.product_location %}. -[Docs][repos-api]に記載されている通り、これらのメソッドは`type`パラメータを取り、これによって、ユーザがリポジトリに対して持つアクセス権に基づき、返されるリポジトリをフィルタリングできます。 こうすることで、直接所有するリポジトリ、Organizationのリポジトリ、またはチームによりユーザがコラボレーションするリポジトリに限定してフェッチすることができます。 +As the [docs][repos-api] indicate, these methods take a `type` parameter that +can filter the repositories returned based on what type of access the user has +for the repository. In this way, we can fetch only directly-owned repositories, +organization repositories, or repositories the user collaborates on via a team. ```shell $ curl -i "{% data variables.product.api_url_pre %}/users/octocat/repos?type=owner" ``` -この例では、octocatが所有するリポジトリのみを取得し、コラボレーションするリポジトリは取得しません。 URLが引用符で囲まれていることに注目してください。 シェルの設定によっては、cURLはURLを引用符で囲まないとクエリ文字列型を無視することがあります。 +In this example, we grab only those repositories that octocat owns, not the +ones on which she collaborates. Note the quoted URL above. Depending on your +shell setup, cURL sometimes requires a quoted URL or else it ignores the +query string. -### リポジトリの作成 +### Create a repository -既存のリポジトリ情報をフェッチすることは一般的なユースケースですが、 -{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API supports creating new repositories as well. [リポジトリを作成する][create repo]には、 -詳細情報や設定オプションを含んだいくつかのJSONを`POST`する必要があります。 +Fetching information for existing repositories is a common use case, but the +{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API supports creating new repositories as well. To [create a repository][create repo], +we need to `POST` some JSON containing the details and configuration options. ```shell $ curl -i -H "Authorization: token {% ifversion fpt or ghes > 3.1 or ghae or ghec %}ghp_16C7e42F292c6912E7710c838347Ae178B4a{% else %}5199831f4dd3b79e7c5b7e0ebe75d67aa66e79d4{% endif %}" \ @@ -251,11 +284,14 @@ $ curl -i -H "Authorization: token {% ifversion fpt or ghes > 3.1 or ghae or ghe {% data variables.product.api_url_pre %}/user/repos ``` -この最小限の例では、ブログ用の新しいプライベートリポジトリを作成しています ([GitHub Pages][pages]で提供されるかもしれません)。 このブログは{% ifversion not ghae %}パブリックになり{% else %}すべてのEnterpriseメンバーからアクセスできるようになり{% endif %}ますが、このリポジトリはプライベートにしました。 このステップでは、READMEと[nanoc][nanoc]フレーバーの[.gitignore テンプレート][gitignore templates]によるリポジトリの初期化も行います。 +In this minimal example, we create a new private repository for our blog (to be served +on [GitHub Pages][pages], perhaps). Though the blog {% ifversion not ghae %}will be public{% else %}is accessible to all enterprise members{% endif %}, we've made the repository private. In this single step, we'll also initialize it with a README and a [nanoc][nanoc]-flavored [.gitignore template][gitignore templates]. -生成されたリポジトリは、`https://github.com//blog`にあります。 オーナーであるOrganization以下にリポジトリを作成するには、APIメソッドを `/user/repos`から`/orgs//repos`に変更するだけです。 +The resulting repository will be found at `https://github.com//blog`. +To create a repository under an organization for which you're +an owner, just change the API method from `/user/repos` to `/orgs//repos`. -次に、新しく作成したリポジトリをフェッチしましょう。 +Next, let's fetch our newly created repository: ```shell $ curl -i {% data variables.product.api_url_pre %}/repos/pengwynn/blog @@ -267,36 +303,46 @@ $ curl -i {% data variables.product.api_url_pre %}/repos/pengwynn/blog > } ``` -あれれ？ どこにいったのでしょう。 リポジトリを_プライベート_にして作成したので、表示するには認証する必要があります。 古参のHTTPユーザの方なら、`403`が出ると思っていたかもしれません。 Since we don't want to leak information about private repositories, the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API returns a `404` in this case, as if to say "we can neither confirm nor deny the existence of this repository." +Oh noes! Where did it go? Since we created the repository as _private_, we need +to authenticate in order to see it. If you're a grizzled HTTP user, you might +expect a `403` instead. Since we don't want to leak information about private +repositories, the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API returns a `404` in this case, as if to say "we can +neither confirm nor deny the existence of this repository." -## Issue +## Issues -{% data variables.product.product_name %}のIssue用UIは、「必要十分」なワークフローを提供しつつ、邪魔にならないということを目指しています。 {% data variables.product.product_name %} [Issues API][issues-api]を使えば、他のツールからデータを引き出したり、Issueを作成したりして、あなたのTeamに合ったワークフローを作成できます。 +The UI for Issues on {% data variables.product.product_name %} aims to provide 'just enough' workflow while +staying out of your way. With the {% data variables.product.product_name %} [Issues API][issues-api], you can pull +data out or create issues from other tools to create a workflow that works for +your team. -GitHub.comと同じように、Issues APIは認証されたユーザがIssueを表示するためのメソッドをいくつか提供します。 [すべてのIssueを表示][get issues api]するには、`GET /issues`を呼び出します。 +Just like github.com, the API provides a few methods to view issues for the +authenticated user. To [see all your issues][get issues api], call `GET /issues`: ```shell $ curl -i -H "Authorization: token {% ifversion fpt or ghes > 3.1 or ghae or ghec %}ghp_16C7e42F292c6912E7710c838347Ae178B4a{% else %}5199831f4dd3b79e7c5b7e0ebe75d67aa66e79d4{% endif %}" \ {% data variables.product.api_url_pre %}/issues ``` -[あなたの{% data variables.product.product_name %} Organizationのうちの1つのIssue][get issues api]のみを取得するには、`GET -/orgs//issues`を呼び出します。 +To get only the [issues under one of your {% data variables.product.product_name %} organizations][get issues api], call `GET +/orgs//issues`: ```shell $ curl -i -H "Authorization: token {% ifversion fpt or ghes > 3.1 or ghae or ghec %}ghp_16C7e42F292c6912E7710c838347Ae178B4a{% else %}5199831f4dd3b79e7c5b7e0ebe75d67aa66e79d4{% endif %}" \ {% data variables.product.api_url_pre %}/orgs/rails/issues ``` -また、[1つのリポジトリにあるすべてのIssue][repo issues api]を取得することもできます。 +We can also get [all the issues under a single repository][repo issues api]: ```shell $ curl -i {% data variables.product.api_url_pre %}/repos/rails/rails/issues ``` -### ページネーション +### Pagination -Railsのような規模のプロジェクトになれば、万単位のIssueがあります。 [ページネーション][pagination]を行い、API呼び出しを複数回行ってデータを取得する必要があります。 直近で行った呼び出しを繰り返してみましょう。今回はレスポンスヘッダに注目してください。 +A project the size of Rails has thousands of issues. We'll need to [paginate][pagination], +making multiple API calls to get the data. Let's repeat that last call, this +time taking note of the response headers: ```shell $ curl -i {% data variables.product.api_url_pre %}/repos/rails/rails/issues @@ -308,13 +354,20 @@ $ curl -i {% data variables.product.api_url_pre %}/repos/rails/rails/issues > ... ``` -[`Link`ヘッダ][link-header]は、外部リソースへのリンクに対するレスポンスの方法を提供します。今回の場合は、追加のデータページです。 呼び出しで30 (デフォルトのページサイズ) を超えるIssueを検出したので、APIは次のページと最後のページの場所を伝えます。 +The [`Link` header][link-header] provides a way for a response to link to +external resources, in this case additional pages of data. Since our call found +more than thirty issues (the default page size), the API tells us where we can +find the next page and the last page of results. -### Issue の作成 +### Creating an issue -Issueのリストでページネーションを行う方法を確認したので、次はAPIから[Issueを作成][create issue]しましょう。 +Now that we've seen how to paginate lists of issues, let's [create an issue][create issue] from +the API. -Issueを作成するには認証される必要があるので、ヘッダにOAuthトークンを渡します。 また、タイトル、本文、およびJSONの本文にあるラベルを、Issueを作成したい、リポジトリ以下の`/issues`パスに渡します。 +To create an issue, we need to be authenticated, so we'll pass an +OAuth token in the header. Also, we'll pass the title, body, and labels in the JSON +body to the `/issues` path underneath the repository in which we want to create +the issue: ```shell $ curl -i -H 'Authorization: token {% ifversion fpt or ghes > 3.1 or ghae or ghec %}ghp_16C7e42F292c6912E7710c838347Ae178B4a{% else %}5199831f4dd3b79e7c5b7e0ebe75d67aa66e79d4{% endif %}' \ @@ -366,11 +419,14 @@ $ {% data variables.product.api_url_pre %}/repos/pengwynn/api-sandbox/issues > } ``` -レスポンスでは、新しく作成されたIssueに2つのポインタを提供し、それは両方とも`Location`レスポンスヘッダとJSONレスポンスの `url`フィールドにあります。 +The response gives us a couple of pointers to the newly created issue, both in +the `Location` response header and the `url` field of the JSON response. -## 条件付きリクエスト +## Conditional requests -良きAPI利用者であるために非常に大切なのは、変更されていない情報をキャッシュして、レート制限を尊重するということです。 APIは[条件付きリクエスト][conditional-requests]をサポートしており、正しいことを行うための役に立ちます。 最初に呼び出した、Chris Wanstrathのプロフィールを取り上げてみましょう。 +A big part of being a good API citizen is respecting rate limits by caching information that hasn't changed. The API supports [conditional +requests][conditional-requests] and helps you do the right thing. Consider the +first call we made to get defunkt's profile: ```shell $ curl -i {% data variables.product.api_url_pre %}/users/defunkt @@ -379,7 +435,10 @@ $ curl -i {% data variables.product.api_url_pre %}/users/defunkt > etag: W/"61e964bf6efa3bc3f9e8549e56d4db6e0911d8fa20fcd8ab9d88f13d513f26f0" ``` -JSONの本文に加え、HTTPステータスコード `200`と`ETag`ヘッダに注目してください。 [ETag][etag]はレスポンスのフィンガープリントです。 後続の呼び出しにこれを渡すと、変更されたリソースだけを渡すようAPIに伝えることができます。 +In addition to the JSON body, take note of the HTTP status code of `200` and +the `ETag` header. +The [ETag][etag] is a fingerprint of the response. If we pass that on subsequent calls, +we can tell the API to give us the resource again, only if it has changed: ```shell $ curl -i -H 'If-None-Match: "61e964bf6efa3bc3f9e8549e56d4db6e0911d8fa20fcd8ab9d88f13d513f26f0"' \ @@ -388,24 +447,25 @@ $ {% data variables.product.api_url_pre %}/users/defunkt > HTTP/2 304 ``` -`304`ステータスは、直近のリクエストからリソースが変更されておらず、レスポンスには本文が含まれないことを示しています。 As a bonus, `304` responses don't count against your [rate limit][rate-limiting]. +The `304` status indicates that the resource hasn't changed since the last time +we asked for it and the response will contain no body. As a bonus, `304` responses don't count against your [rate limit][rate-limiting]. Now you know the basics of the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API! -* Basic & OAuth認証 -* リポジトリおよびIssueのフェッチと作成 -* 条件付きリクエスト +* Basic & OAuth authentication +* Fetching and creating repositories and issues +* Conditional requests -続きのAPIガイドで[認証の基本][auth guide]を学びましょう！ +Keep learning with the next API guide [Basics of Authentication][auth guide]! [wrappers]: /libraries/ [curl]: http://curl.haxx.se/ [media types]: /rest/overview/media-types [oauth]: /apps/building-integrations/setting-up-and-registering-oauth-apps/ [webflow]: /apps/building-oauth-apps/authorizing-oauth-apps/ +[create a new authorization API]: /rest/reference/oauth-authorizations#create-a-new-authorization [scopes]: /apps/building-oauth-apps/understanding-scopes-for-oauth-apps/ [repos-api]: /rest/reference/repos -[repos-api]: /rest/reference/repos [pages]: http://pages.github.com [nanoc]: http://nanoc.ws/ [gitignore templates]: https://github.com/github/gitignore @@ -413,13 +473,14 @@ Now you know the basics of the {% ifversion fpt or ghec %}{% data variables.prod [link-header]: https://www.w3.org/wiki/LinkHeader [conditional-requests]: /rest#conditional-requests [rate-limiting]: /rest/overview/resources-in-the-rest-api#rate-limit-http-headers -[rate-limiting]: /rest/overview/resources-in-the-rest-api#rate-limit-http-headers [users api]: /rest/reference/users#get-a-user -[defunkt github]: https://github.com/defunkt +[auth user api]: /rest/reference/users#get-the-authenticated-user [defunkt github]: https://github.com/defunkt [json]: http://en.wikipedia.org/wiki/JSON [authentication]: /rest#authentication -[personal token]: /articles/creating-an-access-token-for-command-line-use +[2fa]: /articles/about-two-factor-authentication +[2fa header]: /rest/overview/other-authentication-methods#working-with-two-factor-authentication +[oauth section]: /rest/guides/getting-started-with-the-rest-api#oauth [personal token]: /articles/creating-an-access-token-for-command-line-use [tokens settings]: https://github.com/settings/tokens [pagination]: /rest#pagination @@ -431,6 +492,6 @@ Now you know the basics of the {% ifversion fpt or ghec %}{% data variables.prod [other user repos api]: /rest/reference/repos#list-repositories-for-a-user [org repos api]: /rest/reference/repos#list-organization-repositories [get issues api]: /rest/reference/issues#list-issues-assigned-to-the-authenticated-user -[get issues api]: /rest/reference/issues#list-issues-assigned-to-the-authenticated-user [repo issues api]: /rest/reference/issues#list-repository-issues [etag]: http://en.wikipedia.org/wiki/HTTP_ETag +[2fa section]: /rest/guides/getting-started-with-the-rest-api#two-factor-authentication diff --git a/translations/ja-JP/data/features/reopen-dependabot-alerts.yml b/translations/ja-JP/data/features/reopen-dependabot-alerts.yml new file mode 100644 index 000000000000..bd672e3a7614 --- /dev/null +++ b/translations/ja-JP/data/features/reopen-dependabot-alerts.yml @@ -0,0 +1,7 @@ +--- +#Reference 5861 +versions: + fpt: '*' + ghec: '*' + ghes: '>3.4' + ghae: 'issue-5861' diff --git a/translations/ja-JP/data/features/restrict-groups-to-workflows.yml b/translations/ja-JP/data/features/restrict-groups-to-workflows.yml new file mode 100644 index 000000000000..5d3afa7004be --- /dev/null +++ b/translations/ja-JP/data/features/restrict-groups-to-workflows.yml @@ -0,0 +1,7 @@ +--- +#Issue 6137 +#Restrict self-hosted runner groups to specific workflows +versions: + ghec: '*' + ghes: '>=3.5' + ghae: 'issue-6137' diff --git a/translations/ja-JP/data/learning-tracks/code-security.yml b/translations/ja-JP/data/learning-tracks/code-security.yml index 91dbbde2ac23..ebd0a9809847 100644 --- a/translations/ja-JP/data/learning-tracks/code-security.yml +++ b/translations/ja-JP/data/learning-tracks/code-security.yml @@ -3,7 +3,7 @@ security_advisories: title: 'セキュリティ脆弱性の修正及び開示' description: 'Using repository security advisories to privately fix a reported vulnerability and get a CVE.' - featured_track: '{% ifversion fpt %}true{% else %}false{% endif %}' + featured_track: '{% ifversion fpt or ghec %}true{% else %}false{% endif %}' guides: - /code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities - /code-security/repository-security-advisories/creating-a-repository-security-advisory @@ -13,30 +13,30 @@ security_advisories: - /code-security/repository-security-advisories/editing-a-repository-security-advisory - /code-security/repository-security-advisories/withdrawing-a-repository-security-advisory - /code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory -#Feature available on dotcom and GHES +#Feature available on dotcom and GHES 3.3+, so articles available on GHAE and earlier GHES hidden to hide the learning track dependabot_alerts: title: '脆弱な依存関係に関する通知を取得' description: '依存関係中の新しい脆弱性に対するアラートを発するようDependabotをセットアップしてください。' guides: - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies - - '{% ifversion not ghae %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}' - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors -#Feature available only on dotcom, so articles available hidden to hide the learning track in other versions +#Feature available on dotcom and GHES 3.3+, so articles available on GHAE and earlier GHES hidden to hide the learning track dependabot_security_updates: title: '脆弱な依存関係を更新するためのPull Requestを取得' description: '新しい脆弱性が報告されたときにPull Requestを作成するようDependabotをセットアップ' guides: - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates - - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}' - - '{% ifversion fpt %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}' + - '{% ifversion fpt or ghec or ghes > 3.2 %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}' - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates - - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies{% endif %}' -#Feature available only on dotcom + - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies{% endif %}' +#Feature available only on dotcom and GHES 3.3+ dependency_version_updates: title: '依存関係を最新に保つ' description: '新しいリリースをチェックし、依存関係を更新するPull Requestを作成するためにDependabotを使ってください。' @@ -51,30 +51,32 @@ dependency_version_updates: - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors -#Feature available in all versions from GHES 3.0 up +#Feature available in GHEC, GHES 3.0 up, and GHAE. Feature limited on FPT so hidden there. secret_scanning: title: 'シークレットのスキャン' description: 'トークン、パスワード及びその他のシークレットのリポジトリへの偶発的なチェックインに対する防御として、Secret Scanningをセットアップしてください。' guides: - - /code-security/secret-scanning/about-secret-scanning - - /code-security/secret-scanning/configuring-secret-scanning-for-your-repositories - - /code-security/secret-scanning/defining-custom-patterns-for-secret-scanning - - /code-security/secret-scanning/managing-alerts-from-secret-scanning -#Security overview feature available only on dotcom currently, so other articles hidden to hide the learning path in other versions + - '{% ifversion not fpt %}/code-security/secret-scanning/about-secret-scanning{% endif %}' + - '{% ifversion not fpt %}/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories{% endif %}' + - '{% ifversion not fpt %}/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning{% endif %}' + - '{% ifversion not fpt %}/code-security/secret-scanning/managing-alerts-from-secret-scanning{% endif %}' + - '{% ifversion not fpt %}/code-security/secret-scanning/secret-scanning-patterns{% endif %}' +#Security overview feature available in GHEC and GHES 3.2+, so other articles hidden to hide the learning path in other versions security_alerts: title: 'セキュリティアラートの調査と管理' description: 'セキュリティアラートをどこで見つけて解決するかを学んでください。' guides: - - /code-security/security-overview/about-the-security-overview - - '{% ifversion fpt %}/code-security/secret-scanning/managing-alerts-from-secret-scanning {% endif %}' - - '{% ifversion fpt %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository{% endif %}' - - '{% ifversion fpt %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests{% endif %}' - - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository{% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/security-overview/about-the-security-overview {% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/security-overview/viewing-the-security-overview {% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/secret-scanning/managing-alerts-from-secret-scanning {% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository{% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests{% endif %}' + - '{% ifversion ghec or ghes > 3.1 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository{% endif %}' #Feature available in all versions from GHES 2.22 up code_security_actions: title: 'GitHub ActionsでCode Scanningを実行' description: '脆弱性やエラーがリポジトリに無いようにデフォルトブランチとすべてのPull Requestをチェックしてください。' - featured_track: '{% ifversion ghae or ghes > 2.22 %}true{% else %}false{% endif %}' + featured_track: '{% ifversion ghae or ghes %}true{% else %}false{% endif %}' guides: - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository @@ -99,6 +101,5 @@ code_security_ci: - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/about-codeql-code-scanning-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system - - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-runner-in-your-ci-system - - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-runner-in-your-ci-system + - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/troubleshooting-codeql-runner-in-your-ci-system diff --git a/translations/ja-JP/data/product-examples/code-security/code-examples.yml b/translations/ja-JP/data/product-examples/code-security/code-examples.yml index 4103951e3070..38beac236f6b 100644 --- a/translations/ja-JP/data/product-examples/code-security/code-examples.yml +++ b/translations/ja-JP/data/product-examples/code-security/code-examples.yml @@ -22,9 +22,9 @@ - GitHub Actions - #Security policies - title: Microsoftセキュリティポリシー + title: Microsoft security policy template description: セキュリティポリシーの例 - href: /microsoft/microsoft.github.io/blob/master/SECURITY.MD + href: https://github.com/microsoft/repo-templates/blob/main/shared/SECURITY.md tags: - セキュリティポリシー - @@ -54,8 +54,9 @@ versions: fpt: '*' ghec: '*' + ghes: '>=3.3' - - #Dependabot configuration only relevant to GitHub.com + #Dependabot configuration only relevant to GitHub.com and GHES 3.3+ #Convert "languages" to "package-ecosystems" for Dependabot configurations title: Super linterの設定 description: Super linterリポジトリからのDependabotバージョンアップデート設定の例 @@ -73,6 +74,7 @@ versions: fpt: '*' ghec: '*' + ghes: '>=3.3' - title: DependabotバージョンアップデートPR description: Super linterリポジトリ中のDependabotバージョンアップデート設定によって生成されたPull Requestの例 @@ -85,3 +87,4 @@ versions: fpt: '*' ghec: '*' + ghes: '>=3.3' diff --git a/translations/ja-JP/data/reusables/accounts/you-must-know-your-password.md b/translations/ja-JP/data/reusables/accounts/you-must-know-your-password.md index f4795c3909e7..7e671d41272a 100644 --- a/translations/ja-JP/data/reusables/accounts/you-must-know-your-password.md +++ b/translations/ja-JP/data/reusables/accounts/you-must-know-your-password.md @@ -1 +1 @@ -If you protect your personal account with two-factor authentication but do not know your password, you will not be able to generate a one-time password to recover your account. {% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[Updating your {% data variables.product.prodname_dotcom %} access credentials](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)." +If you protect your personal account with two-factor authentication but do not know your password, you will not be able to follow these steps to recover your account. {% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[Updating your {% data variables.product.prodname_dotcom %} access credentials](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)." diff --git a/translations/ja-JP/data/reusables/actions/github-token-permissions.md b/translations/ja-JP/data/reusables/actions/github-token-permissions.md index 7da34dd7d74c..c4f91c9bafa4 100644 --- a/translations/ja-JP/data/reusables/actions/github-token-permissions.md +++ b/translations/ja-JP/data/reusables/actions/github-token-permissions.md @@ -1 +1 @@ -ワークフロー内のジョブが開始されるたびに、`GITHUB_TOKEN`はそのリポジトリのアクセストークンに設定されます。 {% ifversion fpt or ghes > 3.1 or ghae or ghec %}You should set the permissions for this access token in the workflow file to grant read access for the `contents` scope and write access for the `packages` scope. {% else %}これは、ワークフローが実行されるリポジトリ内でパッケージに対する読み取り及び書き込み権限を持っています。 {% endif %}詳しい情報については「[GITHUB_TOKENでの認証](/actions/configuring-and-managing-workflows/authenticating-with-the-github_token)を参照してください。 +ワークフロー内のジョブが開始されるたびに、`GITHUB_TOKEN`はそのリポジトリのアクセストークンに設定されます。 {% ifversion fpt or ghes > 3.1 or ghae or ghec %}`contents`スコープに対する読み取りアクセス権と、`packages`スコープに対する書き込み権を付与するために、ワークフローファイル中でこのアクセストークンに権限を設定しなければなりません。 {% else %}これは、ワークフローが実行されるリポジトリ内でパッケージに対する読み取り及び書き込み権限を持っています。 {% endif %}詳しい情報については「[GITHUB_TOKENでの認証](/actions/configuring-and-managing-workflows/authenticating-with-the-github_token)を参照してください。 diff --git a/translations/ja-JP/data/reusables/actions/restrict-runner-workflow-beta.md b/translations/ja-JP/data/reusables/actions/restrict-runner-workflow-beta.md new file mode 100644 index 000000000000..77949eb08b0c --- /dev/null +++ b/translations/ja-JP/data/reusables/actions/restrict-runner-workflow-beta.md @@ -0,0 +1,7 @@ +{% if restrict-groups-to-workflows %} +{% note %} + +**Note:** Configuring the workflows that can access a runner group is currently in beta and subject to change. + +{% endnote %} +{% endif %} diff --git a/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-org.md b/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-org.md index 68118ecca636..c44447c80d3f 100644 --- a/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-org.md +++ b/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-org.md @@ -1,3 +1,3 @@ -1. ランナーグループの名前を入力し、Organization アクセスのポリシーを割り当てます。 +1. Assign a policy for organization access. You can configure a runner group to be accessible to a specific list of organizations, or all organizations in the enterprise.{% ifversion ghec or ghes %} By default, only private repositories can access runners in a runner group, but you can override this. This setting can't be overridden if configuring an organization's runner group that was shared by an enterprise.{% endif %} diff --git a/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-repo.md b/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-repo.md index 561576b0f7c5..40324085755d 100644 --- a/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-repo.md +++ b/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-repo.md @@ -1,3 +1,3 @@ -1. ランナーグループの名前を入力し、リポジトリアクセスのポリシーを割り当てます。 +1. Assign a policy for repository access. You can configure a runner group to be accessible to a specific list of repositories, or to all repositories in the organization.{% ifversion ghec or ghes %} By default, only private repositories can access runners in a runner group, but you can override this. This setting can't be overridden if configuring an organization's runner group that was shared by an enterprise.{% endif %} diff --git a/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-workflow.md b/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-workflow.md new file mode 100644 index 000000000000..27cb07078373 --- /dev/null +++ b/translations/ja-JP/data/reusables/actions/runner-group-assign-policy-workflow.md @@ -0,0 +1,6 @@ +{%- if restrict-groups-to-workflows %} +1. Assign a policy for workflow access. + + You can configure a runner group to be accessible to a specific list of workflows, or to all workflows. This setting can't be overridden if you are configuring an organization's runner group that was shared by an enterprise. If you specify what workflow can access the runner group, you must use the full path to the workflow, including the repository name and owner, and you must pin the workflow to a branch, tag, or full SHA. For example: `octo-org/octo-repo/.github/workflows/build.yml@v2, octo-org/octo-repo/.github/workflows/deploy.yml@d6dc6c96df4f32fa27b039f2084f576ed2c5c2a5, monalisa/octo-test/.github/workflows/test.yml@main`. + + Only jobs directly defined within the selected workflows will have access to the runner group.{%- endif %} diff --git a/translations/ja-JP/data/reusables/actions/self-hosted-runner-configure-runner-group-access.md b/translations/ja-JP/data/reusables/actions/self-hosted-runner-configure-runner-group-access.md index e44b9eed45f5..cad3af76698f 100644 --- a/translations/ja-JP/data/reusables/actions/self-hosted-runner-configure-runner-group-access.md +++ b/translations/ja-JP/data/reusables/actions/self-hosted-runner-configure-runner-group-access.md @@ -1,5 +1,5 @@ -1. 設定ページの{% ifversion fpt or ghes > 3.1 or ghae or ghec %}"Runners（ランナー）"{% else %}"Self-hosted runners（セルフホストランナー）"{% endif %}のセクションで、設定したいランナーグループの隣の{% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}をクリックし、続いて**Edit name and [organization|repository] access（名前と[Organization|リポジトリ]アクセスの編集）<**クリックしてください。 ![リポジトリの権限の管理](/assets/images/help/settings/actions-runner-manage-permissions.png) -1. ポリシーオプションを修正するか、ランナーグループ名を変更してください。 +{% data reusables.actions.self-hosted-runner-configure-runner-group %} +1. Modify your policy options. {% ifversion not ghae %} {% warning %} diff --git a/translations/ja-JP/data/reusables/actions/self-hosted-runner-configure-runner-group.md b/translations/ja-JP/data/reusables/actions/self-hosted-runner-configure-runner-group.md new file mode 100644 index 000000000000..1b1f36b223f1 --- /dev/null +++ b/translations/ja-JP/data/reusables/actions/self-hosted-runner-configure-runner-group.md @@ -0,0 +1 @@ +1. In the {% ifversion fpt or ghes > 3.1 or ghae or ghec %}"Runners"{% else %}"Self-hosted runners"{% endif %} section of the settings page, next to the runner group you'd like to configure, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Edit name and [organization|repository] access**. ![リポジトリの権限の管理](/assets/images/help/settings/actions-runner-manage-permissions.png) \ No newline at end of file diff --git a/translations/ja-JP/data/reusables/actions/workflow-dispatch-inputs.md b/translations/ja-JP/data/reusables/actions/workflow-dispatch-inputs.md index bddb65defcb5..6ea05c00f9e8 100644 --- a/translations/ja-JP/data/reusables/actions/workflow-dispatch-inputs.md +++ b/translations/ja-JP/data/reusables/actions/workflow-dispatch-inputs.md @@ -15,10 +15,14 @@ on: - info - warning - debug {% endif %} + print_tags: + description: 'True to print to STDOUT' + required: true {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5511 %} + type: boolean {% endif %} tags: description: 'Test scenario tags' - required: false {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5511 %} - type: boolean + required: true {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5511 %} + type: string environment: description: 'Environment to run tests against' type: environment @@ -27,7 +31,7 @@ on: jobs: print-tag: runs-on: ubuntu-latest - + if: {% raw %} ${{ github.event.inputs.print_tags == 'true' }} {% endraw %} steps: - name: Print the input tag to STDOUT run: echo {% raw %} The tag is ${{ github.event.inputs.tag }} {% endraw %} diff --git a/translations/ja-JP/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md b/translations/ja-JP/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md index d2284b0becb8..f4ef8eb5ccab 100644 --- a/translations/ja-JP/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md +++ b/translations/ja-JP/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md @@ -5,7 +5,7 @@ Use the `branches` filter when you want to include branch name patterns or when Use the `tags` filter when you want to include tag name patterns or when you want to both include and exclude tag names patterns. Use the `tags-ignore` filter when you only want to exclude tag name patterns. You cannot use both the `tags` and `tags-ignore` filters for the same event in a workflow. -If you define only `tags`/`tag-ignore` or only `branches`/`branches-ignore`, the workflow won't run for events affecting the undefined Git ref. If you define neither `tags`/`tag-ignore` or `branches`/`branches-ignore`, the workflow will run for events affecting either branches or tags. If you define both `branches`/`branches-ignore` and [`paths`](#onpushpull_requestpull_request_targetpathspaths-ignore), the workflow will only run when both filters are satisfied. +If you define only `tags`/`tags-ignore` or only `branches`/`branches-ignore`, the workflow won't run for events affecting the undefined Git ref. If you define neither `tags`/`tags-ignore` or `branches`/`branches-ignore`, the workflow will run for events affecting either branches or tags. If you define both `branches`/`branches-ignore` and [`paths`](#onpushpull_requestpull_request_targetpathspaths-ignore), the workflow will only run when both filters are satisfied. The `branches`, `branches-ignore`, `tags`, and `tags-ignore` keywords accept glob patterns that use characters like `*`, `**`, `+`, `?`, `!` and others to match more than one branch or tag name. If a name contains any of these characters and you want a literal match, you need to *escape* each of these special characters with `\`. For more information about glob patterns, see the "[Filter pattern cheat sheet](/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet)." diff --git a/translations/ja-JP/data/reusables/dotcom_billing/pricing_cal.md b/translations/ja-JP/data/reusables/dotcom_billing/pricing_cal.md deleted file mode 100644 index 6509379b2892..000000000000 --- a/translations/ja-JP/data/reusables/dotcom_billing/pricing_cal.md +++ /dev/null @@ -1 +0,0 @@ -To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} pricing calculator. For more information, go to https://github.com/pricing/calculator. diff --git a/translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md b/translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md new file mode 100644 index 000000000000..c8e8d5628c07 --- /dev/null +++ b/translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md @@ -0,0 +1 @@ +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=actions). diff --git a/translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md b/translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md new file mode 100644 index 000000000000..6d8a5f5451fb --- /dev/null +++ b/translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md @@ -0,0 +1 @@ +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces). diff --git a/translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md b/translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md new file mode 100644 index 000000000000..690f270d1b18 --- /dev/null +++ b/translations/ja-JP/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md @@ -0,0 +1 @@ +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=packages). diff --git a/translations/ja-JP/data/reusables/gated-features/allowed-ip-addresses.md b/translations/ja-JP/data/reusables/gated-features/allowed-ip-addresses.md deleted file mode 100644 index 35277c5888cf..000000000000 --- a/translations/ja-JP/data/reusables/gated-features/allowed-ip-addresses.md +++ /dev/null @@ -1 +0,0 @@ -許可されたIPアドレスは{% data variables.product.prodname_ghe_cloud %}及び{% data variables.product.prodname_ghe_managed %}で利用できます。 詳細は「[{% data variables.product.prodname_dotcom %} の製品](/articles/github-s-products)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/gated-features/dependency-review.md b/translations/ja-JP/data/reusables/gated-features/dependency-review.md index d9a0a56fffbd..bd88b5b1824f 100644 --- a/translations/ja-JP/data/reusables/gated-features/dependency-review.md +++ b/translations/ja-JP/data/reusables/gated-features/dependency-review.md @@ -1,3 +1,13 @@ -{% ifversion fpt or ghec %}Dependency review is available for all public repositories, as well as private repositories owned by organizations where {% data variables.product.prodname_GH_advanced_security %} is enabled.{% endif %} -{% ifversion ghes > 3.1 %}Dependency review is available for organization-owned repositories where {% data variables.product.prodname_GH_advanced_security %} is enabled. -{% endif %} {% data reusables.advanced-security.more-info-ghas %} +{%- ifversion fpt %} +Dependency review is enabled on public repositories. Dependency review is also available in private repositories owned by organizations that use {% data variables.product.prodname_ghe_cloud %} and have a license for {% data variables.product.prodname_GH_advanced_security %}. + +{%- elsif ghec %} +Dependency review is included in {% data variables.product.product_name %} for public repositories. To use dependency review in private repositories owned by organizations, you must have a license for {% data variables.product.prodname_GH_advanced_security %}. + +{%- elsif ghes > 3.1 %} +Dependency review is available for organization-owned repositories in {% data variables.product.product_name %}. This feature requires a license for {% data variables.product.prodname_GH_advanced_security %}. + +{%- elsif ghae-issue-4864 %} +Dependency review is available for organization-owned repositories in {% data variables.product.product_name %}. This is a {% data variables.product.prodname_GH_advanced_security %} feature (free during the beta release). + +{%- endif %} {% data reusables.advanced-security.more-info-ghas %} \ No newline at end of file diff --git a/translations/ja-JP/data/reusables/gated-features/restrict-add-collaborator.md b/translations/ja-JP/data/reusables/gated-features/restrict-add-collaborator.md deleted file mode 100644 index 0578beea11ff..000000000000 --- a/translations/ja-JP/data/reusables/gated-features/restrict-add-collaborator.md +++ /dev/null @@ -1 +0,0 @@ -外部のコラボレータの追加をオーナーだけに限定するのは、{% data variables.product.prodname_ghe_cloud %}で可能です。 詳しい情報については「[GitHubの製品](/articles/githubs-products)」を参照してください。 diff --git a/translations/ja-JP/data/reusables/gated-features/tag-protection-rules.md b/translations/ja-JP/data/reusables/gated-features/tag-protection-rules.md new file mode 100644 index 000000000000..3f8d77437491 --- /dev/null +++ b/translations/ja-JP/data/reusables/gated-features/tag-protection-rules.md @@ -0,0 +1 @@ +{% ifversion ghae %}Tag protection rules are available in internal and private repositories with {% data variables.product.prodname_ghe_managed %}, {% else%}Tag protection rules are available {% endif %}in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %}. {% ifversion fpt or ghec %}{% data reusables.gated-features.more-info %}{% endif %} diff --git a/translations/ja-JP/data/reusables/getting-started/managing-org-policies.md b/translations/ja-JP/data/reusables/getting-started/managing-org-policies.md index 717d24f2ed1c..9951b2f57240 100644 --- a/translations/ja-JP/data/reusables/getting-started/managing-org-policies.md +++ b/translations/ja-JP/data/reusables/getting-started/managing-org-policies.md @@ -1,5 +1,5 @@ You can manage permissions and policies for a number of different actions and features in your organization. -For example, to protect your organization's data and number of paid licenses, you can choose to allow only organization owners to invite outside collaborators to organization repositories. You can also choose to allow or prevent the forking of private repositories owned by your organization. For more information, see "[Setting permissions for adding outside collaborators](/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)" and "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)." +For example, to protect your organization's data, you can restrict repository creation in your organization. You can also choose to allow or prevent the forking of private repositories owned by your organization. For more information, see "[Restricting repository creation in your organization](/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization)" and "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)." For the full list of settings you can configure for your organization, see "[Managing organization settings](/organizations/managing-organization-settings)." diff --git a/translations/ja-JP/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md b/translations/ja-JP/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md index eb5ae048904b..9bbe51350952 100644 --- a/translations/ja-JP/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md +++ b/translations/ja-JP/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md @@ -1 +1 @@ -たとえば、自分のオフィスのネットワークのIPアドレスからのアクセスのみを許可できます。 IPアドレスの許可リストは、許可リストに無いIPアドレスからのWeb、API、Gitのアクセスをブロックします。 +たとえば、自分のオフィスのネットワークのIPアドレスからのアクセスのみを許可できます。 The allow list for IP addresses will block access to private resources via the web, API, and Git from any IP addresses that are not on the allow list. diff --git a/translations/ja-JP/data/reusables/projects/insights-alpha.md b/translations/ja-JP/data/reusables/projects/insights-alpha.md new file mode 100644 index 000000000000..7374ac98a954 --- /dev/null +++ b/translations/ja-JP/data/reusables/projects/insights-alpha.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** Insights for projects (beta) is currently in private preview and is not yet available to all organizations. + +{% endnote %} diff --git a/translations/ja-JP/data/reusables/projects/projects-filters.md b/translations/ja-JP/data/reusables/projects/projects-filters.md new file mode 100644 index 000000000000..5812bd781c2c --- /dev/null +++ b/translations/ja-JP/data/reusables/projects/projects-filters.md @@ -0,0 +1,9 @@ +- To filter for any match of multiple values (an OR query), separate the values with a comma. For example `label:"good first issue",bug` will list all issues labelled `good first issue` or `bug`. +- 特定の値が欠けているものをフィルタリングするには、フィルタの前に`-`を置いてください。 たとえば`-label:"bug"`とすれば、`bug`というラベルを持たないアイテムだけが表示されます。 +- すべての値が欠けているものをフィルタリングするには、`no:`に続けてフィールド名を入力してください。 たとえば`no:assignee`とすれば、アサインされた人のないアイテムだけが表示されます。 +- 状態でフィルタリングするには、`is:`を入力してください。 たとえば`is: issue`あるいは`is:open`としてください。 +- 複数のフィルタは空白で区切ってください。 たとえば`status:"In progress" -label:"bug" no:assignee`とすれば、ステータスが`In progress`であり、`bug`というラベルを持たず、アサインされた人がいないアイテムだけが表示されます。 +- To filter for the previous, current, or next iteration of an iteration field, use `@previous`, `@current`, or `@next`. たとえば`sprint:@current`としてください。 +- To filter for items assigned to the viewer, use `@me`. For example, `assignee:@me`. Anyone using this view will see items assigned to themselves. +- To filter date and number fields, use `>`, `>=`, `<`, `<=`, and `..` range queries. For example: `target:2022-03-01..2022-03-15`. 詳しい情報については、「[検索構文を理解する](/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax)」を参照してください。 +- \ No newline at end of file diff --git a/translations/ja-JP/data/reusables/saml/cannot-update-existing-saml-settings.md b/translations/ja-JP/data/reusables/saml/cannot-update-existing-saml-settings.md deleted file mode 100644 index 22983550ed57..000000000000 --- a/translations/ja-JP/data/reusables/saml/cannot-update-existing-saml-settings.md +++ /dev/null @@ -1,5 +0,0 @@ -{% note %} - -**Note:** When SAML SSO is enabled, the only setting you can update on {% data variables.product.prodname_dotcom %} for your existing SAML configuration is the SAML certificate. If you need to update the Sign on URL or Issuer, you must first disable SAML SSO and then reconfigure SAML SSO with the new settings. - -{% endnote %} diff --git a/translations/ja-JP/data/reusables/scim/emu-scim-rate-limit.md b/translations/ja-JP/data/reusables/scim/emu-scim-rate-limit.md new file mode 100644 index 000000000000..f6317a754563 --- /dev/null +++ b/translations/ja-JP/data/reusables/scim/emu-scim-rate-limit.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** To avoid exceeding the rate limit on {% data variables.product.product_name %}, do not assign more than 1,000 users per hour to the IdP application. If you use groups to assign users to the IdP application, do not add more than 100 users to each group per hour. If you exceed these thresholds, attempts to provision users may fail with a "rate limit" error. + +{% endnote %} \ No newline at end of file diff --git a/translations/ja-JP/data/ui.yml b/translations/ja-JP/data/ui.yml index cc3f0c7cce07..1284decf264d 100644 --- a/translations/ja-JP/data/ui.yml +++ b/translations/ja-JP/data/ui.yml @@ -80,6 +80,7 @@ contribution_cta: products: graphql: reference: + implements: Implements fields: フィールド arguments: 引数 name: 名前 diff --git a/translations/log/ja-resets.csv b/translations/log/ja-resets.csv index ff666d683c81..a64bef81ea58 100644 --- a/translations/log/ja-resets.csv +++ b/translations/log/ja-resets.csv @@ -61,12 +61,14 @@ translations/ja-JP/content/admin/packages/enabling-github-packages-with-minio.md translations/ja-JP/content/admin/packages/getting-started-with-github-packages-for-your-enterprise.md,broken liquid tags translations/ja-JP/content/admin/packages/quickstart-for-configuring-your-minio-storage-bucket-for-github-packages.md,broken liquid tags translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-environment.md,Listed in localization-support#489 +translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-environment.md,rendering error translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md,broken liquid tags translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md,Listed in localization-support#489 +translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md,rendering error translations/ja-JP/content/admin/user-management/managing-organizations-in-your-enterprise/creating-teams.md,broken liquid tags translations/ja-JP/content/admin/user-management/managing-repositories-in-your-enterprise/configuring-git-large-file-storage-for-your-enterprise.md,broken liquid tags translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator.md,broken liquid tags -translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md,broken liquid tags +translations/ja-JP/content/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users.md,rendering error translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-githubcom.md,broken liquid tags translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-your-enterprise.md,broken liquid tags translations/ja-JP/content/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on.md,broken liquid tags @@ -101,7 +103,6 @@ translations/ja-JP/content/code-security/getting-started/securing-your-repositor translations/ja-JP/content/code-security/index.md,broken liquid tags translations/ja-JP/content/code-security/secret-scanning/about-secret-scanning.md,broken liquid tags translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot.md,broken liquid tags -translations/ja-JP/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md,broken liquid tags translations/ja-JP/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies.md,broken liquid tags translations/ja-JP/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates.md,broken liquid tags translations/ja-JP/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies.md,broken liquid tags @@ -157,6 +158,7 @@ translations/ja-JP/content/organizations/organizing-members-into-teams/about-tea translations/ja-JP/content/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions.md,broken liquid tags translations/ja-JP/content/packages/learn-github-packages/installing-a-package.md,broken liquid tags translations/ja-JP/content/packages/learn-github-packages/introduction-to-github-packages.md,broken liquid tags +translations/ja-JP/content/packages/learn-github-packages/publishing-a-package.md,broken liquid tags translations/ja-JP/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md,broken liquid tags translations/ja-JP/content/packages/quickstart.md,broken liquid tags translations/ja-JP/content/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry.md,broken liquid tags @@ -176,6 +178,7 @@ translations/ja-JP/content/repositories/viewing-activity-and-data-for-your-repos translations/ja-JP/content/repositories/working-with-files/managing-files/deleting-files-in-a-repository.md,broken liquid tags translations/ja-JP/content/repositories/working-with-files/managing-large-files/about-git-large-file-storage.md,broken liquid tags translations/ja-JP/content/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage.md,broken liquid tags +translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md,broken liquid tags translations/ja-JP/content/rest/reference/enterprise-admin.md,broken liquid tags translations/ja-JP/content/sponsors/getting-started-with-github-sponsors/about-github-sponsors.md,broken liquid tags translations/ja-JP/content/sponsors/receiving-sponsorships-through-github-sponsors/about-github-sponsors-for-open-source-contributors.md,broken liquid tags From 3b8b6e0e614bc88209f8ea9cb08201fdbcefb597 Mon Sep 17 00:00:00 2001 From: Robert Sese Date: Mon, 14 Mar 2022 11:48:33 -0500 Subject: [PATCH 14/18] Add new 'app' directory too (#26121) --- .github/workflows/openapi-decorate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openapi-decorate.yml b/.github/workflows/openapi-decorate.yml index b0412c95b052..c90787e55cf0 100644 --- a/.github/workflows/openapi-decorate.yml +++ b/.github/workflows/openapi-decorate.yml @@ -57,7 +57,7 @@ jobs: uses: EndBug/add-and-commit@756d9ea820f11931e591eaf57f25e0f5b903d5b2 with: # The arguments for the `git add` command - add: 'lib/rest/static/decorated' + add: '["lib/rest/static/app", "lib/rest/static/decorated"]' # The message for the commit message: 'Add decorated OpenAPI schema files' From 21b59b5805f64a8f4b1737ea806399c357b53bde Mon Sep 17 00:00:00 2001 From: Grace Park Date: Mon, 14 Mar 2022 10:50:53 -0700 Subject: [PATCH 15/18] Move mini tocs rest + collapsible (#26069) * starting minitocs change * moving rest mini tocs and adding functionality to collapse * adding some comments * update margins * minor updates: fix scroll to top button add padding to resthttpmethod verbs and background color for nested arrows in minitocs * Update components/rest/RestReferencePage.tsx Co-authored-by: Rachael Sewell * Update components/rest/RestReferencePage.tsx Co-authored-by: Rachael Sewell * fix comment * fix wording and z index * bring back articlegridlayout * updating margins for lg and xl Co-authored-by: Rachael Sewell --- components/DefaultLayout.tsx | 2 +- components/rest/CodeBlock.tsx | 2 +- .../rest/RestParameterTable.module.scss | 1 + components/rest/RestReferencePage.tsx | 135 ++++++++++++------ components/ui/ScrollButton/ScrollButton.tsx | 32 ++--- stylesheets/utilities.scss | 6 + 6 files changed, 119 insertions(+), 59 deletions(-) diff --git a/components/DefaultLayout.tsx b/components/DefaultLayout.tsx index 315ba275db7a..cd02585a1977 100644 --- a/components/DefaultLayout.tsx +++ b/components/DefaultLayout.tsx @@ -93,7 +93,7 @@ export const DefaultLayout = (props: Props) => { style={{ height: '100vh' }} >
    -
    +
    diff --git a/components/rest/CodeBlock.tsx b/components/rest/CodeBlock.tsx index 0f8886fdadc7..a1081fbe4862 100644 --- a/components/rest/CodeBlock.tsx +++ b/components/rest/CodeBlock.tsx @@ -50,7 +50,7 @@ export function CodeBlock({ verb, headingLang, codeBlock, highlight }: Props) { > {verb && ( - + {verb} )}{' '} diff --git a/components/rest/RestParameterTable.module.scss b/components/rest/RestParameterTable.module.scss index c2e7237c9f14..73692906ca06 100644 --- a/components/rest/RestParameterTable.module.scss +++ b/components/rest/RestParameterTable.module.scss @@ -1,5 +1,6 @@ .parameterTable { table-layout: fixed !important; + z-index: 0; thead { tr { diff --git a/components/rest/RestReferencePage.tsx b/components/rest/RestReferencePage.tsx index d21545378654..88be120bef13 100644 --- a/components/rest/RestReferencePage.tsx +++ b/components/rest/RestReferencePage.tsx @@ -1,17 +1,18 @@ -import { useState, useEffect } from 'react' +import React, { useState, useEffect } from 'react' +import cx from 'classnames' import { useRouter } from 'next/router' import dynamic from 'next/dynamic' import { DefaultLayout } from 'components/DefaultLayout' -import { ArticleTitle } from 'components/article/ArticleTitle' import { useMainContext } from 'components/context/MainContext' import { MarkdownContent } from 'components/ui/MarkdownContent' import { Lead } from 'components/ui/Lead' -import { ArticleGridLayout } from 'components/article/ArticleGridLayout' import { MiniTocItem } from 'components/context/ArticleContext' import { RestCategoryOperationsT } from './types' import { RestOperation } from './RestOperation' -import { MiniTocs } from 'components/ui/MiniTocs' +import { ChevronDownIcon, ChevronUpIcon, SearchIcon } from '@primer/octicons-react' +import { useTranslation } from 'components/hooks/useTranslation' +import { ActionList } from '@primer/react' const ClientSideHighlightJS = dynamic(() => import('components/article/ClientSideHighlightJS'), { ssr: false, @@ -37,9 +38,11 @@ export const RestReferencePage = ({ restOperations, miniTocItems, }: StructuredContentT) => { + const { t } = useTranslation('pages') const { asPath } = useRouter() const { page } = useMainContext() const subcategories = Object.keys(restOperations) + const [collapsed, setCollapsed] = useState({} as Record) // We have some one-off redirects for rest api docs // currently those are limited to the repos page, but @@ -106,6 +109,43 @@ export const RestReferencePage = ({ // consecutive one does. }, [asPath]) + // Resetting the collapsed array when we move to another REST page + useEffect(() => { + setCollapsed({}) + }, [asPath]) + + const handleClick = (param: number) => { + setCollapsed((prevState) => { + return { ...prevState, [param]: !prevState[param] } + }) + } + + const renderTocItem = (item: MiniTocItem, index: number) => { + return ( + +
    +
    + {item.items && item.items.length > 0 && ( + + )} + {collapsed[index] && item.items && item.items.length > 0 ? ( +
      {item.items.map(renderTocItem)}
    + ) : null} +
    + + ) + } + return ( {/* Doesn't matter *where* this is included because it will @@ -113,47 +153,60 @@ export const RestReferencePage = ({ {loadClientsideRedirectExceptions && } {lazyLoadHighlightJS && } -
    - {page.title}} - intro={ - <> - {page.introPlainText && ( - - {page.introPlainText} - - )} - - } - toc={ - <> - {miniTocItems && miniTocItems.length > 1 && ( - - )} - - } - > -
    -
    +
    +

    {page.title}

    + {page.introPlainText && ( + + {page.introPlainText} + + )} +
    +
    +
    +
    +
    + + +
    - - {subcategories.map((subcategory, index) => ( -
    -
    - {restOperations[subcategory].map((operation, index) => ( - - ))} -
    - ))} - +

    {t('miniToc')}

    + {miniTocItems && ( + { + return { + key: page.title + i, + text: page.title, + renderItem: () =>
      {renderTocItem(items, i)}
    , + } + })} + /> + )}
    - +
    + + {subcategories.map((subcategory, index) => ( +
    +
    + {restOperations[subcategory].map((operation, index) => ( + + ))} +
    + ))} +
    ) } + +const Circle = ({ className, children }: { className?: string; children?: React.ReactNode }) => { + return ( +
    + {children} +
    + ) +} diff --git a/components/ui/ScrollButton/ScrollButton.tsx b/components/ui/ScrollButton/ScrollButton.tsx index 7ff1e6e296a2..c28b7379ddc5 100644 --- a/components/ui/ScrollButton/ScrollButton.tsx +++ b/components/ui/ScrollButton/ScrollButton.tsx @@ -11,26 +11,26 @@ export const ScrollButton = ({ className, ariaLabel }: ScrollButtonPropsT) => { const [show, setShow] = useState(false) useEffect(() => { - // show scroll button only when view is scrolled down - const onScroll = function () { - const y = document.documentElement.scrollTop // get the height from page top - if (y < 100) { - setShow(false) - } else if (y >= 100) { - setShow(true) - } - } - window.addEventListener('scroll', onScroll) + // We cannot determine document.documentElement.scrollTop height because we set the height: 100vh and set overflow to auto to keep the header sticky + // That means window.scrollTop height is always 0 + // Using IntersectionObserver we can detemine if the h1 header is in view or not. If not, we show the scroll to top button, if so, we hide it + const observer = new IntersectionObserver( + function (entries) { + if (entries[0].isIntersecting === false) { + setShow(true) + } else { + setShow(false) + } + }, + { threshold: [0] } + ) - return () => { - window.removeEventListener('scroll', onScroll) - } + observer.observe(document.getElementsByTagName('h1')[0]) }, []) const onClick = () => { - window.scrollTo(0, 0) - const topOfPage = document.getElementById('github-logo') - if (topOfPage) topOfPage.focus() + document?.getElementById('github-logo')?.focus() + document?.getElementById('main-content')?.scrollIntoView() } return ( diff --git a/stylesheets/utilities.scss b/stylesheets/utilities.scss index a17939297b5f..79c90ba72d61 100644 --- a/stylesheets/utilities.scss +++ b/stylesheets/utilities.scss @@ -78,6 +78,12 @@ border-color: transparent !important; } +/* Background colors +------------------------------------------------------------------------------*/ +.background-transparent { + background-color: transparent; +} + /* Widths / Heights ------------------------------------------------------------------------------*/ .max-w-xs { From 3b08517b0cc88488833d0bee0525a9ef2e2fe607 Mon Sep 17 00:00:00 2001 From: Abby Vollmer Date: Mon, 14 Mar 2022 11:00:34 -0700 Subject: [PATCH 16/18] Create Appeal and Reinstatement page (#26087) * Create appeal-and-reinstatement-form.md * Update appeal-and-reinstatement-form.md * Update appeal-and-reinstatement-form.md Co-authored-by: Jesse Geraci <6133249+jessephus@users.noreply.github.com> * add transparency section * Update appeal-and-reinstatement-form.md * add github-appeal-and-reinstatement-form * Rename appeal-and-reinstatement-form.md to github-appeal-and-reinstatement-form.md * Move new article into site policy directory * Add article front matter * Update content/github/site-policy/github-appeal-and-reinstatement-form.md * Update content/github/site-policy/github-appeal-and-reinstatement-form.md * add URL for the form * Update and rename github-appeal-and-reinstatement-form.md to github-appeal-and-reinstatement-.md * update `github-appeal-and-reinstatement` * remove trailing `-` (h/t @khxu) Co-authored-by: Jesse Geraci <6133249+jessephus@users.noreply.github.com> Co-authored-by: Ethan P <56270045+ethanpalm@users.noreply.github.com> --- .../github-appeal-and-reinstatement.md | 37 +++++++++++++++++++ content/github/site-policy/index.md | 1 + 2 files changed, 38 insertions(+) create mode 100644 content/github/site-policy/github-appeal-and-reinstatement.md diff --git a/content/github/site-policy/github-appeal-and-reinstatement.md b/content/github/site-policy/github-appeal-and-reinstatement.md new file mode 100644 index 000000000000..7436c299181a --- /dev/null +++ b/content/github/site-policy/github-appeal-and-reinstatement.md @@ -0,0 +1,37 @@ +--- +title: GitHub Appeal and Reinstatement +versions: + fpt: '*' +topics: + - Policy + - Legal +--- +## Appeal and Reinstatement + +While the majority of interactions between individuals in GitHub’s community fall within our Acceptable Use Policies and Community Guidelines, violations of those policies do occur at times. When they do, GitHub staff may need to take enforcement action to address the violations. However, in some cases there may be a basis to reverse a moderation action taken by GitHub Staff. + +## What are appeals and reinstatements? + +Both appeals and reinstatements arise in relation to disabling of content or restrictions to access an account. + +**Reinstatement**: The user wishes to regain access to their account or content and is willing to make any necessary changes to address the violation and must agree not to violate our terms going forward. + +**Appeal**: The user disputes that a violation occurred and can provide additional information to show that a different decision should have been reached. + +## How this works + +If you seek reinstatement or wish to appeal an enforcement action, please fill out our [Appeal and Reinstatement form](https://support.github.com/contact/reinstatement). + +GitHub staff will review the information provided in the form to determine whether there is sufficient information to warrant reinstatement or granting of an appeal. + +* **Reinstatement**: Where a user can agree to abide by our Acceptable Use Policies moving forward and has made the changes necessary to address the violation(s), we may choose to reinstate their account or content depending on the circumstances and severity of the initial violation. + +All legitimate reinstatement requests will be reviewed initially by GitHub staff and will be answered with a decision. + +* **Appeal**: Where a user seeks to dispute a decision, they can use the form to explain their basis for disputing the decision and to provide any additional information regarding the alleged violation that they believe should have led to a different decision. If the information provided demonstrates that a different conclusion should have been reached, we may be able to grant an appeal. + +If the GitHub staff reviewer is the same person who made the initial determination and that staff member believes their initial conclusion was correct (and thus would be inclined to deny the appeal), a different member of GitHub’s staff will independently review the appeal. All legitimate appeals will be answered with a final decision. + +## Transparency + +We track appeals and reinstatements in our [transparency reports](https://github.blog/2022-01-27-2021-transparency-report/#Appeals_and_other_reinstatements). diff --git a/content/github/site-policy/index.md b/content/github/site-policy/index.md index 1496ee803514..7efa1cef3bda 100644 --- a/content/github/site-policy/index.md +++ b/content/github/site-policy/index.md @@ -31,6 +31,7 @@ children: - /guidelines-for-legal-requests-of-user-data - /github-government-takedown-policy - /github-acceptable-use-policies + - /github-appeal-and-reinstatement - /githubs-notice-about-the-california-consumer-privacy-act - /github-community-guidelines - /github-community-forum-code-of-conduct From def0cbff2820d19da1b2688aa0f019f86989aac8 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 14 Mar 2022 18:17:18 +0000 Subject: [PATCH 17/18] update search indexes --- lib/search/indexes/github-docs-3.1-cn-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.1-cn.json.br | 4 ++-- lib/search/indexes/github-docs-3.1-en-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.1-en.json.br | 4 ++-- lib/search/indexes/github-docs-3.1-es-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.1-es.json.br | 4 ++-- lib/search/indexes/github-docs-3.1-ja-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.1-ja.json.br | 4 ++-- lib/search/indexes/github-docs-3.1-pt-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.1-pt.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-cn-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-cn.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-en-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-en.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-es-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-es.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-ja-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-ja.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-pt-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.2-pt.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-cn-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-cn.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-en-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-en.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-es-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-es.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-ja-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-ja.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-pt-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.3-pt.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-cn-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-cn.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-en-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-en.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-es-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-es.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-ja-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-ja.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-pt-records.json.br | 4 ++-- lib/search/indexes/github-docs-3.4-pt.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-cn-records.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-cn.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-en-records.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-en.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-es-records.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-es.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-ja-records.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-ja.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-pt-records.json.br | 4 ++-- lib/search/indexes/github-docs-dotcom-pt.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-cn-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-cn.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-en-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-en.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-es-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-es.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-ja-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-ja.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-pt-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghae-pt.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-cn-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-cn.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-en-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-en.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-es-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-es.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-ja-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-ja.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-pt-records.json.br | 4 ++-- lib/search/indexes/github-docs-ghec-pt.json.br | 4 ++-- 70 files changed, 140 insertions(+), 140 deletions(-) diff --git a/lib/search/indexes/github-docs-3.1-cn-records.json.br b/lib/search/indexes/github-docs-3.1-cn-records.json.br index 5714b7ba246d..fb8e6e243c2c 100644 --- a/lib/search/indexes/github-docs-3.1-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.1-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fb2ed86e2c48b8a555fd247bc0b5f4e7788fde645583953d6131890eba6878d -size 680646 +oid sha256:753bb116847dab5f246198bd5afe68db9bc468d0d49574f9881788654e36ea65 +size 682895 diff --git a/lib/search/indexes/github-docs-3.1-cn.json.br b/lib/search/indexes/github-docs-3.1-cn.json.br index f4b6c8437659..fe09ce4d0a54 100644 --- a/lib/search/indexes/github-docs-3.1-cn.json.br +++ b/lib/search/indexes/github-docs-3.1-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d4c0fa0e201bbb9c03fb78349e4172a13948c41d434c9a862b60591aafc4c64 -size 1428524 +oid sha256:6d0864e273e8dc5ff644d7325a39c6ad0c9ab59af733e1d5323d5f1229f07a9e +size 1425418 diff --git a/lib/search/indexes/github-docs-3.1-en-records.json.br b/lib/search/indexes/github-docs-3.1-en-records.json.br index 93e99996e89e..42c5e8a045a8 100644 --- a/lib/search/indexes/github-docs-3.1-en-records.json.br +++ b/lib/search/indexes/github-docs-3.1-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1337db518da7a823f45f35858f36f565936057750899c1dcb09819965c81b886 -size 1008124 +oid sha256:a3532c0f36107eb973624cdf63d26f9de66f54dd3b8835b1f87c6e8041002716 +size 1008310 diff --git a/lib/search/indexes/github-docs-3.1-en.json.br b/lib/search/indexes/github-docs-3.1-en.json.br index 585539ef111f..b6458bb44827 100644 --- a/lib/search/indexes/github-docs-3.1-en.json.br +++ b/lib/search/indexes/github-docs-3.1-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae94c273e2a26f31c258806ca1c38d6ea66b72cd432a379681b7de8a07afcf6c -size 4101658 +oid sha256:06e3d28f3a8ba2bf675e137a6fa7f36d2a6f8b6a36b0358383f97449ef6b7aae +size 4105048 diff --git a/lib/search/indexes/github-docs-3.1-es-records.json.br b/lib/search/indexes/github-docs-3.1-es-records.json.br index 0fd06243f887..cc8adfb7eb0d 100644 --- a/lib/search/indexes/github-docs-3.1-es-records.json.br +++ b/lib/search/indexes/github-docs-3.1-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6580a38ed42068a5e56030dd93b0b37a2a3664c802eb66c6d74735ec0c2f1619 -size 629621 +oid sha256:37e4121ae8f7209face27dce323a6ff51033945255703f7a00a92355c25fa269 +size 629423 diff --git a/lib/search/indexes/github-docs-3.1-es.json.br b/lib/search/indexes/github-docs-3.1-es.json.br index 3b357c272a11..de6c2d179b70 100644 --- a/lib/search/indexes/github-docs-3.1-es.json.br +++ b/lib/search/indexes/github-docs-3.1-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d74017334c8e211ea7ada7db3ffe297b0f436cc621b7512001f3d9288eaeb5c -size 2654039 +oid sha256:0422253d79f9ef87ed9c63a5febdfc2b4a32686a5988dc77ee36a500a967ade1 +size 2657402 diff --git a/lib/search/indexes/github-docs-3.1-ja-records.json.br b/lib/search/indexes/github-docs-3.1-ja-records.json.br index 5e86c569a893..5badadfa2fcc 100644 --- a/lib/search/indexes/github-docs-3.1-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.1-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4587607b9f1bc095779bc408caf7ccdf7b3001d78564e8717ea10cb77be9273a -size 698711 +oid sha256:0a72d25543f6b0f90f18491ecee367a455b692b227a7fcf92258574db0d7d0b2 +size 696694 diff --git a/lib/search/indexes/github-docs-3.1-ja.json.br b/lib/search/indexes/github-docs-3.1-ja.json.br index ff146d1b8f58..d40f98516822 100644 --- a/lib/search/indexes/github-docs-3.1-ja.json.br +++ b/lib/search/indexes/github-docs-3.1-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d06219b4cc6aec0471ea0261eea51bf8bb43feeff3170077ccde3c07720cd5c0 -size 3723201 +oid sha256:18f46f6d223967193d010ca31985953a21ca1b9ec906f73cdf8c9240621c44b2 +size 3721762 diff --git a/lib/search/indexes/github-docs-3.1-pt-records.json.br b/lib/search/indexes/github-docs-3.1-pt-records.json.br index efbbaa065ab2..a8ef1e0119fe 100644 --- a/lib/search/indexes/github-docs-3.1-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.1-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89900909ca7fe88404bdf23ad78e53c9af166296ee409c173b70928d49d9a4c2 -size 621285 +oid sha256:4e3d970e27260de00bb2fa74831811ba560ceb7ae16c7a96750e1712048e0f6b +size 619545 diff --git a/lib/search/indexes/github-docs-3.1-pt.json.br b/lib/search/indexes/github-docs-3.1-pt.json.br index 09e6ebf43775..ecc9d51a3cb7 100644 --- a/lib/search/indexes/github-docs-3.1-pt.json.br +++ b/lib/search/indexes/github-docs-3.1-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf632f5b93cdd53c4d2714e742f602714f63b701d733776ad4ed1d971afb45fd -size 2552930 +oid sha256:eef7b028179a061b4c0b33fed2bae927209322c9a5f4e7d40c1b1c4389e03403 +size 2539182 diff --git a/lib/search/indexes/github-docs-3.2-cn-records.json.br b/lib/search/indexes/github-docs-3.2-cn-records.json.br index 5ca74393f202..443221248dfc 100644 --- a/lib/search/indexes/github-docs-3.2-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.2-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfbe1f57f9a56aba22b91a822df37887387fc7a4b0966dff2e2bc2a415c3d9f2 -size 696890 +oid sha256:1d9b287837b955846765a94f3965cb5b899a91d66db4ad6f9853b24f6755f30d +size 698988 diff --git a/lib/search/indexes/github-docs-3.2-cn.json.br b/lib/search/indexes/github-docs-3.2-cn.json.br index 98c244720926..d377a2080995 100644 --- a/lib/search/indexes/github-docs-3.2-cn.json.br +++ b/lib/search/indexes/github-docs-3.2-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c97029ce7c20d62b09ad9af8a861f1d9a3e855e8f1ca7086dbf022558884de0f -size 1457483 +oid sha256:a1ca7fe03fb7fc3b4806e083b7c591a4b3a6d2acc31732df8fbeb0ea8569e2d6 +size 1453878 diff --git a/lib/search/indexes/github-docs-3.2-en-records.json.br b/lib/search/indexes/github-docs-3.2-en-records.json.br index 53e56e24bc4c..ae5708b196f9 100644 --- a/lib/search/indexes/github-docs-3.2-en-records.json.br +++ b/lib/search/indexes/github-docs-3.2-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a0f7526af2f77b9b56a668e0466d11f9b1c9bb6f2da6adbf19ccaa08bc2ec4d -size 1042214 +oid sha256:561a9bea36b0dda4779cae53b3c1928947f80fbce50bc010c476c23aa503315b +size 1041702 diff --git a/lib/search/indexes/github-docs-3.2-en.json.br b/lib/search/indexes/github-docs-3.2-en.json.br index 83c60cf1cde4..4d6853cf6e9f 100644 --- a/lib/search/indexes/github-docs-3.2-en.json.br +++ b/lib/search/indexes/github-docs-3.2-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:946d9cba6248e0f1cad62d72008a027189fcda763e116aa1bcacaa1c44ed121f -size 4239085 +oid sha256:a0ea70a81664403136ce207253d10e082739ba80ae3d9328fee44342c5ce650d +size 4239509 diff --git a/lib/search/indexes/github-docs-3.2-es-records.json.br b/lib/search/indexes/github-docs-3.2-es-records.json.br index 07ab298b953b..0319d6064a5e 100644 --- a/lib/search/indexes/github-docs-3.2-es-records.json.br +++ b/lib/search/indexes/github-docs-3.2-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2a8a6f0c12a374ff85dfe0901eeb22e22f2fc0fbae995f045fc45c3d33588c4 -size 644152 +oid sha256:a7ec8b1c581a17459e7b07dd1c308875ed200557a2041a68363fdf00c95e772c +size 645001 diff --git a/lib/search/indexes/github-docs-3.2-es.json.br b/lib/search/indexes/github-docs-3.2-es.json.br index 8d8b698834b4..220181c5e2ef 100644 --- a/lib/search/indexes/github-docs-3.2-es.json.br +++ b/lib/search/indexes/github-docs-3.2-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f3798e0b2a318b35bbfd254938ec4141508ee4ac4936756f3b95183c36520b8 -size 2719104 +oid sha256:0c523905242d13355e3918d5bf79e2703b7dbc225d4d0a8cbc6fb226ed8d7cd5 +size 2725471 diff --git a/lib/search/indexes/github-docs-3.2-ja-records.json.br b/lib/search/indexes/github-docs-3.2-ja-records.json.br index 8fd573ff9f5e..69aad831840a 100644 --- a/lib/search/indexes/github-docs-3.2-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.2-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54e1af3aadf72f47b02a083178333c988aa9c95386bad8c2257ce91da8618e4e -size 712370 +oid sha256:bbcfdb36d4fe44d7d54d92bb7f7e55888f55c1774d69f473a316cfaeea8586f7 +size 711345 diff --git a/lib/search/indexes/github-docs-3.2-ja.json.br b/lib/search/indexes/github-docs-3.2-ja.json.br index eb4eb0d14396..3ec05121d362 100644 --- a/lib/search/indexes/github-docs-3.2-ja.json.br +++ b/lib/search/indexes/github-docs-3.2-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e19f979109a39633c290a44ad6ff3aa79713336e8f50e843b8ebf936a3df6beb -size 3811253 +oid sha256:837090b27a6236d93d9c6cc27e3668642ee08c6bd2cfc9d04de575c0dd365bc2 +size 3808923 diff --git a/lib/search/indexes/github-docs-3.2-pt-records.json.br b/lib/search/indexes/github-docs-3.2-pt-records.json.br index 89f7f46244d9..3a595b867c06 100644 --- a/lib/search/indexes/github-docs-3.2-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.2-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:455a5026c77e038ad6116ec5da20574b5e7bce1e69798c9182812d0b1571a3d1 -size 635267 +oid sha256:17d675c170e91cddb1e3892f92dcc6269c344e460d686b8ea2cf32363d5310e8 +size 634145 diff --git a/lib/search/indexes/github-docs-3.2-pt.json.br b/lib/search/indexes/github-docs-3.2-pt.json.br index 6438aa68fe32..d12705e18b5d 100644 --- a/lib/search/indexes/github-docs-3.2-pt.json.br +++ b/lib/search/indexes/github-docs-3.2-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cc3621ca639016d864ed6df202c5181667b65b7eb70cfdcac81b8e66546bade -size 2610384 +oid sha256:a6a45776c579a83ef4068bafffd0da3e3591c49afa15f0bebbd76e0de7032632 +size 2596754 diff --git a/lib/search/indexes/github-docs-3.3-cn-records.json.br b/lib/search/indexes/github-docs-3.3-cn-records.json.br index 3ac298e52f65..870c474ec29d 100644 --- a/lib/search/indexes/github-docs-3.3-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.3-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b9086f68cfc7a05608bc25b8572629b34df08519711c7518c3317cdd641fc60 -size 719215 +oid sha256:b2cc1ce27dc7a0597bb8566f6dfdf1d012ad74b4e3787e9fb05c1ec68f064f32 +size 720413 diff --git a/lib/search/indexes/github-docs-3.3-cn.json.br b/lib/search/indexes/github-docs-3.3-cn.json.br index 789c2a6c042b..2f13b75f6c98 100644 --- a/lib/search/indexes/github-docs-3.3-cn.json.br +++ b/lib/search/indexes/github-docs-3.3-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c5aa4e91439be88b5ffc89d2ed11785384e2a082df4a446f8767c6cfd199242 -size 1513636 +oid sha256:8e3d735b77b88376d811390690798a9137bdffe2e7d6e15807cf68acf33856a4 +size 1508958 diff --git a/lib/search/indexes/github-docs-3.3-en-records.json.br b/lib/search/indexes/github-docs-3.3-en-records.json.br index b98af1c9d4b9..cd31214261de 100644 --- a/lib/search/indexes/github-docs-3.3-en-records.json.br +++ b/lib/search/indexes/github-docs-3.3-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9604a9caab1e8d168e333f882f77e2e9dfc9b9506c1276e1acef5567bd1c408 -size 1075239 +oid sha256:654bb2f5b039b60a16d8e071c96873817d8a93a140735476b9097733de867a89 +size 1076175 diff --git a/lib/search/indexes/github-docs-3.3-en.json.br b/lib/search/indexes/github-docs-3.3-en.json.br index 28e5b6e03b62..5fef24e97e8e 100644 --- a/lib/search/indexes/github-docs-3.3-en.json.br +++ b/lib/search/indexes/github-docs-3.3-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c846386f60e7c765c4c4ded497cb3f11a38b4ddd6450493567c1e5ddae447add -size 4336563 +oid sha256:03058ba2cc54b96bbb5c13976c03d74bd4310bdfc360767c5362126df47395af +size 4339798 diff --git a/lib/search/indexes/github-docs-3.3-es-records.json.br b/lib/search/indexes/github-docs-3.3-es-records.json.br index ab96d99dc7ca..399c5b78b6ca 100644 --- a/lib/search/indexes/github-docs-3.3-es-records.json.br +++ b/lib/search/indexes/github-docs-3.3-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fe6371a3e470616dc8473dd894ca66f538cdd86ebe9e07f6304b8be1b234ec3 -size 664716 +oid sha256:cb0bbce97ef081e685883c15de028abc300480fdd6cc9227502627efadbb204b +size 663420 diff --git a/lib/search/indexes/github-docs-3.3-es.json.br b/lib/search/indexes/github-docs-3.3-es.json.br index d8d07d58351e..304997fa2cb3 100644 --- a/lib/search/indexes/github-docs-3.3-es.json.br +++ b/lib/search/indexes/github-docs-3.3-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8300f20c156f46a767eabc3b96a1ac0fab5a620c44582be9359109e8bc01c64a -size 2821753 +oid sha256:362fd00bf4c8eb80737e095e34336269d05fe28fa40459c10fe6604a0305629b +size 2823033 diff --git a/lib/search/indexes/github-docs-3.3-ja-records.json.br b/lib/search/indexes/github-docs-3.3-ja-records.json.br index c563c29c3f33..99e710c8332b 100644 --- a/lib/search/indexes/github-docs-3.3-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.3-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32fdbfc922832538291ee2d85a5b8aa67e624ddb558036b9946f239754d2bfb5 -size 735069 +oid sha256:9956b1baf917a0a004f2b512c625ab012ca914425cb846eccaa0e31e858a707f +size 733809 diff --git a/lib/search/indexes/github-docs-3.3-ja.json.br b/lib/search/indexes/github-docs-3.3-ja.json.br index 82a058b6da7b..b0ffae09c0ce 100644 --- a/lib/search/indexes/github-docs-3.3-ja.json.br +++ b/lib/search/indexes/github-docs-3.3-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24a1031d76eee826e340cc226893a1486083e30b1ee4fcc1b0c85d0396190b54 -size 3932280 +oid sha256:4a5e957c423a256941e25b9d924c03ede6b9c72cbd669f51462a8096ed291543 +size 3931923 diff --git a/lib/search/indexes/github-docs-3.3-pt-records.json.br b/lib/search/indexes/github-docs-3.3-pt-records.json.br index a20bef131ee0..abd06a53b5d6 100644 --- a/lib/search/indexes/github-docs-3.3-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.3-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dad50ba65a82cffb4b562f90f3e69df3628004632838abb6f611052039111b99 -size 655157 +oid sha256:8ee3a2d21f05d38bdbe64cc21899cbe3af16ea1815604c01bd23c0e01362977f +size 653713 diff --git a/lib/search/indexes/github-docs-3.3-pt.json.br b/lib/search/indexes/github-docs-3.3-pt.json.br index 1463140d3ed1..55d166ebeb6e 100644 --- a/lib/search/indexes/github-docs-3.3-pt.json.br +++ b/lib/search/indexes/github-docs-3.3-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57203cac93b7e38e294d6a74df2f9b6d6890a67a4d2bc62b7abbf969980467fe -size 2694541 +oid sha256:6a5dce88676179ead3bd79e5c335fa27460180bfa595edaa692350c341eb60ae +size 2678886 diff --git a/lib/search/indexes/github-docs-3.4-cn-records.json.br b/lib/search/indexes/github-docs-3.4-cn-records.json.br index 00fa63e36e00..96a1a77fb282 100644 --- a/lib/search/indexes/github-docs-3.4-cn-records.json.br +++ b/lib/search/indexes/github-docs-3.4-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67842430c5cdbd3c3ead68e5c86167a8b12273c810f3a8e95b77bfe18d58200b -size 725412 +oid sha256:cd943061c667ae20a0eec521fc1f582485675bb92884fe13ed9a631dfa9ec783 +size 726586 diff --git a/lib/search/indexes/github-docs-3.4-cn.json.br b/lib/search/indexes/github-docs-3.4-cn.json.br index 990dba052cfb..29b71d41d5fe 100644 --- a/lib/search/indexes/github-docs-3.4-cn.json.br +++ b/lib/search/indexes/github-docs-3.4-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f26adb8cb9f92a04bc6635c263f37b66a29365bb5fc1fe4e68509a0de3e3471 -size 1534845 +oid sha256:2de57f672ca4f742bdf04ea795600f1efb1fd194e05c8493e4d21ed983adc875 +size 1530084 diff --git a/lib/search/indexes/github-docs-3.4-en-records.json.br b/lib/search/indexes/github-docs-3.4-en-records.json.br index 60224bba73e9..657cb8cd4397 100644 --- a/lib/search/indexes/github-docs-3.4-en-records.json.br +++ b/lib/search/indexes/github-docs-3.4-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c8eb81b8073af1ba538e4782b79dce8cc5525e7866c481a3f0e78c3c1e57a7b -size 1089889 +oid sha256:51153a41c01cae3a96854e2941aeae20403467be982c18fa3054339820a6788d +size 1090256 diff --git a/lib/search/indexes/github-docs-3.4-en.json.br b/lib/search/indexes/github-docs-3.4-en.json.br index 6acb0dfbf743..a0c096e3b9fb 100644 --- a/lib/search/indexes/github-docs-3.4-en.json.br +++ b/lib/search/indexes/github-docs-3.4-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f2d862c2292418b0f777cbdc8ffc87b65d2896e2e4edbd2cd5aaecc0113c75b -size 4411883 +oid sha256:d189b70c2634d947ef40d9856e29c762592bee269fb58518507c0b339b163b02 +size 4412268 diff --git a/lib/search/indexes/github-docs-3.4-es-records.json.br b/lib/search/indexes/github-docs-3.4-es-records.json.br index 90010cdb1d44..961624cd8bf4 100644 --- a/lib/search/indexes/github-docs-3.4-es-records.json.br +++ b/lib/search/indexes/github-docs-3.4-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:daa497134bdaaa22b71d8c507bc5c8715ad03f3c2df6a22460535031134c64ab -size 670296 +oid sha256:585c93f5f3024ebecd41a14ef3086d7911acf685729c01e096357a41dd5bd818 +size 669163 diff --git a/lib/search/indexes/github-docs-3.4-es.json.br b/lib/search/indexes/github-docs-3.4-es.json.br index 8047220a0fc4..c250e26a4dda 100644 --- a/lib/search/indexes/github-docs-3.4-es.json.br +++ b/lib/search/indexes/github-docs-3.4-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbc1935780ae4ba89aa4dca14a2f770813799408f195eafb82391171f960355f -size 2848007 +oid sha256:9e2f3bd0c8b00dde80987ea126bf4ed4df377b7e63cabab92b4797b39aeff684 +size 2847517 diff --git a/lib/search/indexes/github-docs-3.4-ja-records.json.br b/lib/search/indexes/github-docs-3.4-ja-records.json.br index 031bbd48807a..289c84498474 100644 --- a/lib/search/indexes/github-docs-3.4-ja-records.json.br +++ b/lib/search/indexes/github-docs-3.4-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad1f408c886c5e7d997ea1cf28e9fb340217eaca97409a497f3c76c4eb379cf6 -size 740637 +oid sha256:4ccaddb398846340ef850479329f5e80c2bf9ee19579dd0a9076896ef06754f7 +size 740703 diff --git a/lib/search/indexes/github-docs-3.4-ja.json.br b/lib/search/indexes/github-docs-3.4-ja.json.br index 290ac1e30cae..5457a9606032 100644 --- a/lib/search/indexes/github-docs-3.4-ja.json.br +++ b/lib/search/indexes/github-docs-3.4-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0de436f56dd6c0c84af60fbaf2a8a17be65867d0247419e90bf5809fd39516d -size 3967852 +oid sha256:cf143d3d42c6d4c31465a95b6059f81371609cbcf29649ad5ed7a13c448baea4 +size 3968968 diff --git a/lib/search/indexes/github-docs-3.4-pt-records.json.br b/lib/search/indexes/github-docs-3.4-pt-records.json.br index 6419d2cfa4c3..0eeba1ec5534 100644 --- a/lib/search/indexes/github-docs-3.4-pt-records.json.br +++ b/lib/search/indexes/github-docs-3.4-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03aedbeb3ba460ff32929d7a526ffd31b3ac8cb93094f566038122200e144197 -size 661013 +oid sha256:0e3bde67760159452f40d2fef90904d75f88b9daeb3107caeaf9e8b896e81c72 +size 659042 diff --git a/lib/search/indexes/github-docs-3.4-pt.json.br b/lib/search/indexes/github-docs-3.4-pt.json.br index a8dffeb5ade5..2af7a6afaebf 100644 --- a/lib/search/indexes/github-docs-3.4-pt.json.br +++ b/lib/search/indexes/github-docs-3.4-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:723c90f25497c8fb75da0ba1e7537a3a57bee188e32a52a0a3f3f84b1abd6aa2 -size 2718532 +oid sha256:e9f1dfdcfec1825ae5149e4fed901144de75372871c02a16c9593c775489e5a6 +size 2703659 diff --git a/lib/search/indexes/github-docs-dotcom-cn-records.json.br b/lib/search/indexes/github-docs-dotcom-cn-records.json.br index 46712255827b..f90c8379b953 100644 --- a/lib/search/indexes/github-docs-dotcom-cn-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59f9b341bc37180a84ad23514e70273df9fbe1216382b0e9bfee3562a21106e2 -size 929401 +oid sha256:71b195012e9b5dd3a30bbafee2c22655e8d7c4d0511966352d3a8637b2e7da9e +size 929726 diff --git a/lib/search/indexes/github-docs-dotcom-cn.json.br b/lib/search/indexes/github-docs-dotcom-cn.json.br index fee10132d3e6..6afc27cb0bb8 100644 --- a/lib/search/indexes/github-docs-dotcom-cn.json.br +++ b/lib/search/indexes/github-docs-dotcom-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4af9ea95a9f3a454b2c1ed302a4a832d3c11f0cbe4c12ae7286f19f7113ff3c3 -size 1660834 +oid sha256:3088ecea3d3e3f0f256e0e3ff0d3c4611de945ab37ed9f469522733653247f0f +size 1652183 diff --git a/lib/search/indexes/github-docs-dotcom-en-records.json.br b/lib/search/indexes/github-docs-dotcom-en-records.json.br index 290ff58fd3c0..4e3942118f95 100644 --- a/lib/search/indexes/github-docs-dotcom-en-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18520ae8a89c220447ae9515e70c1461efcde158b4f17339a23178c611b46af6 -size 1380431 +oid sha256:c9ef1904aacb0f14580c771589faade9362b9577bb56c1667c068fc39fd9f632 +size 1378071 diff --git a/lib/search/indexes/github-docs-dotcom-en.json.br b/lib/search/indexes/github-docs-dotcom-en.json.br index 67c881b81a2d..56d8ed6f4f47 100644 --- a/lib/search/indexes/github-docs-dotcom-en.json.br +++ b/lib/search/indexes/github-docs-dotcom-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5a8784a1069fc16f1a9184d8a89a35af0b1a3e89dfed74b4518caffb167e510 -size 5256950 +oid sha256:5494018294d06e17a283baf08075a92103d606a7db8c195b7283e6ee545c7164 +size 5253909 diff --git a/lib/search/indexes/github-docs-dotcom-es-records.json.br b/lib/search/indexes/github-docs-dotcom-es-records.json.br index dd8360d8749a..30fdb059793d 100644 --- a/lib/search/indexes/github-docs-dotcom-es-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b818bf44980c272ee10dab7548aace23f195aeab1d12a1ceff61d49deacce8e -size 838381 +oid sha256:05ddb8b344834c6a9fff659983f655dd290605abfd12f590dd9fe9a75c1b8e83 +size 838501 diff --git a/lib/search/indexes/github-docs-dotcom-es.json.br b/lib/search/indexes/github-docs-dotcom-es.json.br index 1a0ac71f99db..fb90133f69e5 100644 --- a/lib/search/indexes/github-docs-dotcom-es.json.br +++ b/lib/search/indexes/github-docs-dotcom-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2e3695b66497e993d3b6b775b0640fbdb8d3148c041c7efaa625b9fb77ed878 -size 3366399 +oid sha256:8ab3a7491d542e81a07507d809c37c6db4ba67aeee37fd52760885f4764ed686 +size 3367498 diff --git a/lib/search/indexes/github-docs-dotcom-ja-records.json.br b/lib/search/indexes/github-docs-dotcom-ja-records.json.br index bd525a3da1fb..ce5792ef9453 100644 --- a/lib/search/indexes/github-docs-dotcom-ja-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:804afe41c182b9f3a49883918ba7d7bf6a439dd0eea0b93d0f362c1b05d8e550 -size 944837 +oid sha256:4ae34f24a14eed91385768edff69c74c445ea83f68375744b654b9a42e2a5df2 +size 944825 diff --git a/lib/search/indexes/github-docs-dotcom-ja.json.br b/lib/search/indexes/github-docs-dotcom-ja.json.br index 009df3baaacd..ee9727575f15 100644 --- a/lib/search/indexes/github-docs-dotcom-ja.json.br +++ b/lib/search/indexes/github-docs-dotcom-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9810809be49f775dcedaa810ebac36f2daaa588415e967bb19fbc260b70044cf -size 4818388 +oid sha256:0839fea93ff002f77893699e6e933d9a5d8271c0d9a2790d0b9d520973ae0b8a +size 4812122 diff --git a/lib/search/indexes/github-docs-dotcom-pt-records.json.br b/lib/search/indexes/github-docs-dotcom-pt-records.json.br index 693deb3f8978..757a1c110a19 100644 --- a/lib/search/indexes/github-docs-dotcom-pt-records.json.br +++ b/lib/search/indexes/github-docs-dotcom-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ae0df510c16b28b3b3ecc5e2bc670b140b55e8c1f734e799f5fecebfe1abf09 -size 827347 +oid sha256:9f04d11ef664925a75c06bf002512040f31a2a22153e16a6236549c4a94d8e93 +size 825851 diff --git a/lib/search/indexes/github-docs-dotcom-pt.json.br b/lib/search/indexes/github-docs-dotcom-pt.json.br index a248e55c2dd0..2f0817d98d66 100644 --- a/lib/search/indexes/github-docs-dotcom-pt.json.br +++ b/lib/search/indexes/github-docs-dotcom-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb64703a60b65275c868e5d6ed1266416980e04cab86e6ae1e966ab506ac0517 -size 3224620 +oid sha256:eca979c9dfa65683c5707058088f79f4bcaa89d95df6a7e353ca0ecde57bd712 +size 3210225 diff --git a/lib/search/indexes/github-docs-ghae-cn-records.json.br b/lib/search/indexes/github-docs-ghae-cn-records.json.br index 1bf39c5019be..7727777e5a7a 100644 --- a/lib/search/indexes/github-docs-ghae-cn-records.json.br +++ b/lib/search/indexes/github-docs-ghae-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12a6ea87dc9629a7704cceb1be01d4756314e14a5c4d7bf7d91e548141d2edb9 -size 564270 +oid sha256:3cc8c60a5dcc7f39878464eb0210c65a333833d5af1c2d8b03e9ce3d3d2e16c1 +size 565566 diff --git a/lib/search/indexes/github-docs-ghae-cn.json.br b/lib/search/indexes/github-docs-ghae-cn.json.br index 8501d4bf3509..5d170dbe1105 100644 --- a/lib/search/indexes/github-docs-ghae-cn.json.br +++ b/lib/search/indexes/github-docs-ghae-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:514f606293a7744dc3b3c2384ba391a5e269c165bd1434d6434875543dc50303 -size 1119878 +oid sha256:2b5dfc95d8346193fdf892d50ff11ef8b8cd4803681f173233ca6a6898d861ce +size 1114888 diff --git a/lib/search/indexes/github-docs-ghae-en-records.json.br b/lib/search/indexes/github-docs-ghae-en-records.json.br index 1a44901c5c56..b5a9c6e93384 100644 --- a/lib/search/indexes/github-docs-ghae-en-records.json.br +++ b/lib/search/indexes/github-docs-ghae-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6e41be051f9b07dc1f4d765e9058cbabdc8c511b7a11092ca378c26c5f3dc7f -size 862037 +oid sha256:952e644f8f68ac507e7e185abac4c23b50c0fd087ae1f56d89ff0d678028d6c5 +size 863738 diff --git a/lib/search/indexes/github-docs-ghae-en.json.br b/lib/search/indexes/github-docs-ghae-en.json.br index dd208c0305c4..fe7383b2b85d 100644 --- a/lib/search/indexes/github-docs-ghae-en.json.br +++ b/lib/search/indexes/github-docs-ghae-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5eb73766273999b1082198c096fd6f048e03b697d633a033848c943b75b68a9 -size 3449486 +oid sha256:03f63779efbcddba93f56ddb043f35e82ae339fccd7ab187b09f1a0312d415e1 +size 3452030 diff --git a/lib/search/indexes/github-docs-ghae-es-records.json.br b/lib/search/indexes/github-docs-ghae-es-records.json.br index 4daf35af0a69..e10119b1561e 100644 --- a/lib/search/indexes/github-docs-ghae-es-records.json.br +++ b/lib/search/indexes/github-docs-ghae-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4178218db8ad1ae6c31dd067ec2affa01c0f6bf88b53ca6a47b11042d5b3de24 -size 521703 +oid sha256:131956e023fc163edac8e26ee1368360317fe6a217e1b4313d0329ec8103bcf0 +size 521397 diff --git a/lib/search/indexes/github-docs-ghae-es.json.br b/lib/search/indexes/github-docs-ghae-es.json.br index f56dcafb378e..9721f9eb5c63 100644 --- a/lib/search/indexes/github-docs-ghae-es.json.br +++ b/lib/search/indexes/github-docs-ghae-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a46d7a7803ead1c8bdde14b7264d9456908049e9461043c781d900e44e2a1444 -size 2117183 +oid sha256:235a7e42192db1c7b3028102c22e41bef664f0be196e189710dc526eb0a25ab6 +size 2120671 diff --git a/lib/search/indexes/github-docs-ghae-ja-records.json.br b/lib/search/indexes/github-docs-ghae-ja-records.json.br index abad9166a9d0..e1025d2d6ab4 100644 --- a/lib/search/indexes/github-docs-ghae-ja-records.json.br +++ b/lib/search/indexes/github-docs-ghae-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12b53fbeebea9a2bd9bfe5d6936733e34768dd80ab2b04efad15ae25b96cc662 -size 576671 +oid sha256:3b751cbd8503cb49cb3ef97a485b239956bbeed9a56134e93676ae0dfeae8d5b +size 575061 diff --git a/lib/search/indexes/github-docs-ghae-ja.json.br b/lib/search/indexes/github-docs-ghae-ja.json.br index e0404f04bbce..3a2d9fc4aa23 100644 --- a/lib/search/indexes/github-docs-ghae-ja.json.br +++ b/lib/search/indexes/github-docs-ghae-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d305b6d791ec8e2f0bc0ecf4d73d336ebe5a329e4b341b08e9465f4c22edc60f -size 2949137 +oid sha256:71e71f7ba8742b1cf6ece7cd2a06d7c1db627d5807f4bfe5eb6db362ae235084 +size 2947536 diff --git a/lib/search/indexes/github-docs-ghae-pt-records.json.br b/lib/search/indexes/github-docs-ghae-pt-records.json.br index 4927deff2c32..5b0a2c45fcef 100644 --- a/lib/search/indexes/github-docs-ghae-pt-records.json.br +++ b/lib/search/indexes/github-docs-ghae-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1384b50e1d2de43d205e618cb3b3f159de4cccffd4a4b4dceb6734a8477bc742 -size 514727 +oid sha256:a97fc23eaaa87a4c8dcde8dd36513dd204488f7decddd6ca6dcbf32002a993bd +size 513572 diff --git a/lib/search/indexes/github-docs-ghae-pt.json.br b/lib/search/indexes/github-docs-ghae-pt.json.br index 75dc9dda9081..181b635dc815 100644 --- a/lib/search/indexes/github-docs-ghae-pt.json.br +++ b/lib/search/indexes/github-docs-ghae-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:283d8b9f50127a8acf1c93b1556dab56b60d783459ab66e4591a271940f36671 -size 2013758 +oid sha256:ac82dfbc16904e2ef9699a1ace761eb393497c82d3238115ff2378e097b72386 +size 2002860 diff --git a/lib/search/indexes/github-docs-ghec-cn-records.json.br b/lib/search/indexes/github-docs-ghec-cn-records.json.br index 13b321f2e720..6a2d8e74de0b 100644 --- a/lib/search/indexes/github-docs-ghec-cn-records.json.br +++ b/lib/search/indexes/github-docs-ghec-cn-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df43a221760acc1d68a6659b2aa7feee8c71ae56992cf03375c8706b83ddb42f -size 861121 +oid sha256:cff993936b50e228b042580946545dda3c8cee644fc8d39d5d58e401d85ab7c7 +size 861531 diff --git a/lib/search/indexes/github-docs-ghec-cn.json.br b/lib/search/indexes/github-docs-ghec-cn.json.br index 2315add016b3..3a58ffc0fdbc 100644 --- a/lib/search/indexes/github-docs-ghec-cn.json.br +++ b/lib/search/indexes/github-docs-ghec-cn.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71299d91f730d9167eb61853ba500b0a3b8aeea74ff35f38564bbb1cf44196dc -size 1754173 +oid sha256:2de6315b8280b152fd64f153ea26e77e717b74cb15bbb623383d2518dc57ed51 +size 1745806 diff --git a/lib/search/indexes/github-docs-ghec-en-records.json.br b/lib/search/indexes/github-docs-ghec-en-records.json.br index 080558ed5376..9cc849967d8b 100644 --- a/lib/search/indexes/github-docs-ghec-en-records.json.br +++ b/lib/search/indexes/github-docs-ghec-en-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c61eb6e20c3a783e10cb72c273e060e4a05a630be76a98008104c151553934d5 -size 1252493 +oid sha256:08752ccee2fbcde5f1c24896bd9f7e854d937bd34acf370e4d5d7df07df2bae1 +size 1256288 diff --git a/lib/search/indexes/github-docs-ghec-en.json.br b/lib/search/indexes/github-docs-ghec-en.json.br index 9698dd82af8d..7128deb3aaed 100644 --- a/lib/search/indexes/github-docs-ghec-en.json.br +++ b/lib/search/indexes/github-docs-ghec-en.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68214766d3cbc485fea789d9a9098b6a9f4c4db4ad758cd227a392a2bc9aa15b -size 5058592 +oid sha256:12e3117ac68b5b4af77ecff30802c73b17d8bce53e401c7b2fc5e3a4bfc86cf0 +size 5072759 diff --git a/lib/search/indexes/github-docs-ghec-es-records.json.br b/lib/search/indexes/github-docs-ghec-es-records.json.br index add228ad9c50..5b6eb1bb1dc8 100644 --- a/lib/search/indexes/github-docs-ghec-es-records.json.br +++ b/lib/search/indexes/github-docs-ghec-es-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7202776e60590ceea6f24b429836501acfe0645028c4eefa1c7483ed015d0f7 -size 800773 +oid sha256:6cf0a96c0d639e8e1e86be678614c3d9c237363e3a54108e9404aae2102d17d1 +size 799569 diff --git a/lib/search/indexes/github-docs-ghec-es.json.br b/lib/search/indexes/github-docs-ghec-es.json.br index 4cf385c9c12d..5f2dfae4f36c 100644 --- a/lib/search/indexes/github-docs-ghec-es.json.br +++ b/lib/search/indexes/github-docs-ghec-es.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e7d21d246089b65299964e9b261c435852997de7bbe2d2b45402a158ec52df2 -size 3382479 +oid sha256:0d9a1464090539c308a3ae6547648d9ed200d4f7393c1cb5f2ac059db649a73f +size 3384372 diff --git a/lib/search/indexes/github-docs-ghec-ja-records.json.br b/lib/search/indexes/github-docs-ghec-ja-records.json.br index 9d8ed698d0e4..6711a7da4b8f 100644 --- a/lib/search/indexes/github-docs-ghec-ja-records.json.br +++ b/lib/search/indexes/github-docs-ghec-ja-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b333612723b16897f4c36507f59af7a6d9b10d17be4bd7b501a860f04544eac2 -size 879754 +oid sha256:e3de549b8b8524520143712e54b81e6db62f445adfca8235ea26dc21d547691b +size 879425 diff --git a/lib/search/indexes/github-docs-ghec-ja.json.br b/lib/search/indexes/github-docs-ghec-ja.json.br index 041fb202d7b0..1f68e9ec7188 100644 --- a/lib/search/indexes/github-docs-ghec-ja.json.br +++ b/lib/search/indexes/github-docs-ghec-ja.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2ed5130afcf3bc3b35f894c29aca0d776f61821aa4fd4cdc010331a9bffdb33 -size 4722837 +oid sha256:1c14cfa3aa7c0a52189f7b70a2becbde168814fdb257f6fc06e8b8693560bded +size 4723997 diff --git a/lib/search/indexes/github-docs-ghec-pt-records.json.br b/lib/search/indexes/github-docs-ghec-pt-records.json.br index b67b91f0881e..214e0dc36974 100644 --- a/lib/search/indexes/github-docs-ghec-pt-records.json.br +++ b/lib/search/indexes/github-docs-ghec-pt-records.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3570e4d6b3fa55d524f755b7b5c3d79f78179d48fc4b660448d3796e6ef3b826 -size 790326 +oid sha256:cab7e0d4c5a2a3e8578ac811051e99fbaf5248b3fe93d913a6cb8d859780ca74 +size 789456 diff --git a/lib/search/indexes/github-docs-ghec-pt.json.br b/lib/search/indexes/github-docs-ghec-pt.json.br index 6a6c3d150286..a11c91b5930f 100644 --- a/lib/search/indexes/github-docs-ghec-pt.json.br +++ b/lib/search/indexes/github-docs-ghec-pt.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cb007b79b133a2daba72e39f953675593651d81dce6535d4f0934d029628e8a -size 3234346 +oid sha256:b92edf352929980b0b88e28e6092cd8d9cf013c1cc28791d0f05bf38f6219790 +size 3214184 From 73d687a1c57741dd42804fa1e464154255e9ed01 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 14 Mar 2022 14:26:51 -0400 Subject: [PATCH 18/18] redirect_from might not exist (#26158) --- middleware/learning-track.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleware/learning-track.js b/middleware/learning-track.js index 97af13c5eb2e..1b8b42e77d21 100644 --- a/middleware/learning-track.js +++ b/middleware/learning-track.js @@ -54,7 +54,7 @@ export default async function learningTrack(req, res, next) { // page, we still want to render the learning track banner in that case. // Also handles Liquid conditionals in the track path. if (guideIndex < 0) { - for (const redirect of req.context.page.redirect_from) { + for (const redirect of req.context.page.redirect_from || []) { if (guideIndex >= 0) break guideIndex = await indexOfLearningTrackGuide(trackGuidePaths, redirect, req.context)