From 3b4d5959b36fbe7fb534914356bf7b46c99e72e5 Mon Sep 17 00:00:00 2001 From: omahs <73983677+omahs@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:20:46 +0200 Subject: [PATCH 01/58] Fix typos (#34052) --- .../setting-up-notifications/configuring-notifications.md | 2 +- .../configuring-secret-scanning-for-your-repositories.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md b/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md index e0db6c9aa4..a0a4401495 100644 --- a/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md +++ b/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md @@ -55,7 +55,7 @@ One benefit of using an email client is that all of your notifications can be ke Sending notifications to your email client also allows you to customize your inbox according to your email client's settings, which can include custom or color-coded labels. -Email notifications also allow flexibility with the types of notifications you receive and allow you to choose different email addresses for updates. For example, you can send certain notifications for a repository to a verified personal email address. For more information, about your email customization options, see "[Customizing your email notifications](#customizing-your-email-notifications)." +Email notifications also allow flexibility with the types of notifications you receive and allow you to choose different email addresses for updates. For example, you can send certain notifications for a repository to a verified personal email address. For more information, about your email customization options, see "[Customizing your email notifications](#customizing-your-email-notifications)." ## About participating and watching notifications diff --git a/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md b/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md index 47b87aecc5..548d37d0f2 100644 --- a/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md +++ b/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md @@ -53,7 +53,7 @@ A repository administrator can choose to disable {% data variables.product.prodn You can enable the following additional {% data variables.product.prodname_secret_scanning %} feature{% ifversion ghec or ghes %}s{% endif %} through your repository's "Code security and analysis" settings: * **Push protection**. For more information, see "[AUTOTITLE](/code-security/secret-scanning/push-protection-for-repositories-and-organizations#enabling-secret-scanning-as-a-push-protection-for-a-repository)."{% ifversion secret-scanning-validity-check-partner-patterns %} -* **Validity checks for partner patterns**. For more infomation, see "[Enabling validity checks for partner patterns](#enabling-validity-checks-for-partner-patterns)."{% endif %}{% ifversion secret-scanning-non-provider-patterns %} +* **Validity checks for partner patterns**. For more information, see "[Enabling validity checks for partner patterns](#enabling-validity-checks-for-partner-patterns)."{% endif %}{% ifversion secret-scanning-non-provider-patterns %} * **Scanning for non-provider patterns**. For more information, see "[Enabling scanning for non-provider patterns](#enabling-scanning-for-non-provider-patterns)."{% endif %}{% ifversion secret-scanning-ai-generic-secret-detection%} * **AI-powered generic secret detection**. For more information, see "[AUTOTITLE](/code-security/secret-scanning/enabling-ai-powered-generic-secret-detection)."{% endif %}{% ifversion secret-scanning-push-protection-custom-patterns %} * **Scanning for custom patterns**. For more information, see "[AUTOTITLE](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning#defining-a-custom-pattern-for-a-repository)."{% endif %} From e5ea238082be34bcffd8d836d4e48364f3100b13 Mon Sep 17 00:00:00 2001 From: Julien Chien <14224739+wholien@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:31:40 -0400 Subject: [PATCH 02/58] nit: remove extraneous space (#34053) Co-authored-by: Alex Nguyen <150945400+nguyenalex836@users.noreply.github.com> --- content/actions/managing-workflow-runs/canceling-a-workflow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/managing-workflow-runs/canceling-a-workflow.md b/content/actions/managing-workflow-runs/canceling-a-workflow.md index c6f5b9c75b..efbd3b1700 100644 --- a/content/actions/managing-workflow-runs/canceling-a-workflow.md +++ b/content/actions/managing-workflow-runs/canceling-a-workflow.md @@ -27,6 +27,6 @@ When canceling workflow run, you may be running other software that uses resourc 1. To cancel the workflow run, the server re-evaluates `if` conditions for all currently running jobs. If the condition evaluates to `true`, the job will not get canceled. For example, the condition `if: always()` would evaluate to true and the job continues to run. When there is no condition, that is the equivalent of the condition `if: success()`, which only runs if the previous step finished successfully. 1. For jobs that need to be canceled, the server sends a cancellation message to all the runner machines with jobs that need to be canceled. -1. For jobs that continue to run, the server re-evaluates `if` conditions for the unfinished steps. If the condition evaluates to `true`, the step continues to run. You can use the `cancelled` expression to apply a status check of `cancelled( )`. For more information see "[AUTOTITLE](/actions/learn-github-actions/expressions#cancelled)." +1. For jobs that continue to run, the server re-evaluates `if` conditions for the unfinished steps. If the condition evaluates to `true`, the step continues to run. You can use the `cancelled` expression to apply a status check of `cancelled()`. For more information see "[AUTOTITLE](/actions/learn-github-actions/expressions#cancelled)." 1. For steps that need to be canceled, the runner machine sends `SIGINT/Ctrl-C` to the step's entry process (`node` for javascript action, `docker` for container action, and `bash/cmd/pwd` when using `run` in a step). If the process doesn't exit within 7500 ms, the runner will send `SIGTERM/Ctrl-Break` to the process, then wait for 2500 ms for the process to exit. If the process is still running, the runner kills the process tree. 1. After the 5 minutes cancellation timeout period, the server will force terminate all jobs and steps that don't finish running or fail to complete the cancellation process. From a486772b829b29a578faf9eaec3b2e6d694a2735 Mon Sep 17 00:00:00 2001 From: docs-bot <77750099+docs-bot@users.noreply.github.com> Date: Tue, 23 Jul 2024 09:35:19 -0700 Subject: [PATCH 03/58] Update audit log event data (#51756) --- src/audit-logs/data/fpt/organization.json | 50 ++++++++++++++++++++++ src/audit-logs/data/ghec/organization.json | 50 ++++++++++++++++++++++ src/audit-logs/lib/config.json | 2 +- 3 files changed, 101 insertions(+), 1 deletion(-) diff --git a/src/audit-logs/data/fpt/organization.json b/src/audit-logs/data/fpt/organization.json index fca24968bf..6c1fcfb78b 100644 --- a/src/audit-logs/data/fpt/organization.json +++ b/src/audit-logs/data/fpt/organization.json @@ -2854,6 +2854,26 @@ "description": "Secret scanning push protection was enabled for a repository.", "docs_reference_links": "/code-security/secret-scanning/protecting-pushes-with-secret-scanning" }, + { + "action": "repository_security_configuration.applied", + "description": "A code security configuration was applied to a repository.", + "docs_reference_links": "N/A" + }, + { + "action": "repository_security_configuration.failed", + "description": "A code security configuration failed to attach to the repository.", + "docs_reference_links": "N/A" + }, + { + "action": "repository_security_configuration.removed", + "description": "A code security configuration was removed from a repository.", + "docs_reference_links": "N/A" + }, + { + "action": "repository_security_configuration.removed_by_settings_change", + "description": "A code security configuration was removed due to a change in repository or enterprise settings.", + "docs_reference_links": "N/A" + }, { "action": "repository_visibility_change.clear", "description": "The repository visibility change setting was cleared for an organization or enterprise.", @@ -3029,6 +3049,36 @@ "description": "A user requested to bypass secret scanning push protection.", "docs_reference_links": "/code-security/secret-scanning/working-with-push-protection#requesting-bypass-privileges-when-working-with-the-command-line" }, + { + "action": "security_configuration.create", + "description": "A security configuration was created", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration_default.delete", + "description": "A default security configuration setting for new repositories was removed.", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration_default.update", + "description": "A default security configuration setting for new repositories was updated.", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration.delete", + "description": "A security configuration was deleted", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration_policy.update", + "description": "A security configuration policy was updated", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration.update", + "description": "A security configuration was updated", + "docs_reference_links": "N/A" + }, { "action": "sponsors.agreement_sign", "description": "A GitHub Sponsors agreement was signed on behalf of an organization.", diff --git a/src/audit-logs/data/ghec/organization.json b/src/audit-logs/data/ghec/organization.json index fca24968bf..6c1fcfb78b 100644 --- a/src/audit-logs/data/ghec/organization.json +++ b/src/audit-logs/data/ghec/organization.json @@ -2854,6 +2854,26 @@ "description": "Secret scanning push protection was enabled for a repository.", "docs_reference_links": "/code-security/secret-scanning/protecting-pushes-with-secret-scanning" }, + { + "action": "repository_security_configuration.applied", + "description": "A code security configuration was applied to a repository.", + "docs_reference_links": "N/A" + }, + { + "action": "repository_security_configuration.failed", + "description": "A code security configuration failed to attach to the repository.", + "docs_reference_links": "N/A" + }, + { + "action": "repository_security_configuration.removed", + "description": "A code security configuration was removed from a repository.", + "docs_reference_links": "N/A" + }, + { + "action": "repository_security_configuration.removed_by_settings_change", + "description": "A code security configuration was removed due to a change in repository or enterprise settings.", + "docs_reference_links": "N/A" + }, { "action": "repository_visibility_change.clear", "description": "The repository visibility change setting was cleared for an organization or enterprise.", @@ -3029,6 +3049,36 @@ "description": "A user requested to bypass secret scanning push protection.", "docs_reference_links": "/code-security/secret-scanning/working-with-push-protection#requesting-bypass-privileges-when-working-with-the-command-line" }, + { + "action": "security_configuration.create", + "description": "A security configuration was created", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration_default.delete", + "description": "A default security configuration setting for new repositories was removed.", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration_default.update", + "description": "A default security configuration setting for new repositories was updated.", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration.delete", + "description": "A security configuration was deleted", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration_policy.update", + "description": "A security configuration policy was updated", + "docs_reference_links": "N/A" + }, + { + "action": "security_configuration.update", + "description": "A security configuration was updated", + "docs_reference_links": "N/A" + }, { "action": "sponsors.agreement_sign", "description": "A GitHub Sponsors agreement was signed on behalf of an organization.", diff --git a/src/audit-logs/lib/config.json b/src/audit-logs/lib/config.json index 37dbeccc29..57c5ecdc84 100644 --- a/src/audit-logs/lib/config.json +++ b/src/audit-logs/lib/config.json @@ -3,5 +3,5 @@ "apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.", "apiRequestEvent": "This event is only available via audit log streaming." }, - "sha": "9db7c050f8f686843f7ebab7e8d8fd18a4f843f0" + "sha": "f271371294d09bfaaff89f4a043ed51243be415c" } \ No newline at end of file From 236b03251a5c4ef439f475d5501795635fe090fe Mon Sep 17 00:00:00 2001 From: Rachael Sewell Date: Tue, 23 Jul 2024 10:04:55 -0700 Subject: [PATCH 04/58] fix secret-scanning pipeline bug (#51752) --- src/secret-scanning/lib/config.json | 5 +++-- src/secret-scanning/scripts/sync.ts | 23 ++++++++++++--------- src/workflows/git-utils.js | 31 +++++++++++++++++++---------- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/secret-scanning/lib/config.json b/src/secret-scanning/lib/config.json index ba4eb4e994..4f2c70820d 100644 --- a/src/secret-scanning/lib/config.json +++ b/src/secret-scanning/lib/config.json @@ -1,3 +1,4 @@ { - "sha": "bf82c5b6f6d84eb3626f88002d542f939cddd010" -} \ No newline at end of file + "sha": "c7f047cb3ca94c91c1eba737838789c4257f1f67", + "blob-sha": "13c59b82fef1bd99b512bb546e95cc77f14d5be3" +} diff --git a/src/secret-scanning/scripts/sync.ts b/src/secret-scanning/scripts/sync.ts index 8bd70c0a4b..45f7ced375 100755 --- a/src/secret-scanning/scripts/sync.ts +++ b/src/secret-scanning/scripts/sync.ts @@ -13,7 +13,7 @@ import { readFile, writeFile } from 'fs/promises' import core from '@actions/core' import yaml from 'js-yaml' -import { getContents, getCommitSha } from '@/workflows/git-utils.js' +import { getContentAndData, getCommitSha } from '@/workflows/git-utils.js' import schema from '@/secret-scanning/data/public-docs-schema.js' // This is temporarily being imported until the subsequent modules // have beeen converted to TypeScript. @@ -21,7 +21,7 @@ import { validateJson } from '@/tests/lib/validate-json-schema.js' import { formatAjvErrors } from '@/tests/helpers/schemas.js' const SECRET_SCANNING_FILEPATH = 'src/secret-scanning/data/public-docs.yml' -type PipelineConfig = { sha: string } +type PipelineConfig = { sha: string; 'blob-sha': string } async function main() { if (!process.env.GITHUB_TOKEN) { @@ -33,12 +33,19 @@ async function main() { const ref = 'main' const filepath = 'docs/public-docs.yml' - const data = await getContents(owner, repo, ref, filepath) + const { content, blobSha } = await getContentAndData(owner, repo, ref, filepath) + + const configFilepath = 'src/secret-scanning/lib/config.json' + const pipelineConfig: PipelineConfig = JSON.parse(await readFile(configFilepath, 'utf8')) + if (pipelineConfig['blob-sha'] === blobSha) { + console.log('No changes detected in the public-docs.yml file') + return + } // ensure yaml can be parsed let yamlData try { - yamlData = yaml.load(data) + yamlData = yaml.load(content) } catch (error) { console.error('The public-docs.yml file being synced is not valid yaml') throw error @@ -55,15 +62,13 @@ async function main() { await writeFile(SECRET_SCANNING_FILEPATH, yaml.dump(yamlData)) // update the config file with the latest sha - const configFilepath = 'src/secret-scanning/lib/config.json' - const mainSha = await getCommitSha(owner, repo, `heads/${ref}`) - const pipelineConfig: PipelineConfig = JSON.parse(await readFile(configFilepath, 'utf8')) - pipelineConfig.sha = mainSha + pipelineConfig.sha = await getCommitSha(owner, repo, `heads/${ref}`) + pipelineConfig['blob-sha'] = blobSha await writeFile(configFilepath, JSON.stringify(pipelineConfig, null, 2)) // the workflow that runs this script needs the synced sha to use // when creating the PR. - core.setOutput('sha', mainSha) + core.setOutput('sha', pipelineConfig.sha) } main() diff --git a/src/workflows/git-utils.js b/src/workflows/git-utils.js index 28f18e6261..d7ec43b403 100644 --- a/src/workflows/git-utils.js +++ b/src/workflows/git-utils.js @@ -83,26 +83,37 @@ export async function getContentsForBlob(owner, repo, sha) { file_sha: sha, }) // decode blob contents - return Buffer.from(data.content, 'base64') + return Buffer.from(data.content, 'base64').toString() } // https://docs.github.com/rest/reference/repos#get-repository-content export async function getContents(owner, repo, ref, path) { + const { data } = await getContent(owner, repo, ref, path) + if (!data.content) { + return await getContentsForBlob(owner, repo, data.sha) + } + // decode Base64 encoded contents + return Buffer.from(data.content, 'base64').toString() +} + +// https://docs.github.com/rest/reference/repos#get-repository-content +export async function getContentAndData(owner, repo, ref, path) { + const { data } = await getContent(owner, repo, ref, path) + const content = data.content + ? Buffer.from(data.content, 'base64').toString() + : await getContentsForBlob(owner, repo, data.sha) + // decode Base64 encoded contents + return { content, blobSha: data.sha } +} + +async function getContent(owner, repo, ref, path) { try { - const { data } = await github.repos.getContent({ + return await github.repos.getContent({ owner, repo, ref, path, }) - - if (!data.content) { - const blob = await getContentsForBlob(owner, repo, data.sha) - // decode Base64 encoded contents - return Buffer.from(blob, 'base64').toString() - } - // decode Base64 encoded contents - return Buffer.from(data.content, 'base64').toString() } catch (err) { console.log(`error getting ${path} from ${owner}/${repo} at ref ${ref}`) throw err From d18ddccf1451169f8e8e02d6b5e080e3f81fc2ae Mon Sep 17 00:00:00 2001 From: Bat Battur <58952979+batbattur@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:05:35 -0700 Subject: [PATCH 05/58] Add RUNNER_ENVIRONMENT to default env variables docs (#33310) Co-authored-by: Alex Nguyen <150945400+nguyenalex836@users.noreply.github.com> --- content/actions/learn-github-actions/variables.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/actions/learn-github-actions/variables.md b/content/actions/learn-github-actions/variables.md index da64f12e18..9c0093f80d 100644 --- a/content/actions/learn-github-actions/variables.md +++ b/content/actions/learn-github-actions/variables.md @@ -308,6 +308,7 @@ We strongly recommend that actions use variables to access the filesystem rather | `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. For example, `/home/runner/work/my-repo-name/my-repo-name`. | | `RUNNER_ARCH` | {% data reusables.actions.runner-arch-description %} | | `RUNNER_DEBUG` | {% data reusables.actions.runner-debug-description %} | +| `RUNNER_ENVIRONMENT` | {% data reusables.actions.runner-environment-description %} | | `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` | From bd77646af6b419a6e2ba6fc31ef3852155d8c931 Mon Sep 17 00:00:00 2001 From: Siara <108543037+SiaraMist@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:19:54 -0700 Subject: [PATCH 06/58] Tools and Automation bug fix hour for the June 2024 cycle (#51712) --- .../creating-actions/metadata-syntax-for-github-actions.md | 3 ++- .../configuring-openid-connect-in-cloud-providers.md | 2 +- .../configuring-openid-connect-in-google-cloud-platform.md | 2 +- content/graphql/guides/managing-enterprise-accounts.md | 2 -- data/reusables/actions/azure-vnet-procedures-prereqs.md | 2 ++ 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/content/actions/creating-actions/metadata-syntax-for-github-actions.md b/content/actions/creating-actions/metadata-syntax-for-github-actions.md index 44df2cf5dd..ecdc122f0f 100644 --- a/content/actions/creating-actions/metadata-syntax-for-github-actions.md +++ b/content/actions/creating-actions/metadata-syntax-for-github-actions.md @@ -481,7 +481,7 @@ branding: ### `branding.color` -The background color of the badge. Can be one of: `white`, `yellow`, `blue`, `green`, `orange`, `red`, `purple`, or `gray-dark`. +The background color of the badge. Can be one of: `white`, `black`, `yellow`, `blue`, `green`, `orange`, `red`, `purple`, or `gray-dark`. ### `branding.icon` @@ -725,6 +725,7 @@ Brand icons, and all the following icons, are omitted.
  • sun
  • sunrise
  • sunset
    • +
  • table
  • tablet
  • tag
  • target
    • diff --git a/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers.md b/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers.md index b69039845d..579154a596 100644 --- a/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers.md +++ b/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers.md @@ -49,7 +49,7 @@ For example, Alibaba Cloud created [`aliyun/configure-aliyun-credentials-action` If your cloud provider doesn't have an official action, or if you prefer to create custom scripts, you can manually request the JSON Web Token (JWT) from {% data variables.product.prodname_dotcom %}'s OIDC provider. -If you're not using an official action, then {% data variables.product.prodname_dotcom %} recommends that you use the Actions core toolkit. Alternatively, you can use the following environment variables to retrieve the token: `ACTIONS_RUNTIME_TOKEN`, `ACTIONS_ID_TOKEN_REQUEST_URL`. +If you're not using an official action, then {% data variables.product.prodname_dotcom %} recommends that you use the Actions core toolkit. Alternatively, you can use the following environment variables to retrieve the token: `ACTIONS_ID_TOKEN_REQUEST_TOKEN`, `ACTIONS_ID_TOKEN_REQUEST_URL`. To update your workflows using this approach, you will need to make three changes to your YAML: diff --git a/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md b/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md index ae4451e476..c6f38f3da2 100644 --- a/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md +++ b/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md @@ -57,7 +57,7 @@ The `google-github-actions/auth` action receives a JWT from the {% data variable This example has a job called `Get_OIDC_ID_token` that uses actions to request a list of services from GCP. -* ``: Replace this with the path to your identity provider in GCP. For example, `projects//locations/global/workloadIdentityPools/` +* ``: Replace this with the path to your identity provider in GCP. For example, `projects//locations/global/workloadIdentityPools//providers/` * ``: Replace this with the name of your service account in GCP. * ``: Replace this with the ID of your GCP project. diff --git a/content/graphql/guides/managing-enterprise-accounts.md b/content/graphql/guides/managing-enterprise-accounts.md index 2a9d81711f..cfd3d851df 100644 --- a/content/graphql/guides/managing-enterprise-accounts.md +++ b/content/graphql/guides/managing-enterprise-accounts.md @@ -203,8 +203,6 @@ For more information about getting started with GraphQL, see "[AUTOTITLE](/graph ## GraphQL fields and types for the Enterprise Accounts API -Here's an overview of the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API. - For more details about the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API, see the sidebar with detailed GraphQL definitions from any [GraphQL reference page](/graphql). You can access the reference docs from within the GraphQL explorer on GitHub. For more information, see "[AUTOTITLE](/graphql/guides/using-the-explorer#accessing-the-sidebar-docs)." diff --git a/data/reusables/actions/azure-vnet-procedures-prereqs.md b/data/reusables/actions/azure-vnet-procedures-prereqs.md index 7ee7d2732e..3354efe032 100644 --- a/data/reusables/actions/azure-vnet-procedures-prereqs.md +++ b/data/reusables/actions/azure-vnet-procedures-prereqs.md @@ -10,6 +10,8 @@ You will use a script to automate configuring your Azure resources. * Save the following `.bicep` file. Name the file `actions-nsg-deployment.bicep`. + The `.bicep` file we provide contains the minimal set of rules to use {% data variables.product.company_short %}-hosted runners with Azure VNET. You may need to add rules for your specific use case. + {% note %} **Note:** Alternatively, to allow {% data variables.product.prodname_actions %} to communicate with the runners, you can allow the same firewall domains that are required for communication between self-hosted runners and {% data variables.product.product_name %}. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#communication-between-self-hosted-runners-and-github-enterprise-cloud)." To determine the appropriate subnet IP address range, we recommend adding a 30% buffer to the maximum job concurrency you anticipate. For instance, if your network configuration's runners are set to a maximum job concurrency of 300, it's recommended to utilize a subnet IP address range that can accommodate at least 390 runners. This buffer helps ensure that your network can handle unexpected increases in VM needs to meet job concurrency without running out of IP addresses. From c45cbd4ed01cd1496c8bd6397b7a0df510636ded Mon Sep 17 00:00:00 2001 From: Siara <108543037+SiaraMist@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:18:24 -0700 Subject: [PATCH 07/58] Relocate articles into a new "Administer GitHub Actions" category (#51749) --- .../actions/administering-github-actions/index.md | 15 +++++++++++++++ .../managing-environments-for-deployment.md | 4 +++- ...-secrets-and-runners-with-your-organization.md | 1 + .../usage-limits-billing-and-administration.md | 1 + ...actions-usage-metrics-for-your-organization.md | 4 +++- content/actions/deployment/index.md | 1 - .../targeting-different-environments/index.md | 12 ------------ content/actions/index.md | 1 + content/actions/learn-github-actions/index.md | 3 +-- .../index.md | 4 ++-- content/actions/using-workflows/index.md | 2 +- 11 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 content/actions/administering-github-actions/index.md rename content/actions/{deployment/targeting-different-environments => administering-github-actions}/managing-environments-for-deployment.md (99%) rename content/actions/{using-workflows => administering-github-actions}/sharing-workflows-secrets-and-runners-with-your-organization.md (97%) rename content/actions/{learn-github-actions => administering-github-actions}/usage-limits-billing-and-administration.md (99%) rename content/actions/{monitoring-and-troubleshooting-workflows => administering-github-actions}/viewing-github-actions-usage-metrics-for-your-organization.md (79%) delete mode 100644 content/actions/deployment/targeting-different-environments/index.md diff --git a/content/actions/administering-github-actions/index.md b/content/actions/administering-github-actions/index.md new file mode 100644 index 0000000000..0409446d4a --- /dev/null +++ b/content/actions/administering-github-actions/index.md @@ -0,0 +1,15 @@ +--- +title: Administering GitHub Actions +shortTitle: Administer GitHub Actions +intro: 'Manage {% data variables.product.prodname_actions %} settings for your organization or enterprise.' +versions: + fpt: '*' + ghes: '*' + ghec: '*' +children: + - /usage-limits-billing-and-administration + - /viewing-github-actions-usage-metrics-for-your-organization + - /sharing-workflows-secrets-and-runners-with-your-organization + - /managing-environments-for-deployment +--- + diff --git a/content/actions/deployment/targeting-different-environments/managing-environments-for-deployment.md b/content/actions/administering-github-actions/managing-environments-for-deployment.md similarity index 99% rename from content/actions/deployment/targeting-different-environments/managing-environments-for-deployment.md rename to content/actions/administering-github-actions/managing-environments-for-deployment.md index 097f820cf7..1260e1399e 100644 --- a/content/actions/deployment/targeting-different-environments/managing-environments-for-deployment.md +++ b/content/actions/administering-github-actions/managing-environments-for-deployment.md @@ -3,12 +3,14 @@ title: Managing environments for deployment shortTitle: Manage environments intro: You can create environments and secure those environments with deployment protection rules. A job that references an environment must follow any protection rules for the environment before running or accessing the environment's secrets. product: '{% data reusables.gated-features.environments %}' -permissions: 'Repository owners' +permissions: Repository owners redirect_from: - /actions/reference/environments - /actions/deployment/environments - /actions/deployment/using-environments-for-deployment - /actions/deployment/targeting-different-environments/using-environments-for-deployment + - /actions/deployment/targeting-different-environments + - /actions/deployment/targeting-different-environments/managing-environments-for-deployment topics: - CD - Deployment diff --git a/content/actions/using-workflows/sharing-workflows-secrets-and-runners-with-your-organization.md b/content/actions/administering-github-actions/sharing-workflows-secrets-and-runners-with-your-organization.md similarity index 97% rename from content/actions/using-workflows/sharing-workflows-secrets-and-runners-with-your-organization.md rename to content/actions/administering-github-actions/sharing-workflows-secrets-and-runners-with-your-organization.md index 79363d1b8d..3936979752 100644 --- a/content/actions/using-workflows/sharing-workflows-secrets-and-runners-with-your-organization.md +++ b/content/actions/administering-github-actions/sharing-workflows-secrets-and-runners-with-your-organization.md @@ -5,6 +5,7 @@ intro: 'Learn how you can use organization features to collaborate with your tea redirect_from: - /actions/learn-github-actions/sharing-workflows-with-your-organization - /actions/learn-github-actions/sharing-workflows-secrets-and-runners-with-your-organization + - /actions/using-workflows/sharing-workflows-secrets-and-runners-with-your-organization versions: fpt: '*' ghes: '*' diff --git a/content/actions/learn-github-actions/usage-limits-billing-and-administration.md b/content/actions/administering-github-actions/usage-limits-billing-and-administration.md similarity index 99% rename from content/actions/learn-github-actions/usage-limits-billing-and-administration.md rename to content/actions/administering-github-actions/usage-limits-billing-and-administration.md index 6d04182652..95fb2bcb21 100644 --- a/content/actions/learn-github-actions/usage-limits-billing-and-administration.md +++ b/content/actions/administering-github-actions/usage-limits-billing-and-administration.md @@ -4,6 +4,7 @@ intro: 'There are usage limits for {% data variables.product.prodname_actions %} redirect_from: - /actions/getting-started-with-github-actions/usage-and-billing-information-for-github-actions - /actions/reference/usage-limits-billing-and-administration + - /actions/learn-github-actions/usage-limits-billing-and-administration versions: fpt: '*' ghes: '*' diff --git a/content/actions/monitoring-and-troubleshooting-workflows/viewing-github-actions-usage-metrics-for-your-organization.md b/content/actions/administering-github-actions/viewing-github-actions-usage-metrics-for-your-organization.md similarity index 79% rename from content/actions/monitoring-and-troubleshooting-workflows/viewing-github-actions-usage-metrics-for-your-organization.md rename to content/actions/administering-github-actions/viewing-github-actions-usage-metrics-for-your-organization.md index 790a0fe495..501c04d494 100644 --- a/content/actions/monitoring-and-troubleshooting-workflows/viewing-github-actions-usage-metrics-for-your-organization.md +++ b/content/actions/administering-github-actions/viewing-github-actions-usage-metrics-for-your-organization.md @@ -2,11 +2,13 @@ title: Viewing GitHub Actions usage metrics for your organization shortTitle: GitHub Actions usage metrics intro: 'Organization owners and CI/CD administrators can view usage metrics for how and where their organization uses {% data variables.product.prodname_actions %}.' -permissions: 'Organization owners and users with the "View organization Actions usage metrics" permissions.' +permissions: Organization owners and users with the "View organization Actions usage metrics" permissions. product: 'Your organization must be on a {% data variables.product.prodname_ghe_cloud %} plan.' versions: fpt: '*' ghec: '*' +redirect_from: + - /actions/monitoring-and-troubleshooting-workflows/viewing-github-actions-usage-metrics-for-your-organization --- {% data reusables.actions.actions-usage-metrics-beta-note %} diff --git a/content/actions/deployment/index.md b/content/actions/deployment/index.md index 8cb009ece2..3498ad6166 100644 --- a/content/actions/deployment/index.md +++ b/content/actions/deployment/index.md @@ -10,7 +10,6 @@ children: - /about-deployments - /deploying-to-your-cloud-provider - /security-hardening-your-deployments - - /targeting-different-environments - /protecting-deployments - /managing-your-deployments - /deploying-xcode-applications diff --git a/content/actions/deployment/targeting-different-environments/index.md b/content/actions/deployment/targeting-different-environments/index.md deleted file mode 100644 index 8bd30b17ce..0000000000 --- a/content/actions/deployment/targeting-different-environments/index.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Targeting different environments -shortTitle: Target different environments -intro: You can configure environments with protection rules and secrets. 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: '*' - ghes: '*' - ghec: '*' -children: - - /managing-environments-for-deployment ---- - diff --git a/content/actions/index.md b/content/actions/index.md index 784041c362..2c9743b3c7 100644 --- a/content/actions/index.md +++ b/content/actions/index.md @@ -59,6 +59,7 @@ children: - /hosting-your-own-runners - /security-guides - /creating-actions + - /administering-github-actions - /guides --- diff --git a/content/actions/learn-github-actions/index.md b/content/actions/learn-github-actions/index.md index 0f24e9185a..57eaee541e 100644 --- a/content/actions/learn-github-actions/index.md +++ b/content/actions/learn-github-actions/index.md @@ -24,7 +24,6 @@ children: - /expressions - /contexts - /variables - - /using-starter-workflows - - /usage-limits-billing-and-administration + - /using-starter-workflows --- diff --git a/content/actions/monitoring-and-troubleshooting-workflows/index.md b/content/actions/monitoring-and-troubleshooting-workflows/index.md index 032791f6dc..d5c08d41a9 100644 --- a/content/actions/monitoring-and-troubleshooting-workflows/index.md +++ b/content/actions/monitoring-and-troubleshooting-workflows/index.md @@ -18,7 +18,7 @@ children: - /using-workflow-run-logs - /enabling-debug-logging - /notifications-for-workflow-runs - - /viewing-github-actions-usage-metrics-for-your-organization - /working-with-support-for-github-actions ---- +--- + {% data reusables.actions.enterprise-github-hosted-runners %} diff --git a/content/actions/using-workflows/index.md b/content/actions/using-workflows/index.md index 9f586d44ef..7d1af2ac95 100644 --- a/content/actions/using-workflows/index.md +++ b/content/actions/using-workflows/index.md @@ -33,6 +33,6 @@ children: - /caching-dependencies-to-speed-up-workflows - /storing-workflow-data-as-artifacts - /creating-starter-workflows-for-your-organization - - /sharing-workflows-secrets-and-runners-with-your-organization - /using-github-cli-in-workflows --- + From db18adb2af1742eb2c9aea1f316fe26832f86e0d Mon Sep 17 00:00:00 2001 From: Dimitrios Philliou Date: Wed, 24 Jul 2024 01:31:50 -0700 Subject: [PATCH 08/58] Update abilities-and-restrictions-of-managed-user-accounts.md (#34062) --- .../abilities-and-restrictions-of-managed-user-accounts.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/admin/managing-iam/understanding-iam-for-enterprises/abilities-and-restrictions-of-managed-user-accounts.md b/content/admin/managing-iam/understanding-iam-for-enterprises/abilities-and-restrictions-of-managed-user-accounts.md index 11a15e5fdb..f0ce784344 100644 --- a/content/admin/managing-iam/understanding-iam-for-enterprises/abilities-and-restrictions-of-managed-user-accounts.md +++ b/content/admin/managing-iam/understanding-iam-for-enterprises/abilities-and-restrictions-of-managed-user-accounts.md @@ -35,6 +35,7 @@ With {% data variables.product.prodname_emus %}, you can control the user accoun * Cannot install {% data variables.product.prodname_github_apps %} on their user accounts. * Can install {% data variables.product.prodname_github_apps %} on a repository if the app doesn't request organization permissions and if the {% data variables.enterprise.prodname_managed_user %} has admin access to the repository. * Can install {% data variables.product.prodname_github_apps %} on an organization if the {% data variables.enterprise.prodname_managed_user %} is an organization owner. +* Can purchase and install paid {% data variables.product.prodname_github_apps %} only if the {% data variables.enterprise.prodname_managed_user %} is an enterprise owner. * Can create {% data variables.product.prodname_github_apps %} and {% data variables.product.prodname_oauth_apps %}. {% data reusables.emus.oauth-app-note %} From 1b83bc7565b057038433039f48e9c4b6c7cc8255 Mon Sep 17 00:00:00 2001 From: Regis Bittencourt Date: Wed, 24 Jul 2024 08:32:34 -0300 Subject: [PATCH 09/58] Update configuring-github-copilot-in-your-environment.md (#33601) Co-authored-by: hubwriter --- .../configuring-github-copilot-in-your-environment.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/copilot/managing-copilot/configure-personal-settings/configuring-github-copilot-in-your-environment.md b/content/copilot/managing-copilot/configure-personal-settings/configuring-github-copilot-in-your-environment.md index 6369e776de..87c975bd94 100644 --- a/content/copilot/managing-copilot/configure-personal-settings/configuring-github-copilot-in-your-environment.md +++ b/content/copilot/managing-copilot/configure-personal-settings/configuring-github-copilot-in-your-environment.md @@ -213,7 +213,6 @@ You can use the default keyboard shortcuts in {% data variables.product.prodname |:---|:---|:---| |Show next inline suggestion|Alt+.|Edit.NextSuggestion| |Show previous inline suggestion|Alt+,|Edit.PreviousSuggestion| -|Trigger inline suggestion|Ctrl+Alt+\\|Edit.Copilot.TriggerInlineSuggestion| ### Rebinding keyboard shortcuts From 092e87bfaeeebd803a17f393d58adefe6e84017f Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Wed, 24 Jul 2024 13:32:09 +0100 Subject: [PATCH 10/58] Revise permission statement for managing custom properties (#51771) Co-authored-by: Ben Ahmady <32935794+subatoi@users.noreply.github.com> --- ...custom-properties-for-repositories-in-your-organization.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md index b9f8cd1877..c20b9f1303 100644 --- a/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md @@ -1,7 +1,7 @@ --- title: Managing custom properties for repositories in your organization intro: 'With custom properties, you can add metadata to repositories in your organization. You can use those properties to target repositories with rulesets.' -permissions: 'Organization owners can add and set a custom property schema at the organization level. People with read permissions to a repository can view the values of custom properties for that repository.' +permissions: 'Organization owners {% ifversion custom-org-roles %}and users with the "Manage the organization''s custom properties definitions" permission {% endif %}can add and set a custom property schema at the organization level.' versions: feature: repository-properties topics: @@ -43,7 +43,7 @@ You can add custom properties to your organization and set values for those prop ## Setting values for repositories in your organization -You can set values for custom properties for repositories in your organization. +You{% ifversion custom-org-roles %}, and any users with the "Edit custom properties values at the organization level" permission,{% endif %} can set values for custom properties for repositories in your organization. {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} From 573746fee5c3755f47bd25507b936d28203ec64b Mon Sep 17 00:00:00 2001 From: docs-bot <77750099+docs-bot@users.noreply.github.com> Date: Wed, 24 Jul 2024 09:34:42 -0700 Subject: [PATCH 11/58] GraphQL schema update (#51774) Co-authored-by: rachmari <9831992+rachmari@users.noreply.github.com> --- src/graphql/data/fpt/changelog.json | 22 +++ src/graphql/data/fpt/schema.docs.graphql | 166 +++++++++++++++- src/graphql/data/fpt/schema.json | 221 +++++++++++++++++++++- src/graphql/data/ghec/schema.docs.graphql | 166 +++++++++++++++- src/graphql/data/ghec/schema.json | 221 +++++++++++++++++++++- 5 files changed, 780 insertions(+), 16 deletions(-) diff --git a/src/graphql/data/fpt/changelog.json b/src/graphql/data/fpt/changelog.json index 38982bf446..2d4d05e845 100644 --- a/src/graphql/data/fpt/changelog.json +++ b/src/graphql/data/fpt/changelog.json @@ -1,4 +1,26 @@ [ + { + "schemaChanges": [ + { + "title": "The GraphQL schema includes these changes:", + "changes": [ + "

    Type MergeQueueGroupingStrategy was added

    ", + "

    Type MergeQueueMergeMethod was added

    ", + "

    Type MergeQueueParameters was added

    ", + "

    Type MergeQueueParametersInput was added

    ", + "

    Field viewerCanLabel was added to object type Discussion

    ", + "

    Field viewerCanLabel was added to object type Issue

    ", + "

    Field viewerCanLabel was added to interface Labelable

    ", + "

    Field viewerCanLabel was added to object type PullRequest

    ", + "

    Member MergeQueueParameters was added to Union type RuleParameters

    ", + "

    Input field mergeQueue of type MergeQueueParametersInput was added to input object type RuleParametersInput

    " + ] + } + ], + "previewChanges": [], + "upcomingChanges": [], + "date": "2024-07-24" + }, { "schemaChanges": [ { diff --git a/src/graphql/data/fpt/schema.docs.graphql b/src/graphql/data/fpt/schema.docs.graphql index d80490d135..7cd9e601d4 100644 --- a/src/graphql/data/fpt/schema.docs.graphql +++ b/src/graphql/data/fpt/schema.docs.graphql @@ -11644,6 +11644,11 @@ type Discussion implements Closable & Comment & Deletable & Labelable & Lockable """ viewerCanDelete: Boolean! + """ + Indicates if the viewer can edit labels for this object. + """ + viewerCanLabel: Boolean! + """ Can user react to this subject """ @@ -18599,6 +18604,11 @@ type Issue implements Assignable & Closable & Comment & Deletable & Labelable & """ viewerCanDelete: Boolean! + """ + Indicates if the viewer can edit labels for this object. + """ + viewerCanLabel: Boolean! + """ Can user react to this subject """ @@ -19833,6 +19843,11 @@ interface Labelable { """ orderBy: LabelOrder = {field: CREATED_AT, direction: ASC} ): LabelConnection + + """ + Indicates if the viewer can edit labels for this object. + """ + viewerCanLabel: Boolean! } """ @@ -21882,6 +21897,44 @@ enum MergeQueueEntryState { UNMERGEABLE } +""" +When set to ALLGREEN, the merge commit created by merge queue for each PR in the +group must pass all required checks to merge. When set to HEADGREEN, only the +commit at the head of the merge group, i.e. the commit containing changes from +all of the PRs in the group, must pass its required checks to merge. +""" +enum MergeQueueGroupingStrategy { + """ + The merge commit created by merge queue for each PR in the group must pass all required checks to merge + """ + ALLGREEN + + """ + Only the commit at the head of the merge group must pass its required checks to merge. + """ + HEADGREEN +} + +""" +Method to use when merging changes from queued pull requests. +""" +enum MergeQueueMergeMethod { + """ + Merge commit + """ + MERGE + + """ + Rebase and merge + """ + REBASE + + """ + Squash and merge + """ + SQUASH +} + """ The possible merging strategies for a merge queue. """ @@ -21897,6 +21950,100 @@ enum MergeQueueMergingStrategy { HEADGREEN } +""" +Merges must be performed via a merge queue. +""" +type MergeQueueParameters { + """ + Maximum time for a required status check to report a conclusion. After this + much time has elapsed, checks that have not reported a conclusion will be + assumed to have failed + """ + checkResponseTimeoutMinutes: Int! + + """ + When set to ALLGREEN, the merge commit created by merge queue for each PR in + the group must pass all required checks to merge. When set to HEADGREEN, only + the commit at the head of the merge group, i.e. the commit containing changes + from all of the PRs in the group, must pass its required checks to merge. + """ + groupingStrategy: MergeQueueGroupingStrategy! + + """ + Limit the number of queued pull requests requesting checks and workflow runs at the same time. + """ + maxEntriesToBuild: Int! + + """ + The maximum number of PRs that will be merged together in a group. + """ + maxEntriesToMerge: Int! + + """ + Method to use when merging changes from queued pull requests. + """ + mergeMethod: MergeQueueMergeMethod! + + """ + The minimum number of PRs that will be merged together in a group. + """ + minEntriesToMerge: Int! + + """ + The time merge queue should wait after the first PR is added to the queue for + the minimum group size to be met. After this time has elapsed, the minimum + group size will be ignored and a smaller group will be merged. + """ + minEntriesToMergeWaitMinutes: Int! +} + +""" +Merges must be performed via a merge queue. +""" +input MergeQueueParametersInput { + """ + Maximum time for a required status check to report a conclusion. After this + much time has elapsed, checks that have not reported a conclusion will be + assumed to have failed + """ + checkResponseTimeoutMinutes: Int! + + """ + When set to ALLGREEN, the merge commit created by merge queue for each PR in + the group must pass all required checks to merge. When set to HEADGREEN, only + the commit at the head of the merge group, i.e. the commit containing changes + from all of the PRs in the group, must pass its required checks to merge. + """ + groupingStrategy: MergeQueueGroupingStrategy! + + """ + Limit the number of queued pull requests requesting checks and workflow runs at the same time. + """ + maxEntriesToBuild: Int! + + """ + The maximum number of PRs that will be merged together in a group. + """ + maxEntriesToMerge: Int! + + """ + Method to use when merging changes from queued pull requests. + """ + mergeMethod: MergeQueueMergeMethod! + + """ + The minimum number of PRs that will be merged together in a group. + """ + minEntriesToMerge: Int! + + """ + The time merge queue should wait after the first PR is added to the queue for + the minimum group size to be met. After this time has elapsed, the minimum + group size will be ignored and a smaller group will be merged. + """ + minEntriesToMergeWaitMinutes: Int! +} + """ Detailed status information about a pull request merge. """ @@ -37197,6 +37344,11 @@ type PullRequest implements Assignable & Closable & Comment & Labelable & Lockab """ viewerCanEnableAutoMerge: Boolean! + """ + Indicates if the viewer can edit labels for this object. + """ + viewerCanLabel: Boolean! + """ Indicates whether the viewer can bypass branch protections and merge the pull request immediately """ @@ -47570,13 +47722,13 @@ enum RepositoryRuleType { """ Prevent commits that include files with specified file extensions from being - pushed to the commit graph. NOTE: Thie rule is in beta and subject to change + pushed to the commit graph. NOTE: This rule is in beta and subject to change """ FILE_EXTENSION_RESTRICTION """ Prevent commits that include changes in specified file paths from being pushed - to the commit graph. NOTE: Thie rule is in beta and subject to change + to the commit graph. NOTE: This rule is in beta and subject to change """ FILE_PATH_RESTRICTION @@ -47587,14 +47739,14 @@ enum RepositoryRuleType { """ Prevent commits that include file paths that exceed a specified character - limit from being pushed to the commit graph. NOTE: Thie rule is in beta and + limit from being pushed to the commit graph. NOTE: This rule is in beta and subject to change """ MAX_FILE_PATH_LENGTH """ Prevent commits that exceed a specified file size limit from being pushed to - the commit. NOTE: Thie rule is in beta and subject to change + the commit. NOTE: This rule is in beta and subject to change """ MAX_FILE_SIZE @@ -49309,6 +49461,7 @@ union RuleParameters = | FilePathRestrictionParameters | MaxFilePathLengthParameters | MaxFileSizeParameters + | MergeQueueParameters | PullRequestParameters | RequiredDeploymentsParameters | RequiredStatusChecksParameters @@ -49365,6 +49518,11 @@ input RuleParametersInput { """ maxFileSize: MaxFileSizeParametersInput + """ + Parameters used for the `merge_queue` rule type + """ + mergeQueue: MergeQueueParametersInput + """ Parameters used for the `pull_request` rule type """ diff --git a/src/graphql/data/fpt/schema.json b/src/graphql/data/fpt/schema.json index 253c81ab51..f56b7c2071 100644 --- a/src/graphql/data/fpt/schema.json +++ b/src/graphql/data/fpt/schema.json @@ -19646,6 +19646,14 @@ "kind": "scalars", "href": "/graphql/reference/scalars#boolean" }, + { + "name": "viewerCanLabel", + "description": "

    Indicates if the viewer can edit labels for this object.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "viewerCanReact", "description": "

    Can user react to this subject.

    ", @@ -29137,6 +29145,14 @@ "kind": "scalars", "href": "/graphql/reference/scalars#boolean" }, + { + "name": "viewerCanLabel", + "description": "

    Indicates if the viewer can edit labels for this object.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "viewerCanReact", "description": "

    Can user react to this subject.

    ", @@ -33010,6 +33026,71 @@ } ] }, + { + "name": "MergeQueueParameters", + "kind": "objects", + "id": "mergequeueparameters", + "href": "/graphql/reference/objects#mergequeueparameters", + "description": "

    Merges must be performed via a merge queue.

    ", + "fields": [ + { + "name": "checkResponseTimeoutMinutes", + "description": "

    Maximum time for a required status check to report a conclusion. After this\nmuch time has elapsed, checks that have not reported a conclusion will be\nassumed to have failed.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "groupingStrategy", + "description": "

    When set to ALLGREEN, the merge commit created by merge queue for each PR in\nthe group must pass all required checks to merge. When set to HEADGREEN, only\nthe commit at the head of the merge group, i.e. the commit containing changes\nfrom all of the PRs in the group, must pass its required checks to merge.

    ", + "type": "MergeQueueGroupingStrategy!", + "id": "mergequeuegroupingstrategy", + "kind": "enums", + "href": "/graphql/reference/enums#mergequeuegroupingstrategy" + }, + { + "name": "maxEntriesToBuild", + "description": "

    Limit the number of queued pull requests requesting checks and workflow runs at the same time.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "maxEntriesToMerge", + "description": "

    The maximum number of PRs that will be merged together in a group.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "mergeMethod", + "description": "

    Method to use when merging changes from queued pull requests.

    ", + "type": "MergeQueueMergeMethod!", + "id": "mergequeuemergemethod", + "kind": "enums", + "href": "/graphql/reference/enums#mergequeuemergemethod" + }, + { + "name": "minEntriesToMerge", + "description": "

    The minimum number of PRs that will be merged together in a group.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "minEntriesToMergeWaitMinutes", + "description": "

    The time merge queue should wait after the first PR is added to the queue for\nthe minimum group size to be met. After this time has elapsed, the minimum\ngroup size will be ignored and a smaller group will be merged.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + } + ] + }, { "name": "MergedEvent", "kind": "objects", @@ -51374,6 +51455,14 @@ "kind": "scalars", "href": "/graphql/reference/scalars#boolean" }, + { + "name": "viewerCanLabel", + "description": "

    Indicates if the viewer can edit labels for this object.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "viewerCanMergeAsAdmin", "description": "

    Indicates whether the viewer can bypass branch protections and merge the pull request immediately.

    ", @@ -79865,6 +79954,14 @@ } } ] + }, + { + "name": "viewerCanLabel", + "description": "

    Indicates if the viewer can edit labels for this object.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" } ] }, @@ -84656,6 +84753,44 @@ } ] }, + { + "name": "MergeQueueGroupingStrategy", + "kind": "enums", + "id": "mergequeuegroupingstrategy", + "href": "/graphql/reference/enums#mergequeuegroupingstrategy", + "description": "

    When set to ALLGREEN, the merge commit created by merge queue for each PR in the\ngroup must pass all required checks to merge. When set to HEADGREEN, only the\ncommit at the head of the merge group, i.e. the commit containing changes from\nall of the PRs in the group, must pass its required checks to merge.

    ", + "values": [ + { + "name": "ALLGREEN", + "description": "

    The merge commit created by merge queue for each PR in the group must pass all required checks to merge.

    " + }, + { + "name": "HEADGREEN", + "description": "

    Only the commit at the head of the merge group must pass its required checks to merge.

    " + } + ] + }, + { + "name": "MergeQueueMergeMethod", + "kind": "enums", + "id": "mergequeuemergemethod", + "href": "/graphql/reference/enums#mergequeuemergemethod", + "description": "

    Method to use when merging changes from queued pull requests.

    ", + "values": [ + { + "name": "MERGE", + "description": "

    Merge commit.

    " + }, + { + "name": "REBASE", + "description": "

    Rebase and merge.

    " + }, + { + "name": "SQUASH", + "description": "

    Squash and merge.

    " + } + ] + }, { "name": "MergeQueueMergingStrategy", "kind": "enums", @@ -87170,11 +87305,11 @@ }, { "name": "FILE_EXTENSION_RESTRICTION", - "description": "

    Prevent commits that include files with specified file extensions from being\npushed to the commit graph. NOTE: Thie rule is in beta and subject to change.

    " + "description": "

    Prevent commits that include files with specified file extensions from being\npushed to the commit graph. NOTE: This rule is in beta and subject to change.

    " }, { "name": "FILE_PATH_RESTRICTION", - "description": "

    Prevent commits that include changes in specified file paths from being pushed\nto the commit graph. NOTE: Thie rule is in beta and subject to change.

    " + "description": "

    Prevent commits that include changes in specified file paths from being pushed\nto the commit graph. NOTE: This rule is in beta and subject to change.

    " }, { "name": "LOCK_BRANCH", @@ -87182,11 +87317,11 @@ }, { "name": "MAX_FILE_PATH_LENGTH", - "description": "

    Prevent commits that include file paths that exceed a specified character\nlimit from being pushed to the commit graph. NOTE: Thie rule is in beta and\nsubject to change.

    " + "description": "

    Prevent commits that include file paths that exceed a specified character\nlimit from being pushed to the commit graph. NOTE: This rule is in beta and\nsubject to change.

    " }, { "name": "MAX_FILE_SIZE", - "description": "

    Prevent commits that exceed a specified file size limit from being pushed to\nthe commit. NOTE: Thie rule is in beta and subject to change.

    " + "description": "

    Prevent commits that exceed a specified file size limit from being pushed to\nthe commit. NOTE: This rule is in beta and subject to change.

    " }, { "name": "MAX_REF_UPDATES", @@ -91228,6 +91363,11 @@ "id": "maxfilesizeparameters", "href": "/graphql/reference/objects#maxfilesizeparameters" }, + { + "name": "MergeQueueParameters", + "id": "mergequeueparameters", + "href": "/graphql/reference/objects#mergequeueparameters" + }, { "name": "PullRequestParameters", "id": "pullrequestparameters", @@ -98336,6 +98476,71 @@ } ] }, + { + "name": "MergeQueueParametersInput", + "kind": "inputObjects", + "id": "mergequeueparametersinput", + "href": "/graphql/reference/input-objects#mergequeueparametersinput", + "description": "

    Merges must be performed via a merge queue.

    ", + "inputFields": [ + { + "name": "checkResponseTimeoutMinutes", + "description": "

    Maximum time for a required status check to report a conclusion. After this\nmuch time has elapsed, checks that have not reported a conclusion will be\nassumed to have failed.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "groupingStrategy", + "description": "

    When set to ALLGREEN, the merge commit created by merge queue for each PR in\nthe group must pass all required checks to merge. When set to HEADGREEN, only\nthe commit at the head of the merge group, i.e. the commit containing changes\nfrom all of the PRs in the group, must pass its required checks to merge.

    ", + "type": "MergeQueueGroupingStrategy!", + "id": "mergequeuegroupingstrategy", + "kind": "enums", + "href": "/graphql/reference/enums#mergequeuegroupingstrategy" + }, + { + "name": "maxEntriesToBuild", + "description": "

    Limit the number of queued pull requests requesting checks and workflow runs at the same time.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "maxEntriesToMerge", + "description": "

    The maximum number of PRs that will be merged together in a group.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "mergeMethod", + "description": "

    Method to use when merging changes from queued pull requests.

    ", + "type": "MergeQueueMergeMethod!", + "id": "mergequeuemergemethod", + "kind": "enums", + "href": "/graphql/reference/enums#mergequeuemergemethod" + }, + { + "name": "minEntriesToMerge", + "description": "

    The minimum number of PRs that will be merged together in a group.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "minEntriesToMergeWaitMinutes", + "description": "

    The time merge queue should wait after the first PR is added to the queue for\nthe minimum group size to be met. After this time has elapsed, the minimum\ngroup size will be ignored and a smaller group will be merged.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + } + ] + }, { "name": "MilestoneOrder", "kind": "inputObjects", @@ -100621,6 +100826,14 @@ "kind": "input-objects", "href": "/graphql/reference/input-objects#maxfilesizeparametersinput" }, + { + "name": "mergeQueue", + "description": "

    Parameters used for the merge_queue rule type.

    ", + "type": "MergeQueueParametersInput", + "id": "mergequeueparametersinput", + "kind": "input-objects", + "href": "/graphql/reference/input-objects#mergequeueparametersinput" + }, { "name": "pullRequest", "description": "

    Parameters used for the pull_request rule type.

    ", diff --git a/src/graphql/data/ghec/schema.docs.graphql b/src/graphql/data/ghec/schema.docs.graphql index d80490d135..7cd9e601d4 100644 --- a/src/graphql/data/ghec/schema.docs.graphql +++ b/src/graphql/data/ghec/schema.docs.graphql @@ -11644,6 +11644,11 @@ type Discussion implements Closable & Comment & Deletable & Labelable & Lockable """ viewerCanDelete: Boolean! + """ + Indicates if the viewer can edit labels for this object. + """ + viewerCanLabel: Boolean! + """ Can user react to this subject """ @@ -18599,6 +18604,11 @@ type Issue implements Assignable & Closable & Comment & Deletable & Labelable & """ viewerCanDelete: Boolean! + """ + Indicates if the viewer can edit labels for this object. + """ + viewerCanLabel: Boolean! + """ Can user react to this subject """ @@ -19833,6 +19843,11 @@ interface Labelable { """ orderBy: LabelOrder = {field: CREATED_AT, direction: ASC} ): LabelConnection + + """ + Indicates if the viewer can edit labels for this object. + """ + viewerCanLabel: Boolean! } """ @@ -21882,6 +21897,44 @@ enum MergeQueueEntryState { UNMERGEABLE } +""" +When set to ALLGREEN, the merge commit created by merge queue for each PR in the +group must pass all required checks to merge. When set to HEADGREEN, only the +commit at the head of the merge group, i.e. the commit containing changes from +all of the PRs in the group, must pass its required checks to merge. +""" +enum MergeQueueGroupingStrategy { + """ + The merge commit created by merge queue for each PR in the group must pass all required checks to merge + """ + ALLGREEN + + """ + Only the commit at the head of the merge group must pass its required checks to merge. + """ + HEADGREEN +} + +""" +Method to use when merging changes from queued pull requests. +""" +enum MergeQueueMergeMethod { + """ + Merge commit + """ + MERGE + + """ + Rebase and merge + """ + REBASE + + """ + Squash and merge + """ + SQUASH +} + """ The possible merging strategies for a merge queue. """ @@ -21897,6 +21950,100 @@ enum MergeQueueMergingStrategy { HEADGREEN } +""" +Merges must be performed via a merge queue. +""" +type MergeQueueParameters { + """ + Maximum time for a required status check to report a conclusion. After this + much time has elapsed, checks that have not reported a conclusion will be + assumed to have failed + """ + checkResponseTimeoutMinutes: Int! + + """ + When set to ALLGREEN, the merge commit created by merge queue for each PR in + the group must pass all required checks to merge. When set to HEADGREEN, only + the commit at the head of the merge group, i.e. the commit containing changes + from all of the PRs in the group, must pass its required checks to merge. + """ + groupingStrategy: MergeQueueGroupingStrategy! + + """ + Limit the number of queued pull requests requesting checks and workflow runs at the same time. + """ + maxEntriesToBuild: Int! + + """ + The maximum number of PRs that will be merged together in a group. + """ + maxEntriesToMerge: Int! + + """ + Method to use when merging changes from queued pull requests. + """ + mergeMethod: MergeQueueMergeMethod! + + """ + The minimum number of PRs that will be merged together in a group. + """ + minEntriesToMerge: Int! + + """ + The time merge queue should wait after the first PR is added to the queue for + the minimum group size to be met. After this time has elapsed, the minimum + group size will be ignored and a smaller group will be merged. + """ + minEntriesToMergeWaitMinutes: Int! +} + +""" +Merges must be performed via a merge queue. +""" +input MergeQueueParametersInput { + """ + Maximum time for a required status check to report a conclusion. After this + much time has elapsed, checks that have not reported a conclusion will be + assumed to have failed + """ + checkResponseTimeoutMinutes: Int! + + """ + When set to ALLGREEN, the merge commit created by merge queue for each PR in + the group must pass all required checks to merge. When set to HEADGREEN, only + the commit at the head of the merge group, i.e. the commit containing changes + from all of the PRs in the group, must pass its required checks to merge. + """ + groupingStrategy: MergeQueueGroupingStrategy! + + """ + Limit the number of queued pull requests requesting checks and workflow runs at the same time. + """ + maxEntriesToBuild: Int! + + """ + The maximum number of PRs that will be merged together in a group. + """ + maxEntriesToMerge: Int! + + """ + Method to use when merging changes from queued pull requests. + """ + mergeMethod: MergeQueueMergeMethod! + + """ + The minimum number of PRs that will be merged together in a group. + """ + minEntriesToMerge: Int! + + """ + The time merge queue should wait after the first PR is added to the queue for + the minimum group size to be met. After this time has elapsed, the minimum + group size will be ignored and a smaller group will be merged. + """ + minEntriesToMergeWaitMinutes: Int! +} + """ Detailed status information about a pull request merge. """ @@ -37197,6 +37344,11 @@ type PullRequest implements Assignable & Closable & Comment & Labelable & Lockab """ viewerCanEnableAutoMerge: Boolean! + """ + Indicates if the viewer can edit labels for this object. + """ + viewerCanLabel: Boolean! + """ Indicates whether the viewer can bypass branch protections and merge the pull request immediately """ @@ -47570,13 +47722,13 @@ enum RepositoryRuleType { """ Prevent commits that include files with specified file extensions from being - pushed to the commit graph. NOTE: Thie rule is in beta and subject to change + pushed to the commit graph. NOTE: This rule is in beta and subject to change """ FILE_EXTENSION_RESTRICTION """ Prevent commits that include changes in specified file paths from being pushed - to the commit graph. NOTE: Thie rule is in beta and subject to change + to the commit graph. NOTE: This rule is in beta and subject to change """ FILE_PATH_RESTRICTION @@ -47587,14 +47739,14 @@ enum RepositoryRuleType { """ Prevent commits that include file paths that exceed a specified character - limit from being pushed to the commit graph. NOTE: Thie rule is in beta and + limit from being pushed to the commit graph. NOTE: This rule is in beta and subject to change """ MAX_FILE_PATH_LENGTH """ Prevent commits that exceed a specified file size limit from being pushed to - the commit. NOTE: Thie rule is in beta and subject to change + the commit. NOTE: This rule is in beta and subject to change """ MAX_FILE_SIZE @@ -49309,6 +49461,7 @@ union RuleParameters = | FilePathRestrictionParameters | MaxFilePathLengthParameters | MaxFileSizeParameters + | MergeQueueParameters | PullRequestParameters | RequiredDeploymentsParameters | RequiredStatusChecksParameters @@ -49365,6 +49518,11 @@ input RuleParametersInput { """ maxFileSize: MaxFileSizeParametersInput + """ + Parameters used for the `merge_queue` rule type + """ + mergeQueue: MergeQueueParametersInput + """ Parameters used for the `pull_request` rule type """ diff --git a/src/graphql/data/ghec/schema.json b/src/graphql/data/ghec/schema.json index 253c81ab51..f56b7c2071 100644 --- a/src/graphql/data/ghec/schema.json +++ b/src/graphql/data/ghec/schema.json @@ -19646,6 +19646,14 @@ "kind": "scalars", "href": "/graphql/reference/scalars#boolean" }, + { + "name": "viewerCanLabel", + "description": "

    Indicates if the viewer can edit labels for this object.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "viewerCanReact", "description": "

    Can user react to this subject.

    ", @@ -29137,6 +29145,14 @@ "kind": "scalars", "href": "/graphql/reference/scalars#boolean" }, + { + "name": "viewerCanLabel", + "description": "

    Indicates if the viewer can edit labels for this object.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "viewerCanReact", "description": "

    Can user react to this subject.

    ", @@ -33010,6 +33026,71 @@ } ] }, + { + "name": "MergeQueueParameters", + "kind": "objects", + "id": "mergequeueparameters", + "href": "/graphql/reference/objects#mergequeueparameters", + "description": "

    Merges must be performed via a merge queue.

    ", + "fields": [ + { + "name": "checkResponseTimeoutMinutes", + "description": "

    Maximum time for a required status check to report a conclusion. After this\nmuch time has elapsed, checks that have not reported a conclusion will be\nassumed to have failed.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "groupingStrategy", + "description": "

    When set to ALLGREEN, the merge commit created by merge queue for each PR in\nthe group must pass all required checks to merge. When set to HEADGREEN, only\nthe commit at the head of the merge group, i.e. the commit containing changes\nfrom all of the PRs in the group, must pass its required checks to merge.

    ", + "type": "MergeQueueGroupingStrategy!", + "id": "mergequeuegroupingstrategy", + "kind": "enums", + "href": "/graphql/reference/enums#mergequeuegroupingstrategy" + }, + { + "name": "maxEntriesToBuild", + "description": "

    Limit the number of queued pull requests requesting checks and workflow runs at the same time.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "maxEntriesToMerge", + "description": "

    The maximum number of PRs that will be merged together in a group.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "mergeMethod", + "description": "

    Method to use when merging changes from queued pull requests.

    ", + "type": "MergeQueueMergeMethod!", + "id": "mergequeuemergemethod", + "kind": "enums", + "href": "/graphql/reference/enums#mergequeuemergemethod" + }, + { + "name": "minEntriesToMerge", + "description": "

    The minimum number of PRs that will be merged together in a group.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "minEntriesToMergeWaitMinutes", + "description": "

    The time merge queue should wait after the first PR is added to the queue for\nthe minimum group size to be met. After this time has elapsed, the minimum\ngroup size will be ignored and a smaller group will be merged.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + } + ] + }, { "name": "MergedEvent", "kind": "objects", @@ -51374,6 +51455,14 @@ "kind": "scalars", "href": "/graphql/reference/scalars#boolean" }, + { + "name": "viewerCanLabel", + "description": "

    Indicates if the viewer can edit labels for this object.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "viewerCanMergeAsAdmin", "description": "

    Indicates whether the viewer can bypass branch protections and merge the pull request immediately.

    ", @@ -79865,6 +79954,14 @@ } } ] + }, + { + "name": "viewerCanLabel", + "description": "

    Indicates if the viewer can edit labels for this object.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" } ] }, @@ -84656,6 +84753,44 @@ } ] }, + { + "name": "MergeQueueGroupingStrategy", + "kind": "enums", + "id": "mergequeuegroupingstrategy", + "href": "/graphql/reference/enums#mergequeuegroupingstrategy", + "description": "

    When set to ALLGREEN, the merge commit created by merge queue for each PR in the\ngroup must pass all required checks to merge. When set to HEADGREEN, only the\ncommit at the head of the merge group, i.e. the commit containing changes from\nall of the PRs in the group, must pass its required checks to merge.

    ", + "values": [ + { + "name": "ALLGREEN", + "description": "

    The merge commit created by merge queue for each PR in the group must pass all required checks to merge.

    " + }, + { + "name": "HEADGREEN", + "description": "

    Only the commit at the head of the merge group must pass its required checks to merge.

    " + } + ] + }, + { + "name": "MergeQueueMergeMethod", + "kind": "enums", + "id": "mergequeuemergemethod", + "href": "/graphql/reference/enums#mergequeuemergemethod", + "description": "

    Method to use when merging changes from queued pull requests.

    ", + "values": [ + { + "name": "MERGE", + "description": "

    Merge commit.

    " + }, + { + "name": "REBASE", + "description": "

    Rebase and merge.

    " + }, + { + "name": "SQUASH", + "description": "

    Squash and merge.

    " + } + ] + }, { "name": "MergeQueueMergingStrategy", "kind": "enums", @@ -87170,11 +87305,11 @@ }, { "name": "FILE_EXTENSION_RESTRICTION", - "description": "

    Prevent commits that include files with specified file extensions from being\npushed to the commit graph. NOTE: Thie rule is in beta and subject to change.

    " + "description": "

    Prevent commits that include files with specified file extensions from being\npushed to the commit graph. NOTE: This rule is in beta and subject to change.

    " }, { "name": "FILE_PATH_RESTRICTION", - "description": "

    Prevent commits that include changes in specified file paths from being pushed\nto the commit graph. NOTE: Thie rule is in beta and subject to change.

    " + "description": "

    Prevent commits that include changes in specified file paths from being pushed\nto the commit graph. NOTE: This rule is in beta and subject to change.

    " }, { "name": "LOCK_BRANCH", @@ -87182,11 +87317,11 @@ }, { "name": "MAX_FILE_PATH_LENGTH", - "description": "

    Prevent commits that include file paths that exceed a specified character\nlimit from being pushed to the commit graph. NOTE: Thie rule is in beta and\nsubject to change.

    " + "description": "

    Prevent commits that include file paths that exceed a specified character\nlimit from being pushed to the commit graph. NOTE: This rule is in beta and\nsubject to change.

    " }, { "name": "MAX_FILE_SIZE", - "description": "

    Prevent commits that exceed a specified file size limit from being pushed to\nthe commit. NOTE: Thie rule is in beta and subject to change.

    " + "description": "

    Prevent commits that exceed a specified file size limit from being pushed to\nthe commit. NOTE: This rule is in beta and subject to change.

    " }, { "name": "MAX_REF_UPDATES", @@ -91228,6 +91363,11 @@ "id": "maxfilesizeparameters", "href": "/graphql/reference/objects#maxfilesizeparameters" }, + { + "name": "MergeQueueParameters", + "id": "mergequeueparameters", + "href": "/graphql/reference/objects#mergequeueparameters" + }, { "name": "PullRequestParameters", "id": "pullrequestparameters", @@ -98336,6 +98476,71 @@ } ] }, + { + "name": "MergeQueueParametersInput", + "kind": "inputObjects", + "id": "mergequeueparametersinput", + "href": "/graphql/reference/input-objects#mergequeueparametersinput", + "description": "

    Merges must be performed via a merge queue.

    ", + "inputFields": [ + { + "name": "checkResponseTimeoutMinutes", + "description": "

    Maximum time for a required status check to report a conclusion. After this\nmuch time has elapsed, checks that have not reported a conclusion will be\nassumed to have failed.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "groupingStrategy", + "description": "

    When set to ALLGREEN, the merge commit created by merge queue for each PR in\nthe group must pass all required checks to merge. When set to HEADGREEN, only\nthe commit at the head of the merge group, i.e. the commit containing changes\nfrom all of the PRs in the group, must pass its required checks to merge.

    ", + "type": "MergeQueueGroupingStrategy!", + "id": "mergequeuegroupingstrategy", + "kind": "enums", + "href": "/graphql/reference/enums#mergequeuegroupingstrategy" + }, + { + "name": "maxEntriesToBuild", + "description": "

    Limit the number of queued pull requests requesting checks and workflow runs at the same time.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "maxEntriesToMerge", + "description": "

    The maximum number of PRs that will be merged together in a group.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "mergeMethod", + "description": "

    Method to use when merging changes from queued pull requests.

    ", + "type": "MergeQueueMergeMethod!", + "id": "mergequeuemergemethod", + "kind": "enums", + "href": "/graphql/reference/enums#mergequeuemergemethod" + }, + { + "name": "minEntriesToMerge", + "description": "

    The minimum number of PRs that will be merged together in a group.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + }, + { + "name": "minEntriesToMergeWaitMinutes", + "description": "

    The time merge queue should wait after the first PR is added to the queue for\nthe minimum group size to be met. After this time has elapsed, the minimum\ngroup size will be ignored and a smaller group will be merged.

    ", + "type": "Int!", + "id": "int", + "kind": "scalars", + "href": "/graphql/reference/scalars#int" + } + ] + }, { "name": "MilestoneOrder", "kind": "inputObjects", @@ -100621,6 +100826,14 @@ "kind": "input-objects", "href": "/graphql/reference/input-objects#maxfilesizeparametersinput" }, + { + "name": "mergeQueue", + "description": "

    Parameters used for the merge_queue rule type.

    ", + "type": "MergeQueueParametersInput", + "id": "mergequeueparametersinput", + "kind": "input-objects", + "href": "/graphql/reference/input-objects#mergequeueparametersinput" + }, { "name": "pullRequest", "description": "

    Parameters used for the pull_request rule type.

    ", From e630fbd60a27a7d3476a4f8a0585d5c749ac2fac Mon Sep 17 00:00:00 2001 From: Jules <19994093+jules-p@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:51:39 +0200 Subject: [PATCH 12/58] Copilot pull request auto complete (#51519) Co-authored-by: Jules Porter Co-authored-by: Sam Browning <106113886+sabrowning1@users.noreply.github.com> Co-authored-by: skedwards88 Co-authored-by: hubwriter Co-authored-by: Ben Ahmady <32935794+subatoi@users.noreply.github.com> Co-authored-by: Craig Peters --- .../github-copilot-features.md | 4 ++ ...features-for-copilot-in-your-enterprise.md | 3 + .../index.md | 1 + ...e-use-of-github-copilot-text-completion.md | 59 +++++++++++++++++++ content/copilot/using-github-copilot/index.md | 1 + .../using-copilot-text-completion.md | 38 ++++++++++++ .../copilot/copilot-enterprise-features.md | 4 ++ data/variables/product.yml | 1 + 8 files changed, 111 insertions(+) create mode 100644 content/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-text-completion.md create mode 100644 content/copilot/using-github-copilot/using-copilot-text-completion.md diff --git a/content/copilot/about-github-copilot/github-copilot-features.md b/content/copilot/about-github-copilot/github-copilot-features.md index 98ad3832f6..4dad153ac5 100644 --- a/content/copilot/about-github-copilot/github-copilot-features.md +++ b/content/copilot/about-github-copilot/github-copilot-features.md @@ -30,6 +30,10 @@ A chat-like interface in the terminal, where you can ask questions about the com AI-generated summaries of the changes that were made in a pull request, which files they impact, and what a reviewer should focus on when they conduct their review. +### {% data variables.product.prodname_copilot_autocomplete_pr %} (beta) _({% data variables.product.prodname_copilot_enterprise_short %} only)_ + +AI-generated text completion to help you write pull request descriptions quickly and accurately. + ### {% data variables.product.prodname_copilot_short %} knowledge bases _({% data variables.product.prodname_copilot_enterprise_short %} only)_ Create and manage collections of documentation to use as context for chatting with {% data variables.product.prodname_copilot_short %}. When you ask a question in {% data variables.product.prodname_copilot_chat_short %} in {% data variables.product.prodname_dotcom_the_website %} or in {% data variables.product.prodname_vscode_shortname %}, you can specify a knowledge base as the context for your question. diff --git a/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md b/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md index df1dad1478..6e9a7bf091 100644 --- a/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md +++ b/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md @@ -43,6 +43,9 @@ With a {% data variables.product.prodname_copilot_enterprise_short %} license, y If you enable "{% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_dotcom_the_website %}", you can also configure additional features: * **Opt in to user feedback collection** - If enabled, members of your enterprise can provide feedback after {% data variables.product.prodname_copilot_short %} generates a pull request summary, and the summary will be sent to {% data variables.product.prodname_dotcom %} for context. If disabled, members of your enterprise can still provide feedback after each {% data variables.product.prodname_copilot_chat_short %} response, and via the "Give feedback" link in conversations. +* **Previews of {% data variables.product.prodname_copilot_short %} features** - If enabled, members of your enterprise can test new {% data variables.product.prodname_copilot_short %} features that are not yet generally available. Be aware that previews of features may have flaws, and the features may be changed or discontinued at any time. Current previews of {% data variables.product.prodname_copilot_short %} features: + + * {% data variables.product.prodname_copilot_autocomplete_pr %}. For more information, see "[Using Copilot text completion](/copilot/using-github-copilot/using-copilot-text-completion)." ### {% data variables.product.prodname_copilot_cli %} diff --git a/content/copilot/responsible-use-of-github-copilot-features/index.md b/content/copilot/responsible-use-of-github-copilot-features/index.md index 833e241074..3b10423b02 100644 --- a/content/copilot/responsible-use-of-github-copilot-features/index.md +++ b/content/copilot/responsible-use-of-github-copilot-features/index.md @@ -12,4 +12,5 @@ children: - /responsible-use-of-github-copilot-chat-in-github-mobile - /responsible-use-of-github-copilot-in-the-cli - /responsible-use-of-github-copilot-pull-request-summaries + - /responsible-use-of-github-copilot-text-completion --- diff --git a/content/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-text-completion.md b/content/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-text-completion.md new file mode 100644 index 0000000000..0d7799d151 --- /dev/null +++ b/content/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-text-completion.md @@ -0,0 +1,59 @@ +--- +title: Responsible use of GitHub Copilot text completion +shortTitle: Copilot text completion +intro: 'Learn how to use {% data variables.product.prodname_copilot_autocomplete_pr %} responsibly by understanding its purposes, capabilities, and limitations.' +versions: + feature: copilot +permissions: 'Members of an enterprise with a subscription to {% data variables.product.prodname_copilot_enterprise %}' +topics: + - Copilot +type: rai +--- + +{% ifversion fpt %} + +{% data reusables.rai.copilot.enterprise-fpt-link %} + +{% endif %} + +## About {% data variables.product.prodname_copilot_autocomplete_pr %} + +{% data variables.product.prodname_copilot_autocomplete_pr %} is an AI-powered feature that allows users to more easily write pull request descriptions by suggesting text as you type. + +When you pause briefly while typing a summary, {% data variables.product.prodname_copilot_short %} scans through the pull request and provides suggested prose, attempting to finish your thought. + +The only supported language for {% data variables.product.prodname_copilot_autocomplete_pr %} is English. + +{% data variables.product.prodname_copilot_autocomplete_pr %} uses a simple-prompt flow leveraging the {% data variables.product.prodname_copilot_short %} API, utilizing the generic large language model, with no additional trained models. + +When you pause during typing the pull request description, a call is generated to the {% data variables.product.prodname_copilot_short %} API to generate suggested text to insert into the description at the current cursor position. The text complete request includes information from the pull request, including the pull request title, any text already in the description, the pull request commit titles, partial raw diffs, and recently viewed pull request and issue titles in a prompt that requests {% data variables.product.prodname_copilot_short %} to generate a suggestion for the next words you are likely to type. The response is then displayed as grayed out text following the cursor. You can accept the suggested text by pressing the tab key, or reject the suggestion by simply continuing to type, or moving the cursor focus out of the description field. + +## Use case for pull request text complete + +The goal of {% data variables.product.prodname_copilot_autocomplete_pr %} is to help the pull request author to quickly provide context to the human reviewers of the pull request. When reviewing a pull request it is valuable to understand context such as why changes are being requested and how the pull request makes those changes. It may help increase developer productivity by reducing the time taken to open a pull request. + +## Improving the performance of pull request text complete + +The feature is intended to supplement rather than replace a human's work adding context to pull requests. The quality of the text complete suggestions will depend on the quality of the title, the commit messages, and the text already added to the description. We encourage you to continue adding useful context and let {% data variables.product.prodname_copilot_short %} suggest as you go. It remains your responsibility to review and assess the accuracy of information in the pull requests you create. + +## Limitations of pull request text complete + +Currently, our team is aware that there are limitations to this feature. Many of them are expected in leveraging our {% data variables.product.prodname_copilot_short %} API; however, there are a few that are specific to {% data variables.product.prodname_copilot_autocomplete_pr %} which pertain to limited scope for very large pull requests, and potentially inaccurate responses. We also note that users should expect terms used in their pull request to appear in the AI-generated suggestions. + +This feature has been subject to RAI Red Teaming and we will continue to monitor the efficacy and safety of the feature over time. For more information, see "[Microsoft AI Red Team building future of safer AI](https://www.microsoft.com/en-us/security/blog/2023/08/07/microsoft-ai-red-team-building-future-of-safer-ai/)" on the Microsoft security blog. + +### Limited scope + +It is possible for very large pull requests, that some of the pull request content that the {% data variables.product.prodname_copilot_short %} API relies upon for automatically suggesting text will not fit into the API call, and so for very large pull requests, some of the suggestions you might expect may not occur. + +### Inaccurate responses + +The more inputs and context that {% data variables.product.prodname_copilot_short %} has to work from, the better the text complete suggestions will be. However, since the feature is quite new, it will take time to reach exact precision with the text complete suggestions that are generated. In the meantime, there may be cases where a generated text complete is less accurate and requires the user to make modifications before saving and publishing their pull request with this description. In addition, there is a risk of "hallucination," where {% data variables.product.prodname_copilot_short %} generates statements that are inaccurate. For these reasons, reviewing is a requirement, and careful review of the output is highly recommended. + +### Replication of pull request content + +Because a text complete suggestion is drawn from changes that were made in a pull request, if harmful or offensive terms are within the content of the pull request, there is potential for the suggestion to also include those terms. + +## Further reading + +* [{% data variables.product.prodname_copilot %} Trust Center](https://resources.github.com/copilot-trust-center/) diff --git a/content/copilot/using-github-copilot/index.md b/content/copilot/using-github-copilot/index.md index 0b3c9fe3c2..8c65c9f79d 100644 --- a/content/copilot/using-github-copilot/index.md +++ b/content/copilot/using-github-copilot/index.md @@ -12,6 +12,7 @@ children: - /asking-github-copilot-questions-in-githubcom - /asking-github-copilot-questions-in-github-mobile - /creating-a-pull-request-summary-with-github-copilot + - /using-copilot-text-completion - /using-github-copilot-in-the-command-line - /prompt-engineering-for-github-copilot - /using-extensions-to-integrate-external-tools-with-copilot-chat diff --git a/content/copilot/using-github-copilot/using-copilot-text-completion.md b/content/copilot/using-github-copilot/using-copilot-text-completion.md new file mode 100644 index 0000000000..dea253b300 --- /dev/null +++ b/content/copilot/using-github-copilot/using-copilot-text-completion.md @@ -0,0 +1,38 @@ +--- +title: Using Copilot text completion +shortTitle: Text completion +intro: 'You can use {% data variables.product.prodname_copilot_autocomplete_pr %} to help you write pull request descriptions more quickly and accurately.' +versions: + feature: copilot-enterprise +permissions: 'Members of an enterprise with a subscription to [{% data variables.product.prodname_copilot_enterprise %}](/copilot/github-copilot-enterprise/overview/about-github-copilot-enterprise)' +topics: + - Copilot +--- + +>[!NOTE] +> {% data variables.product.prodname_copilot_autocomplete_pr %} is currently in beta and subject to change. To participate in the beta, an administrator of your enterprise must opt in to the use of previews of {% data variables.product.prodname_copilot_short %} features. + +## About {% data variables.product.prodname_copilot_autocomplete_pr %} + +With {% data variables.product.prodname_copilot_autocomplete_pr %}, you can use AI-generated autocompletions to help you write pull request descriptions quickly and accurately. Accurate descriptions help reviewers understand the changes you're proposing, and help you communicate the purpose of your pull request more effectively. + +When you are creating a new pull request, {% data variables.product.prodname_copilot_autocomplete_pr %} will scan through the pull request and provide suggestions as you write, based on the context of the pull request. + +## Using {% data variables.product.prodname_copilot_autocomplete_pr %} + +You can use {% data variables.product.prodname_copilot_autocomplete_pr %} in the description of a new pull request you're creating. + +1. On {% data variables.product.prodname_dotcom_the_website %}, create a pull request. +1. In the description field, start typing your description. +1. As you type, {% data variables.product.prodname_copilot_short %} will provide in-line suggestions based on the context of the pull request. +1. Review the suggestions, which will be shown in grey. + * To accept a suggestion, press `Tab`. + * To ignore a suggestion, press `Esc` or continue typing. {% data variables.product.prodname_copilot_short %} will provide new suggestions as you type, based on the additional context. +1. When you're happy with the description, click **Create pull request**. + +## Disabling or enabling {% data variables.product.prodname_copilot_autocomplete_pr %} + +You can disable or enable {% data variables.product.prodname_copilot_autocomplete_pr %} for your pull request descriptions. Your preference will be saved for future pull requests. + +1. On {% data variables.product.prodname_dotcom_the_website %}, create a pull request. +1. At the top of the description field, select {% octicon "copilot" aria-hidden="true" %} then hover over **Autocomplete (Beta)**, and click **Disabled** or **Enabled**. diff --git a/data/reusables/copilot/copilot-enterprise-features.md b/data/reusables/copilot/copilot-enterprise-features.md index 299b173c66..89203fb6c1 100644 --- a/data/reusables/copilot/copilot-enterprise-features.md +++ b/data/reusables/copilot/copilot-enterprise-features.md @@ -6,6 +6,10 @@ {% data variables.product.prodname_copilot_for_prs %} is an AI-powered feature that allows you to create a summary of the changes that were made in a pull request, which files they impact, and what a reviewer should focus on when they conduct their review. For more information, see "[AUTOTITLE](/copilot/github-copilot-enterprise/copilot-pull-request-summaries/about-copilot-pull-request-summaries)." +### {% data variables.product.prodname_copilot_autocomplete_pr %} (beta) + +{% data variables.product.prodname_copilot_autocomplete_pr %} is a feature that provides AI-generated autocompletions to help you write pull request descriptions quickly and accurately. For more information, see "[AUTOTITLE](/copilot/using-github-copilot/using-copilot-pull-request-autocomplete)." + ### {% data variables.product.prodname_copilot_short %} knowledge bases Knowledge bases are collections of Markdown documentation from one or more repositories. When you ask {% data variables.product.prodname_copilot_chat_short %} a question in {% data variables.product.prodname_dotcom_the_website %}, {% data variables.product.prodname_vscode_shortname %}, and {% data variables.product.prodname_vs %} you can specify a knowledge base as the context for your question. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/managing-copilot-knowledge-bases)." diff --git a/data/variables/product.yml b/data/variables/product.yml index 0bbd10eccb..38b91f9b78 100644 --- a/data/variables/product.yml +++ b/data/variables/product.yml @@ -276,6 +276,7 @@ prodname_copilot_for_prs: 'Copilot pull request summaries' prodname_copilot_prs_short: 'pull request summaries' prodname_copilot_customization: 'Copilot Customization' prodname_copilot_in_support: 'Copilot in GitHub Support' +prodname_copilot_autocomplete_pr: 'Copilot text completion' # Command Palette prodname_command_palette: 'GitHub Command Palette' From e74df6430e244385a4d5c0716abbad232fc63c73 Mon Sep 17 00:00:00 2001 From: Rachael Sewell Date: Wed, 24 Jul 2024 11:42:00 -0700 Subject: [PATCH 13/58] Add label used to detect when release issue is already opened (#51778) --- src/ghes-releases/lib/release-templates/release-steps-0.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ghes-releases/lib/release-templates/release-steps-0.md b/src/ghes-releases/lib/release-templates/release-steps-0.md index bbeadaf920..34a5f70cc7 100644 --- a/src/ghes-releases/lib/release-templates/release-steps-0.md +++ b/src/ghes-releases/lib/release-templates/release-steps-0.md @@ -7,6 +7,7 @@ labels: - priority-0 - skip FR board - GHES {{ release-number }} + - ghes-release-automation --- This issue tracks Docs work for the GA release of GHES {{ release-number }}. @@ -76,4 +77,4 @@ For example, the reference link should look like: \ No newline at end of file +--> From 6ef8892db9e860de7793ec47a4fca0083fa727c9 Mon Sep 17 00:00:00 2001 From: Stephanie Lincoln <86328983+slincoln75@users.noreply.github.com> Date: Thu, 25 Jul 2024 01:37:15 -0700 Subject: [PATCH 14/58] Update using-a-fiscal-host-to-receive-github-sponsors-payouts.md (#51780) --- ...using-a-fiscal-host-to-receive-github-sponsors-payouts.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/sponsors/receiving-sponsorships-through-github-sponsors/using-a-fiscal-host-to-receive-github-sponsors-payouts.md b/content/sponsors/receiving-sponsorships-through-github-sponsors/using-a-fiscal-host-to-receive-github-sponsors-payouts.md index a269fa85ea..e9313f53bc 100644 --- a/content/sponsors/receiving-sponsorships-through-github-sponsors/using-a-fiscal-host-to-receive-github-sponsors-payouts.md +++ b/content/sponsors/receiving-sponsorships-through-github-sponsors/using-a-fiscal-host-to-receive-github-sponsors-payouts.md @@ -19,9 +19,12 @@ When you sign up for a {% data variables.product.prodname_sponsors %} profile so {% data variables.product.prodname_sponsors %} supports these fiscal hosts: -* [Open Source Collective](https://opencollective.com/opensource) +* [Hack Club](https://hackclub.com/) * [NumFOCUS](https://www.numfocus.org/) * [Open Collective Europe](https://opencollective.com/europe) +* [Open Source Collective](https://opencollective.com/opensource) +* [Python Software Foundation](https://www.python.org/psf-landing/) +* [Software in the Public Interest](https://www.spi-inc.org/) * [Software Underground](https://softwareunderground.org/) ## Choosing to use a fiscal host From 44c075707fea254dd906ea3d188c164fffd9d1a1 Mon Sep 17 00:00:00 2001 From: Anne-Marie <102995847+am-stead@users.noreply.github.com> Date: Thu, 25 Jul 2024 09:48:28 +0100 Subject: [PATCH 15/58] Secret scanning validity checks - [GA] #14322 (#51730) --- .../configuring-secret-scanning-for-your-repositories.md | 1 - .../secret-scanning/managing-alerts-from-secret-scanning.md | 6 ------ .../secret-scanning/validity-check-partner-patterns-beta.md | 2 -- 3 files changed, 9 deletions(-) delete mode 100644 data/reusables/secret-scanning/validity-check-partner-patterns-beta.md diff --git a/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md b/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md index 548d37d0f2..8fa1fef400 100644 --- a/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md +++ b/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md @@ -62,7 +62,6 @@ You can enable the following additional {% data variables.product.prodname_secre ### Enabling validity checks for partner patterns -{% data reusables.secret-scanning.validity-check-partner-patterns-beta %} {% data reusables.gated-features.partner-pattern-validity-check-ghas %} You can allow {% data variables.product.prodname_secret_scanning %} to automatically check the validity of a secret found in your repository by sending it to the relevant partner. For more information on validity checks, see "Checking a secret's validity" in "[AUTOTITLE](/code-security/secret-scanning/managing-alerts-from-secret-scanning#checking-a-secrets-validity)." diff --git a/content/code-security/secret-scanning/managing-alerts-from-secret-scanning.md b/content/code-security/secret-scanning/managing-alerts-from-secret-scanning.md index e66b2d79c5..4520fef86c 100644 --- a/content/code-security/secret-scanning/managing-alerts-from-secret-scanning.md +++ b/content/code-security/secret-scanning/managing-alerts-from-secret-scanning.md @@ -91,12 +91,6 @@ There are some additional features that can help you to evaluate alerts in order ### Checking a secret's validity -{% ifversion secret-scanning-validity-check-partner-patterns %} - -{% data reusables.secret-scanning.validity-check-partner-patterns-beta %} - -{% endif %} - Validity checks help you prioritize alerts by telling you which secrets are `active` or `inactive`. An `active` secret is one that could still be exploited, so these alerts should be reviewed and remediated as a priority. By default, {% data variables.product.company_short %} checks the validity of {% data variables.product.company_short %} tokens and displays the validitation status of the token in the alert view. diff --git a/data/reusables/secret-scanning/validity-check-partner-patterns-beta.md b/data/reusables/secret-scanning/validity-check-partner-patterns-beta.md deleted file mode 100644 index 21be634705..0000000000 --- a/data/reusables/secret-scanning/validity-check-partner-patterns-beta.md +++ /dev/null @@ -1,2 +0,0 @@ -> [!NOTE] -> Validity checks for partner patterns is currently in beta and subject to change. From 1828038909c26a75017a25eddae719e9abfd98d4 Mon Sep 17 00:00:00 2001 From: Sylvain Slaton <7077036+Aerendel@users.noreply.github.com> Date: Thu, 25 Jul 2024 03:55:14 -0700 Subject: [PATCH 16/58] Remove beta note for secret scanning discussions and PRs (#51638) Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com> Co-authored-by: Anne-Marie <102995847+am-stead@users.noreply.github.com> --- .../secret-scanning/beta-prs-discussions-wikis-scanned.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/reusables/secret-scanning/beta-prs-discussions-wikis-scanned.md b/data/reusables/secret-scanning/beta-prs-discussions-wikis-scanned.md index be8568d26d..f5dce90b74 100644 --- a/data/reusables/secret-scanning/beta-prs-discussions-wikis-scanned.md +++ b/data/reusables/secret-scanning/beta-prs-discussions-wikis-scanned.md @@ -1,3 +1,4 @@ +{% ifversion ghes < 3.15 %} {% ifversion secret-scanning-enhancements-wikis or ifversion secret-scanning-enhancements-prs-discussions %} {% note %} @@ -7,3 +8,4 @@ {% endnote %} {% endif %} +{% endif %} From d7e5c484437725a3be6ac185a01f347c3f14c0f2 Mon Sep 17 00:00:00 2001 From: docs-bot <77750099+docs-bot@users.noreply.github.com> Date: Thu, 25 Jul 2024 08:53:12 -0700 Subject: [PATCH 17/58] Update CodeQL CLI manual (#51743) --- .../codeql-cli/codeql-cli-manual/bqrs-interpret.md | 7 +++++++ .../codeql-cli/codeql-cli-manual/database-analyze.md | 7 +++++++ .../codeql-cli-manual/database-interpret-results.md | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/content/code-security/codeql-cli/codeql-cli-manual/bqrs-interpret.md b/content/code-security/codeql-cli/codeql-cli-manual/bqrs-interpret.md index 0c93135268..68de0062e9 100644 --- a/content/code-security/codeql-cli/codeql-cli-manual/bqrs-interpret.md +++ b/content/code-security/codeql-cli/codeql-cli-manual/bqrs-interpret.md @@ -121,6 +121,13 @@ This option has no effect when passed to [codeql bqrs interpret](/code-security/ Available since `v2.15.2`. +#### `--no-sarif-include-alert-provenance` + +\[Advanced] \[SARIF formats only] Do not include alert provenance +information in the SARIF output. + +Available since `v2.18.1`. + #### `--[no-]sarif-group-rules-by-pack` \[SARIF formats only] Place the rule object for each query under its diff --git a/content/code-security/codeql-cli/codeql-cli-manual/database-analyze.md b/content/code-security/codeql-cli/codeql-cli-manual/database-analyze.md index 9745238f10..41983a1245 100644 --- a/content/code-security/codeql-cli/codeql-cli-manual/database-analyze.md +++ b/content/code-security/codeql-cli/codeql-cli-manual/database-analyze.md @@ -167,6 +167,13 @@ This option has no effect when passed to [codeql bqrs interpret](/code-security/ Available since `v2.15.2`. +#### `--no-sarif-include-alert-provenance` + +\[Advanced] \[SARIF formats only] Do not include alert provenance +information in the SARIF output. + +Available since `v2.18.1`. + #### `--[no-]sarif-group-rules-by-pack` \[SARIF formats only] Place the rule object for each query under its diff --git a/content/code-security/codeql-cli/codeql-cli-manual/database-interpret-results.md b/content/code-security/codeql-cli/codeql-cli-manual/database-interpret-results.md index 7779015b9a..7375039caa 100644 --- a/content/code-security/codeql-cli/codeql-cli-manual/database-interpret-results.md +++ b/content/code-security/codeql-cli/codeql-cli-manual/database-interpret-results.md @@ -129,6 +129,13 @@ This option has no effect when passed to [codeql bqrs interpret](/code-security/ Available since `v2.15.2`. +#### `--no-sarif-include-alert-provenance` + +\[Advanced] \[SARIF formats only] Do not include alert provenance +information in the SARIF output. + +Available since `v2.18.1`. + #### `--[no-]sarif-group-rules-by-pack` \[SARIF formats only] Place the rule object for each query under its From 1086f7241666e9e0b84f4f83c6f12579a1bccba1 Mon Sep 17 00:00:00 2001 From: docs-bot <77750099+docs-bot@users.noreply.github.com> Date: Thu, 25 Jul 2024 08:53:19 -0700 Subject: [PATCH 18/58] Update CodeQL query tables (#51744) --- .../code-scanning/codeql-query-tables/cpp.md | 4 +- .../codeql-query-tables/javascript.md | 2 + .../codeql-query-tables/swift.md | 58 +++++++++---------- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/data/reusables/code-scanning/codeql-query-tables/cpp.md b/data/reusables/code-scanning/codeql-query-tables/cpp.md index bc664bbbb4..5107f1c5cc 100644 --- a/data/reusables/code-scanning/codeql-query-tables/cpp.md +++ b/data/reusables/code-scanning/codeql-query-tables/cpp.md @@ -18,6 +18,7 @@ | [Failure to use HTTPS URLs](https://codeql.github.com/codeql-query-help/cpp/cpp-non-https-url/) | 319, 345 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [File opened with O_CREAT flag but without mode argument](https://codeql.github.com/codeql-query-help/cpp/cpp-open-call-with-mode-argument/) | 732 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Incorrect return-value check for a 'scanf'-like function](https://codeql.github.com/codeql-query-help/cpp/cpp-incorrectly-checked-scanf/) | 253 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Iterator to expired container](https://codeql.github.com/codeql-query-help/cpp/cpp-iterator-to-expired-container/) | 416, 664 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Likely overrunning write](https://codeql.github.com/codeql-query-help/cpp/cpp-very-likely-overrunning-write/) | 120, 787, 805 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Mismatching new/free or malloc/delete](https://codeql.github.com/codeql-query-help/cpp/cpp-new-free-mismatch/) | 401 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Multiplication result converted to larger type](https://codeql.github.com/codeql-query-help/cpp/cpp-integer-multiplication-cast-to-long/) | 190, 192, 197, 681 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | @@ -26,6 +27,7 @@ | [Potential double free](https://codeql.github.com/codeql-query-help/cpp/cpp-double-free/) | 415 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "x" aria-label="Not included" %} | | [Potential use after free](https://codeql.github.com/codeql-query-help/cpp/cpp-use-after-free/) | 416 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Potentially overflowing call to snprintf](https://codeql.github.com/codeql-query-help/cpp/cpp-overflowing-snprintf/) | 190, 253 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Potentially unsafe call to strncat](https://codeql.github.com/codeql-query-help/cpp/cpp-unsafe-strncat/) | 788, 676, 119, 251 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Redundant null check due to previous dereference](https://codeql.github.com/codeql-query-help/cpp/cpp-redundant-null-check-simple/) | 476 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Returning stack-allocated memory](https://codeql.github.com/codeql-query-help/cpp/cpp-return-stack-allocated-memory/) | 825 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Setting a DACL to NULL in a SECURITY_DESCRIPTOR](https://codeql.github.com/codeql-query-help/cpp/cpp-unsafe-dacl-security-descriptor/) | 732 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | @@ -62,7 +64,6 @@ | [Incorrect 'not' operator usage](https://codeql.github.com/codeql-query-help/cpp/cpp-incorrect-not-operator-usage/) | 480 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Incorrect allocation-error handling](https://codeql.github.com/codeql-query-help/cpp/cpp-incorrect-allocation-error-handling/) | 570, 252, 755 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Invalid pointer dereference](https://codeql.github.com/codeql-query-help/cpp/cpp-invalid-pointer-deref/) | 119, 125, 193, 787 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Iterator to expired container](https://codeql.github.com/codeql-query-help/cpp/cpp-iterator-to-expired-container/) | 416, 664 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Missing return-value check for a 'scanf'-like function](https://codeql.github.com/codeql-query-help/cpp/cpp-missing-check-scanf/) | 252, 253 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Non-constant format string](https://codeql.github.com/codeql-query-help/cpp/cpp-non-constant-format/) | 134 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Not enough memory allocated for array of pointer type](https://codeql.github.com/codeql-query-help/cpp/cpp-suspicious-allocation-size/) | 131, 122 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | @@ -75,7 +76,6 @@ | [Potentially overrunning write](https://codeql.github.com/codeql-query-help/cpp/cpp-overrunning-write/) | 120, 787, 805 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Potentially overrunning write with float to string conversion](https://codeql.github.com/codeql-query-help/cpp/cpp-overrunning-write-with-float/) | 120, 787, 805 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Potentially uninitialized local variable](https://codeql.github.com/codeql-query-help/cpp/cpp-uninitialized-local/) | 665, 457 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Potentially unsafe call to strncat](https://codeql.github.com/codeql-query-help/cpp/cpp-unsafe-strncat/) | 788, 676, 119, 251 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Potentially unsafe use of strcat](https://codeql.github.com/codeql-query-help/cpp/cpp-unsafe-strcat/) | 676, 120, 251 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Suspicious 'sizeof' use](https://codeql.github.com/codeql-query-help/cpp/cpp-suspicious-sizeof/) | 467 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Suspicious pointer scaling](https://codeql.github.com/codeql-query-help/cpp/cpp-suspicious-pointer-scaling/) | 468 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "x" aria-label="Not included" %} | diff --git a/data/reusables/code-scanning/codeql-query-tables/javascript.md b/data/reusables/code-scanning/codeql-query-tables/javascript.md index 2684745bdc..75229473e6 100644 --- a/data/reusables/code-scanning/codeql-query-tables/javascript.md +++ b/data/reusables/code-scanning/codeql-query-tables/javascript.md @@ -41,6 +41,7 @@ | [Incorrect suffix check](https://codeql.github.com/codeql-query-help/javascript/js-incorrect-suffix-check/) | 020 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Inefficient regular expression](https://codeql.github.com/codeql-query-help/javascript/js-redos/) | 1333, 730, 400 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Information exposure through a stack trace](https://codeql.github.com/codeql-query-help/javascript/js-stack-trace-exposure/) | 209, 497 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Insecure configuration of Helmet security middleware](https://codeql.github.com/codeql-query-help/javascript/js-insecure-helmet-configuration/) | 693, 1021 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "x" aria-label="Not included" %} | | [Insecure randomness](https://codeql.github.com/codeql-query-help/javascript/js-insecure-randomness/) | 338 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Insecure URL whitelist](https://codeql.github.com/codeql-query-help/javascript/js-angular-insecure-url-whitelist/) | 183, 625 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [JWT missing secret or public key verification](https://codeql.github.com/codeql-query-help/javascript/js-jwt-missing-verification/) | 347 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | @@ -76,6 +77,7 @@ | [Unsafe HTML constructed from library input](https://codeql.github.com/codeql-query-help/javascript/js-html-constructed-from-input/) | 079, 116 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Unsafe jQuery plugin](https://codeql.github.com/codeql-query-help/javascript/js-unsafe-jquery-plugin/) | 079, 116 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Unsafe shell command constructed from library input](https://codeql.github.com/codeql-query-help/javascript/js-shell-command-constructed-from-input/) | 078, 088 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Untrusted domain used in script or other content](https://codeql.github.com/codeql-query-help/javascript/js-functionality-from-untrusted-domain/) | 830 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "x" aria-label="Not included" %} | | [Unvalidated dynamic method call](https://codeql.github.com/codeql-query-help/javascript/js-unvalidated-dynamic-method-call/) | 754 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Use of a broken or weak cryptographic algorithm](https://codeql.github.com/codeql-query-help/javascript/js-weak-cryptographic-algorithm/) | 327, 328 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | | [Use of a weak cryptographic key](https://codeql.github.com/codeql-query-help/javascript/js-insufficient-key-size/) | 326 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | diff --git a/data/reusables/code-scanning/codeql-query-tables/swift.md b/data/reusables/code-scanning/codeql-query-tables/swift.md index cce0f99a6b..0cfd21ca74 100644 --- a/data/reusables/code-scanning/codeql-query-tables/swift.md +++ b/data/reusables/code-scanning/codeql-query-tables/swift.md @@ -1,33 +1,33 @@ {% rowheaders %} -| Query name | Related CWEs | Default | Extended | -| --- | --- | --- | --- | -| [Bad HTML filtering regexp](https://codeql.github.com/codeql-query-help/swift/swift-bad-tag-filter/) | 116, 020, 185, 186 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Cleartext logging of sensitive information](https://codeql.github.com/codeql-query-help/swift/swift-cleartext-logging/) | 312, 359, 532 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Cleartext storage of sensitive information in a local database](https://codeql.github.com/codeql-query-help/swift/swift-cleartext-storage-database/) | 312 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Cleartext storage of sensitive information in an application preference store](https://codeql.github.com/codeql-query-help/swift/swift-cleartext-storage-preferences/) | 312 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Cleartext transmission of sensitive information](https://codeql.github.com/codeql-query-help/swift/swift-cleartext-transmission/) | 319 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Constant password](https://codeql.github.com/codeql-query-help/swift/swift-constant-password/) | 259 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Database query built from user-controlled sources](https://codeql.github.com/codeql-query-help/swift/swift-sql-injection/) | 089 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Encryption using ECB](https://codeql.github.com/codeql-query-help/swift/swift-ecb-encryption/) | 327 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Hard-coded encryption key](https://codeql.github.com/codeql-query-help/swift/swift-hardcoded-key/) | 321 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Incomplete regular expression for hostnames](https://codeql.github.com/codeql-query-help/swift/swift-incomplete-hostname-regexp/) | 020 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Inefficient regular expression](https://codeql.github.com/codeql-query-help/swift/swift-redos/) | 1333, 730, 400 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Insecure TLS configuration](https://codeql.github.com/codeql-query-help/swift/swift-insecure-tls/) | 757 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Insufficient hash iterations](https://codeql.github.com/codeql-query-help/swift/swift-insufficient-hash-iterations/) | 916 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Missing regular expression anchor](https://codeql.github.com/codeql-query-help/swift/swift-missing-regexp-anchor/) | 020 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Predicate built from user-controlled sources](https://codeql.github.com/codeql-query-help/swift/swift-predicate-injection/) | 943 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Regular expression injection](https://codeql.github.com/codeql-query-help/swift/swift-regex-injection/) | 730, 400 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Resolving XML external entity in user-controlled data](https://codeql.github.com/codeql-query-help/swift/swift-xxe/) | 611, 776, 827 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Static initialization vector for encryption](https://codeql.github.com/codeql-query-help/swift/swift-static-initialization-vector/) | 329, 1204 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [String length conflation](https://codeql.github.com/codeql-query-help/swift/swift-string-length-conflation/) | 135 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [System command built from user-controlled sources](https://codeql.github.com/codeql-query-help/swift/swift-command-line-injection/) | 078, 088 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Uncontrolled data used in path expression](https://codeql.github.com/codeql-query-help/swift/swift-path-injection/) | 022, 023, 036, 073, 099 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Uncontrolled format string](https://codeql.github.com/codeql-query-help/swift/swift-uncontrolled-format-string/) | 134 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Unsafe WebView fetch](https://codeql.github.com/codeql-query-help/swift/swift-unsafe-webview-fetch/) | 079, 095, 749 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Use of a broken or weak cryptographic hashing algorithm on sensitive data](https://codeql.github.com/codeql-query-help/swift/swift-weak-sensitive-data-hashing/) | 327, 328 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Use of an inappropriate cryptographic hashing algorithm on passwords](https://codeql.github.com/codeql-query-help/swift/swift-weak-password-hashing/) | 327, 328, 916 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [Use of constant salts](https://codeql.github.com/codeql-query-help/swift/swift-constant-salt/) | 760 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | -| [JavaScript Injection](https://codeql.github.com/codeql-query-help/swift/swift-unsafe-js-eval/) | 094, 095, 749 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | +| Query name | Related CWEs | Default | Extended | Autofix | +| --- | --- | --- | --- | --- | +| [Bad HTML filtering regexp](https://codeql.github.com/codeql-query-help/swift/swift-bad-tag-filter/) | 116, 020, 185, 186 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Cleartext logging of sensitive information](https://codeql.github.com/codeql-query-help/swift/swift-cleartext-logging/) | 312, 359, 532 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Cleartext storage of sensitive information in a local database](https://codeql.github.com/codeql-query-help/swift/swift-cleartext-storage-database/) | 312 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Cleartext storage of sensitive information in an application preference store](https://codeql.github.com/codeql-query-help/swift/swift-cleartext-storage-preferences/) | 312 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Cleartext transmission of sensitive information](https://codeql.github.com/codeql-query-help/swift/swift-cleartext-transmission/) | 319 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "x" aria-label="Not included" %} | +| [Constant password](https://codeql.github.com/codeql-query-help/swift/swift-constant-password/) | 259 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Database query built from user-controlled sources](https://codeql.github.com/codeql-query-help/swift/swift-sql-injection/) | 089 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "x" aria-label="Not included" %} | +| [Encryption using ECB](https://codeql.github.com/codeql-query-help/swift/swift-ecb-encryption/) | 327 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Hard-coded encryption key](https://codeql.github.com/codeql-query-help/swift/swift-hardcoded-key/) | 321 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Incomplete regular expression for hostnames](https://codeql.github.com/codeql-query-help/swift/swift-incomplete-hostname-regexp/) | 020 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Inefficient regular expression](https://codeql.github.com/codeql-query-help/swift/swift-redos/) | 1333, 730, 400 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "x" aria-label="Not included" %} | +| [Insecure TLS configuration](https://codeql.github.com/codeql-query-help/swift/swift-insecure-tls/) | 757 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Insufficient hash iterations](https://codeql.github.com/codeql-query-help/swift/swift-insufficient-hash-iterations/) | 916 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Missing regular expression anchor](https://codeql.github.com/codeql-query-help/swift/swift-missing-regexp-anchor/) | 020 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Predicate built from user-controlled sources](https://codeql.github.com/codeql-query-help/swift/swift-predicate-injection/) | 943 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Regular expression injection](https://codeql.github.com/codeql-query-help/swift/swift-regex-injection/) | 730, 400 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Resolving XML external entity in user-controlled data](https://codeql.github.com/codeql-query-help/swift/swift-xxe/) | 611, 776, 827 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Static initialization vector for encryption](https://codeql.github.com/codeql-query-help/swift/swift-static-initialization-vector/) | 329, 1204 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [String length conflation](https://codeql.github.com/codeql-query-help/swift/swift-string-length-conflation/) | 135 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [System command built from user-controlled sources](https://codeql.github.com/codeql-query-help/swift/swift-command-line-injection/) | 078, 088 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Uncontrolled data used in path expression](https://codeql.github.com/codeql-query-help/swift/swift-path-injection/) | 022, 023, 036, 073, 099 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Uncontrolled format string](https://codeql.github.com/codeql-query-help/swift/swift-uncontrolled-format-string/) | 134 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Unsafe WebView fetch](https://codeql.github.com/codeql-query-help/swift/swift-unsafe-webview-fetch/) | 079, 095, 749 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Use of a broken or weak cryptographic hashing algorithm on sensitive data](https://codeql.github.com/codeql-query-help/swift/swift-weak-sensitive-data-hashing/) | 327, 328 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Use of an inappropriate cryptographic hashing algorithm on passwords](https://codeql.github.com/codeql-query-help/swift/swift-weak-password-hashing/) | 327, 328, 916 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [Use of constant salts](https://codeql.github.com/codeql-query-help/swift/swift-constant-salt/) | 760 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | +| [JavaScript Injection](https://codeql.github.com/codeql-query-help/swift/swift-unsafe-js-eval/) | 094, 095, 749 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% endrowheaders %} From 11eda7e87117f0426fae0fcb40a08b652f8a8c2a Mon Sep 17 00:00:00 2001 From: Cees-Jan Kiewiet Date: Thu, 25 Jul 2024 18:02:22 +0200 Subject: [PATCH 19/58] Drop verbose from cp call (#34015) Co-authored-by: Ben Ahmady <32935794+subatoi@users.noreply.github.com> --- ...ying-runner-scale-sets-with-actions-runner-controller.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/deploying-runner-scale-sets-with-actions-runner-controller.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/deploying-runner-scale-sets-with-actions-runner-controller.md index 6497ed0fc6..19cb479e8f 100644 --- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/deploying-runner-scale-sets-with-actions-runner-controller.md +++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/deploying-runner-scale-sets-with-actions-runner-controller.md @@ -503,7 +503,7 @@ template: - name: init-dind-externals image: ghcr.io/actions/actions-runner:latest command: - ["cp", "-r", "-v", "/home/runner/externals/.", "/home/runner/tmpDir/"] + ["cp", "-r", "/home/runner/externals/.", "/home/runner/tmpDir/"] volumeMounts: - name: dind-externals mountPath: /home/runner/tmpDir @@ -651,7 +651,7 @@ template: initContainers: - name: init-dind-externals image: ghcr.io/actions/actions-runner:latest - command: ["cp", "-r", "-v", "/home/runner/externals/.", "/home/runner/tmpDir/"] + command: ["cp", "-r", "/home/runner/externals/.", "/home/runner/tmpDir/"] volumeMounts: - name: dind-externals mountPath: /home/runner/tmpDir @@ -753,7 +753,7 @@ template: initContainers: - name: init-dind-externals image: ghcr.io/actions/actions-runner:latest - command: ["cp", "-r", "-v", "/home/runner/externals/.", "/home/runner/tmpDir/"] + command: ["cp", "-r", "/home/runner/externals/.", "/home/runner/tmpDir/"] volumeMounts: - name: dind-externals mountPath: /home/runner/tmpDir From 7859093edd0fe63d3f993177af09f18674a1f471 Mon Sep 17 00:00:00 2001 From: Ashish Keshan Date: Thu, 25 Jul 2024 09:34:22 -0700 Subject: [PATCH 20/58] Bump liquidjs to 10.16.1 (#51788) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa7ee834e8..1b2008de26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,7 +57,7 @@ "javascript-stringify": "^2.1.0", "js-cookie": "^3.0.1", "js-yaml": "^4.1.0", - "liquidjs": "^10.14.0", + "liquidjs": "^10.16.1", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "lowdb": "7.0.1", @@ -9037,9 +9037,9 @@ } }, "node_modules/liquidjs": { - "version": "10.14.0", - "resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.14.0.tgz", - "integrity": "sha512-Zjg35Yo3L/2aNy7QkICha/ulbXRtZS7oRenWyDDfw+J34Xy3fOKWWHxASC9r0gbxN661nrwmG/kOIKHfYcVk4Q==", + "version": "10.16.1", + "resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.16.1.tgz", + "integrity": "sha512-1JFL/Y7ONoajrfwav37yuz5yQHU3+Pgz1XWsg9E/2T8Fp65KalNfMF8QZ3+tNETqGUIB66waOSLOi64niYZE9A==", "dependencies": { "commander": "^10.0.0" }, diff --git a/package.json b/package.json index 37d804e788..95548ae3e8 100644 --- a/package.json +++ b/package.json @@ -273,7 +273,7 @@ "javascript-stringify": "^2.1.0", "js-cookie": "^3.0.1", "js-yaml": "^4.1.0", - "liquidjs": "^10.14.0", + "liquidjs": "^10.16.1", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "lowdb": "7.0.1", From f468ded5996d7a6aa7d6e63df9b2e7c61c06cd30 Mon Sep 17 00:00:00 2001 From: docs-bot <77750099+docs-bot@users.noreply.github.com> Date: Thu, 25 Jul 2024 09:34:38 -0700 Subject: [PATCH 21/58] Update audit log event data (#51792) --- src/audit-logs/lib/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audit-logs/lib/config.json b/src/audit-logs/lib/config.json index 57c5ecdc84..0b360b762f 100644 --- a/src/audit-logs/lib/config.json +++ b/src/audit-logs/lib/config.json @@ -3,5 +3,5 @@ "apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.", "apiRequestEvent": "This event is only available via audit log streaming." }, - "sha": "f271371294d09bfaaff89f4a043ed51243be415c" + "sha": "e963c4e55388351f75020df4baa4a15f21fb044b" } \ No newline at end of file From 3e55c864569b0f8bcb8b696c5900396b7cb22200 Mon Sep 17 00:00:00 2001 From: docs-bot <77750099+docs-bot@users.noreply.github.com> Date: Thu, 25 Jul 2024 09:34:41 -0700 Subject: [PATCH 22/58] GraphQL schema update (#51791) Co-authored-by: rachmari <9831992+rachmari@users.noreply.github.com> --- src/graphql/data/fpt/changelog.json | 16 ++++++++++++ src/graphql/data/fpt/schema.docs.graphql | 20 ++++++++++++++ src/graphql/data/fpt/schema.json | 32 +++++++++++++++++++++++ src/graphql/data/ghec/schema.docs.graphql | 20 ++++++++++++++ src/graphql/data/ghec/schema.json | 32 +++++++++++++++++++++++ 5 files changed, 120 insertions(+) diff --git a/src/graphql/data/fpt/changelog.json b/src/graphql/data/fpt/changelog.json index 2d4d05e845..2b6bcb1d8a 100644 --- a/src/graphql/data/fpt/changelog.json +++ b/src/graphql/data/fpt/changelog.json @@ -1,4 +1,20 @@ [ + { + "schemaChanges": [ + { + "title": "The GraphQL schema includes these changes:", + "changes": [ + "

    Field doNotEnforceOnCreate was added to object type RequiredStatusChecksParameters

    ", + "

    Input field doNotEnforceOnCreate of type Boolean was added to input object type RequiredStatusChecksParametersInput

    ", + "

    Field doNotEnforceOnCreate was added to object type WorkflowsParameters

    ", + "

    Input field doNotEnforceOnCreate of type Boolean was added to input object type WorkflowsParametersInput

    " + ] + } + ], + "previewChanges": [], + "upcomingChanges": [], + "date": "2024-07-25" + }, { "schemaChanges": [ { diff --git a/src/graphql/data/fpt/schema.docs.graphql b/src/graphql/data/fpt/schema.docs.graphql index 7cd9e601d4..dfc225027b 100644 --- a/src/graphql/data/fpt/schema.docs.graphql +++ b/src/graphql/data/fpt/schema.docs.graphql @@ -48823,6 +48823,11 @@ Choose which status checks must pass before the ref is updated. When enabled, commits must first be pushed to another ref where the checks pass. """ type RequiredStatusChecksParameters { + """ + Allow repositories and branches to be created if a check would otherwise prohibit it. + """ + doNotEnforceOnCreate: Boolean! + """ Status checks that are required. """ @@ -48841,6 +48846,11 @@ Choose which status checks must pass before the ref is updated. When enabled, commits must first be pushed to another ref where the checks pass. """ input RequiredStatusChecksParametersInput { + """ + Allow repositories and branches to be created if a check would otherwise prohibit it. + """ + doNotEnforceOnCreate: Boolean + """ Status checks that are required. """ @@ -63696,6 +63706,11 @@ enum WorkflowState { Require all changes made to a targeted branch to pass the specified workflows before they can be merged. """ type WorkflowsParameters { + """ + Allow repositories and branches to be created if a check would otherwise prohibit it. + """ + doNotEnforceOnCreate: Boolean! + """ Workflows that must pass for this rule to pass. """ @@ -63706,6 +63721,11 @@ type WorkflowsParameters { Require all changes made to a targeted branch to pass the specified workflows before they can be merged. """ input WorkflowsParametersInput { + """ + Allow repositories and branches to be created if a check would otherwise prohibit it. + """ + doNotEnforceOnCreate: Boolean + """ Workflows that must pass for this rule to pass. """ diff --git a/src/graphql/data/fpt/schema.json b/src/graphql/data/fpt/schema.json index f56b7c2071..f9555aa5a6 100644 --- a/src/graphql/data/fpt/schema.json +++ b/src/graphql/data/fpt/schema.json @@ -65784,6 +65784,14 @@ "href": "/graphql/reference/objects#requiredstatuschecksparameters", "description": "

    Choose which status checks must pass before the ref is updated. When enabled,\ncommits must first be pushed to another ref where the checks pass.

    ", "fields": [ + { + "name": "doNotEnforceOnCreate", + "description": "

    Allow repositories and branches to be created if a check would otherwise prohibit it.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "requiredStatusChecks", "description": "

    Status checks that are required.

    ", @@ -79152,6 +79160,14 @@ "href": "/graphql/reference/objects#workflowsparameters", "description": "

    Require all changes made to a targeted branch to pass the specified workflows before they can be merged.

    ", "fields": [ + { + "name": "doNotEnforceOnCreate", + "description": "

    Allow repositories and branches to be created if a check would otherwise prohibit it.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "workflows", "description": "

    Workflows that must pass for this rule to pass.

    ", @@ -100516,6 +100532,14 @@ "href": "/graphql/reference/input-objects#requiredstatuschecksparametersinput", "description": "

    Choose which status checks must pass before the ref is updated. When enabled,\ncommits must first be pushed to another ref where the checks pass.

    ", "inputFields": [ + { + "name": "doNotEnforceOnCreate", + "description": "

    Allow repositories and branches to be created if a check would otherwise prohibit it.

    ", + "type": "Boolean", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "requiredStatusChecks", "description": "

    Status checks that are required.

    ", @@ -105491,6 +105515,14 @@ "href": "/graphql/reference/input-objects#workflowsparametersinput", "description": "

    Require all changes made to a targeted branch to pass the specified workflows before they can be merged.

    ", "inputFields": [ + { + "name": "doNotEnforceOnCreate", + "description": "

    Allow repositories and branches to be created if a check would otherwise prohibit it.

    ", + "type": "Boolean", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "workflows", "description": "

    Workflows that must pass for this rule to pass.

    ", diff --git a/src/graphql/data/ghec/schema.docs.graphql b/src/graphql/data/ghec/schema.docs.graphql index 7cd9e601d4..dfc225027b 100644 --- a/src/graphql/data/ghec/schema.docs.graphql +++ b/src/graphql/data/ghec/schema.docs.graphql @@ -48823,6 +48823,11 @@ Choose which status checks must pass before the ref is updated. When enabled, commits must first be pushed to another ref where the checks pass. """ type RequiredStatusChecksParameters { + """ + Allow repositories and branches to be created if a check would otherwise prohibit it. + """ + doNotEnforceOnCreate: Boolean! + """ Status checks that are required. """ @@ -48841,6 +48846,11 @@ Choose which status checks must pass before the ref is updated. When enabled, commits must first be pushed to another ref where the checks pass. """ input RequiredStatusChecksParametersInput { + """ + Allow repositories and branches to be created if a check would otherwise prohibit it. + """ + doNotEnforceOnCreate: Boolean + """ Status checks that are required. """ @@ -63696,6 +63706,11 @@ enum WorkflowState { Require all changes made to a targeted branch to pass the specified workflows before they can be merged. """ type WorkflowsParameters { + """ + Allow repositories and branches to be created if a check would otherwise prohibit it. + """ + doNotEnforceOnCreate: Boolean! + """ Workflows that must pass for this rule to pass. """ @@ -63706,6 +63721,11 @@ type WorkflowsParameters { Require all changes made to a targeted branch to pass the specified workflows before they can be merged. """ input WorkflowsParametersInput { + """ + Allow repositories and branches to be created if a check would otherwise prohibit it. + """ + doNotEnforceOnCreate: Boolean + """ Workflows that must pass for this rule to pass. """ diff --git a/src/graphql/data/ghec/schema.json b/src/graphql/data/ghec/schema.json index f56b7c2071..f9555aa5a6 100644 --- a/src/graphql/data/ghec/schema.json +++ b/src/graphql/data/ghec/schema.json @@ -65784,6 +65784,14 @@ "href": "/graphql/reference/objects#requiredstatuschecksparameters", "description": "

    Choose which status checks must pass before the ref is updated. When enabled,\ncommits must first be pushed to another ref where the checks pass.

    ", "fields": [ + { + "name": "doNotEnforceOnCreate", + "description": "

    Allow repositories and branches to be created if a check would otherwise prohibit it.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "requiredStatusChecks", "description": "

    Status checks that are required.

    ", @@ -79152,6 +79160,14 @@ "href": "/graphql/reference/objects#workflowsparameters", "description": "

    Require all changes made to a targeted branch to pass the specified workflows before they can be merged.

    ", "fields": [ + { + "name": "doNotEnforceOnCreate", + "description": "

    Allow repositories and branches to be created if a check would otherwise prohibit it.

    ", + "type": "Boolean!", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "workflows", "description": "

    Workflows that must pass for this rule to pass.

    ", @@ -100516,6 +100532,14 @@ "href": "/graphql/reference/input-objects#requiredstatuschecksparametersinput", "description": "

    Choose which status checks must pass before the ref is updated. When enabled,\ncommits must first be pushed to another ref where the checks pass.

    ", "inputFields": [ + { + "name": "doNotEnforceOnCreate", + "description": "

    Allow repositories and branches to be created if a check would otherwise prohibit it.

    ", + "type": "Boolean", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "requiredStatusChecks", "description": "

    Status checks that are required.

    ", @@ -105491,6 +105515,14 @@ "href": "/graphql/reference/input-objects#workflowsparametersinput", "description": "

    Require all changes made to a targeted branch to pass the specified workflows before they can be merged.

    ", "inputFields": [ + { + "name": "doNotEnforceOnCreate", + "description": "

    Allow repositories and branches to be created if a check would otherwise prohibit it.

    ", + "type": "Boolean", + "id": "boolean", + "kind": "scalars", + "href": "/graphql/reference/scalars#boolean" + }, { "name": "workflows", "description": "

    Workflows that must pass for this rule to pass.

    ", From d1f5623ff9eb8e0ad595bf64f1cd2b999aa5b8f9 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Thu, 25 Jul 2024 17:36:37 +0100 Subject: [PATCH 23/58] Minor changes for the GA of Kotlin and Swift (#51639) --- ...ql-code-scanning-for-compiled-languages.md | 21 +++++-------------- ...g-your-advanced-setup-for-code-scanning.md | 3 --- .../java-kotlin-built-in-queries.md | 2 -- .../swift-built-in-queries.md | 2 -- .../kotlin-detected-in-no-build.md | 6 +++--- .../customizing-analysis-with-codeql-packs.md | 4 ++-- ...preparing-your-code-for-codeql-analysis.md | 7 +------ .../github-language-support.md | 2 -- data/features/codeql-kotlin-beta.yml | 3 +++ data/features/codeql-swift-beta.yml | 3 ++- .../alerts-found-in-generated-code.md | 2 +- .../beta-kotlin-or-swift-support.md | 19 ----------------- .../code-scanning/beta-kotlin-support.md | 9 -------- .../code-scanning/beta-swift-support.md | 8 ------- .../codeql-language-identifiers-table.md | 6 +----- .../code-scanning/codeql-languages-bullets.md | 10 +++------ .../codeql-languages-keywords.md | 2 +- data/variables/code-scanning.yml | 2 +- 18 files changed, 23 insertions(+), 88 deletions(-) delete mode 100644 data/reusables/code-scanning/beta-kotlin-or-swift-support.md delete mode 100644 data/reusables/code-scanning/beta-kotlin-support.md delete mode 100644 data/reusables/code-scanning/beta-swift-support.md diff --git a/content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages.md b/content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages.md index 0e26c828b5..fda9e4d7f8 100644 --- a/content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages.md +++ b/content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages.md @@ -133,7 +133,7 @@ Creating a {% data variables.product.prodname_codeql %} database without a build To use `autobuild` or manual build steps, you can use advanced setup. ->[!NOTE] For Java analysis, if `build-mode` is set to `none` and Kotlin code is found in the repository, the Kotlin code will not be analyzed and a warning will be produced. See {% ifversion codeql-kotlin-beta %}"[Building Java and Kotlin](#building-java--and-kotlin)"{% else %}"[Building Java](#building-java)"{% endif %}. +>[!NOTE] For Java analysis, if `build-mode` is set to `none` and Kotlin code is found in the repository, the Kotlin code will not be analyzed and a warning will be produced. See "[Building Java and Kotlin](#building-java-and-kotlin)." {% endif %} @@ -269,10 +269,9 @@ If you added manual build steps for compiled languages and {% data variables.pro * [Building C/C++](#building-cc) * [Building C#](#building-c){% ifversion codeql-go-autobuild %} -* [Building Go](#building-go){% endif %}{% ifversion codeql-kotlin-beta %} -* [Building Java and Kotlin](#building-java--and-kotlin){% else %} -* [Building Java](#building-java){% endif %}{% ifversion codeql-swift-beta %} -* [Building Swift](#building-swift){% endif %} +* [Building Go](#building-go){% endif %} +* [Building Java and Kotlin](#building-java-and-kotlin) +* [Building Swift](#building-swift) {% note %} @@ -433,7 +432,7 @@ The `autobuild` process attempts to autodetect a suitable way to install the dep {% endif %} -## Building Java {% ifversion codeql-kotlin-beta %} and Kotlin {% endif %} +## Building Java and Kotlin {% ifversion codeql-no-build %}{% data variables.product.prodname_codeql %} supports the following build modes. @@ -488,8 +487,6 @@ You will also need to install the build system (for example `make`, `cmake`, `ba Windows runners require `powershell.exe` to be on the `PATH`. -{% ifversion codeql-swift-beta %} - ## Building Swift {% ifversion codeql-no-build %}{% data variables.product.prodname_codeql %} supports build modes `autobuild` or `manual` for Swift code. @@ -503,12 +500,6 @@ Windows runners require `powershell.exe` to be on the `PATH`. The `autobuild` process tries to build the biggest target from an Xcode project or workspace. -{% endif %} - -{% ifversion codeql-swift-beta %} - -{% data reusables.code-scanning.beta-swift-support %} - Code scanning of Swift code uses macOS runners by default. {% ifversion fpt or ghec %}Since {% data variables.product.company_short %}-hosted macOS runners are more expensive than Linux and Windows runners, we recommend that you build only the code that you want to analyze. For more information about pricing for {% data variables.product.company_short %}-hosted runners, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)."{% endif %} {% data reusables.code-scanning.default-setup-swift-self-hosted-runners %} @@ -520,5 +511,3 @@ Code scanning of Swift code uses macOS runners by default. {% ifversion fpt or g You can pass the `archive` and `test` options to `xcodebuild`. However, the standard `xcodebuild` command is recommended as it should be the fastest, and should be all that {% data variables.product.prodname_codeql %} requires for a successful scan. For Swift analysis, you must always explicitly install dependencies managed via CocoaPods or Carthage before generating the {% data variables.product.prodname_codeql %} database. - -{% endif %} diff --git a/content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.md b/content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.md index 4677646257..5700c280e2 100644 --- a/content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.md +++ b/content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.md @@ -143,7 +143,6 @@ This workflow scans: ## Specifying an operating system -{% ifversion codeql-swift-beta %} {% note %} **Notes**: @@ -154,8 +153,6 @@ This workflow scans: {% endnote %} -{% endif %} - If your code requires a specific operating system to compile, you can configure the operating system in your {% data variables.code-scanning.codeql_workflow %}. Edit the value of `jobs.analyze.runs-on` to specify the operating system for the machine that runs your {% data variables.product.prodname_code_scanning %} actions. {% ifversion ghes %}You specify the operating system by using an appropriate label as the second element in a two-element array, after `self-hosted`.{% else %} ``` yaml copy diff --git a/content/code-security/code-scanning/managing-your-code-scanning-configuration/java-kotlin-built-in-queries.md b/content/code-security/code-scanning/managing-your-code-scanning-configuration/java-kotlin-built-in-queries.md index e039a876d4..a5bfd969a8 100644 --- a/content/code-security/code-scanning/managing-your-code-scanning-configuration/java-kotlin-built-in-queries.md +++ b/content/code-security/code-scanning/managing-your-code-scanning-configuration/java-kotlin-built-in-queries.md @@ -16,8 +16,6 @@ topics: {% data variables.product.prodname_codeql %} includes many queries for analyzing Java and Kotlin code. {% data reusables.code-scanning.codeql-query-tables.query-suite-behavior %} -{% data reusables.code-scanning.beta-kotlin-support %} - ## Built-in queries for Java and Kotlin analysis {% data reusables.code-scanning.codeql-query-tables.codeql-version-info %} diff --git a/content/code-security/code-scanning/managing-your-code-scanning-configuration/swift-built-in-queries.md b/content/code-security/code-scanning/managing-your-code-scanning-configuration/swift-built-in-queries.md index ba9b9faa31..cae02ea131 100644 --- a/content/code-security/code-scanning/managing-your-code-scanning-configuration/swift-built-in-queries.md +++ b/content/code-security/code-scanning/managing-your-code-scanning-configuration/swift-built-in-queries.md @@ -16,8 +16,6 @@ topics: {% data variables.product.prodname_codeql %} includes many queries for analyzing Swift code. {% data reusables.code-scanning.codeql-query-tables.query-suite-behavior %} -{% data reusables.code-scanning.beta-swift-support %} - ## Built-in queries for Swift analysis {% data reusables.code-scanning.codeql-query-tables.codeql-version-info %} diff --git a/content/code-security/code-scanning/troubleshooting-code-scanning/kotlin-detected-in-no-build.md b/content/code-security/code-scanning/troubleshooting-code-scanning/kotlin-detected-in-no-build.md index d803e3d044..a3d82647c4 100644 --- a/content/code-security/code-scanning/troubleshooting-code-scanning/kotlin-detected-in-no-build.md +++ b/content/code-security/code-scanning/troubleshooting-code-scanning/kotlin-detected-in-no-build.md @@ -40,13 +40,13 @@ If you want to update the analysis to also include Kotlin files, then {% data va 1. Wait until the Kotlin code is merged into the default branch for the repository. 1. Disable and then re-enable default setup on the "Settings" page for your repository. -This will trigger a new analysis using automatic build detection. See "[AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning)" and "[Building Java and Kotlin](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#building-java--and-kotlin)." +This will trigger a new analysis using automatic build detection. See "[AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning)" and "[Building Java and Kotlin](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#building-java-and-kotlin)." If the automatic build detection fails, you will need to use advanced setup with the correct build commands for the project to analyze both languages. ### {% data variables.product.prodname_code_scanning_caps %} advanced setup -If you already use advanced setup, you can edit the {% data variables.product.prodname_codeql %} workflow and change the build mode for `java-kotlin` from `none` to either `autobuild` to automatically build your project, or `manual` to specify your own build steps. "[Building Java and Kotlin](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#building-java--and-kotlin)." +If you already use advanced setup, you can edit the {% data variables.product.prodname_codeql %} workflow and change the build mode for `java-kotlin` from `none` to either `autobuild` to automatically build your project, or `manual` to specify your own build steps. "[Building Java and Kotlin](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#building-java-and-kotlin)." If you need to convert from default setup to advanced setup, you need enable advanced setup on the on the "Settings" page for your repository and create a {% data variables.product.prodname_codeql %} workflow. Then you can define a `manual` build mode for `java-kotlin` and define the build commands for the project. @@ -57,6 +57,6 @@ Update your calls to run the {% data variables.product.prodname_codeql_cli %} fo ## Further reading * "[AUTOTITLE](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning)" -* "[Building Java and Kotlin](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#building-java--and-kotlin){% ifversion codeql-no-build %} +* "[Building Java and Kotlin](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#building-java-and-kotlin){% ifversion codeql-no-build %} * "[CodeQL build modes](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#codeql-build-modes)"{% elsif ghes %} * "[Adding build steps for a compiled language](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#adding-build-steps-for-a-compiled-language)"{% endif %} diff --git a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/customizing-analysis-with-codeql-packs.md b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/customizing-analysis-with-codeql-packs.md index 488cf09e46..aaaaafa3b3 100644 --- a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/customizing-analysis-with-codeql-packs.md +++ b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/customizing-analysis-with-codeql-packs.md @@ -38,8 +38,8 @@ The standard {% data variables.product.prodname_codeql %} packs for all supporte * `codeql/java-queries` * `codeql/javascript-queries` * `codeql/python-queries` - * `codeql/ruby-queries` {% ifversion codeql-swift-beta %} - * `codeql/swift-queries` {% endif %} + * `codeql/ruby-queries` + * `codeql/swift-queries` You can also use the {% data variables.product.prodname_codeql_cli %} to create your own {% data variables.product.prodname_codeql %} packs, add dependencies to packs, and install or update dependencies. For more information, see "[AUTOTITLE](/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs#creating-and-working-with-codeql-packs)." diff --git a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis.md b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis.md index 48c977655b..727599cb82 100644 --- a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis.md +++ b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis.md @@ -56,8 +56,6 @@ You must specify: {% data reusables.code-scanning.codeql-language-identifiers-table %} - {% data reusables.code-scanning.beta-kotlin-or-swift-support %} - If your codebase has a build command or script that invokes the build process, we recommend that you specify it as well: ```shell @@ -75,7 +73,7 @@ You can specify additional options depending on the location of your source file | {% ifversion codeql-language-identifiers-311 %} | | --language | {% octicon "check" aria-label="Required" %} | Specify the identifier for the language to create a database for, one of: {% data reusables.code-scanning.codeql-languages-keywords %}. When used with --db-cluster, the option accepts a comma-separated list, or can be specified more than once. | | {% else %} | -| --language | {% octicon "check" aria-label="Required" %} | Specify the identifier for the language to create a database for, one of: {% data reusables.code-scanning.codeql-languages-keywords %} (use `javascript` to analyze TypeScript code {% ifversion codeql-kotlin-beta %} and `java` to analyze Kotlin code{% endif %}). When used with --db-cluster, the option accepts a comma-separated list, or can be specified more than once. | +| --language | {% octicon "check" aria-label="Required" %} | Specify the identifier for the language to create a database for, one of: {% data reusables.code-scanning.codeql-languages-keywords %} (use `javascript` to analyze TypeScript code and `java` to analyze Kotlin code). When used with --db-cluster, the option accepts a comma-separated list, or can be specified more than once. | | {% endif %} | | --command | {% octicon "x" aria-label="Optional" %} | **Recommended.** Use to specify the build command or script that invokes the build process for the codebase. Commands are run from the current folder or, where it is defined, from --source-root. Not needed for Python and JavaScript/TypeScript analysis. | | {% ifversion codeql-no-build %} | @@ -286,7 +284,6 @@ The following examples are designed to give you an idea of some of the build com codeql database create java-database --language={% ifversion codeql-language-identifiers-311 %}java-kotlin{% else %}java{% endif %} --command='ant -f build.xml' ``` -{% ifversion codeql-swift-beta %} * Swift project built from an Xcode project or workspace. By default, the largest Swift target is built: It's a good idea to ensure that the project is in a clean state and that there are no build artefacts available. @@ -316,8 +313,6 @@ The following examples are designed to give you an idea of some of the build com codeql database create -l swift -c "./scripts/build.sh" swift-database ``` -{% endif %} - * Project built using Bazel: ```shell diff --git a/content/get-started/learning-about-github/github-language-support.md b/content/get-started/learning-about-github/github-language-support.md index dc95e19f1a..23ea1d277c 100644 --- a/content/get-started/learning-about-github/github-language-support.md +++ b/content/get-started/learning-about-github/github-language-support.md @@ -37,9 +37,7 @@ Some features are supported for additional languages or package managers. If you {% data reusables.supported-languages.ruby %} {% data reusables.supported-languages.rust %} {% data reusables.supported-languages.scala %} -{%- ifversion codeql-swift-beta or supply-chain-features-swift-support %} {% data reusables.supported-languages.swift %} -{%- endif %} {% data reusables.supported-languages.typescript %} {% note %} diff --git a/data/features/codeql-kotlin-beta.yml b/data/features/codeql-kotlin-beta.yml index 47cd2bcc8a..27d98ca79c 100644 --- a/data/features/codeql-kotlin-beta.yml +++ b/data/features/codeql-kotlin-beta.yml @@ -1,3 +1,6 @@ +# Reference: #2703 and #15120 +# 2024-07-17 GA + versions: fpt: '*' ghec: '*' diff --git a/data/features/codeql-swift-beta.yml b/data/features/codeql-swift-beta.yml index 1ce4c2ad51..061d1e9890 100644 --- a/data/features/codeql-swift-beta.yml +++ b/data/features/codeql-swift-beta.yml @@ -1,5 +1,6 @@ -# Reference: #10251. +# Reference: #10251 and #15120 # [2023-06-01] Swift support for code scanning users (GitHub docs site) [Public beta] +# 2024-07-17 GA versions: fpt: '*' ghec: '*' diff --git a/data/reusables/code-scanning/alerts-found-in-generated-code.md b/data/reusables/code-scanning/alerts-found-in-generated-code.md index 71a2bf2180..904988afb8 100644 --- a/data/reusables/code-scanning/alerts-found-in-generated-code.md +++ b/data/reusables/code-scanning/alerts-found-in-generated-code.md @@ -1,3 +1,3 @@ -For compiled languages like Java,{% ifversion codeql-kotlin-beta %} Kotlin, {% endif %}{% ifversion codeql-go-autobuild %} Go,{% endif %} C, C++, and C#, {% data variables.product.prodname_codeql %} analyzes all of the code which was built during the workflow run. To limit the amount of code being analyzed, build only the code which you wish to analyze by specifying your own build steps in a `run` block. You can combine specifying your own build steps with using the `paths` or `paths-ignore` filters on the `pull_request` and `push` events to ensure that your workflow only runs when specific code is changed. For more information, see "[AUTOTITLE](/actions/using-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore)." +For compiled languages like Java, Kotlin, {% ifversion codeql-go-autobuild %} Go,{% endif %} C, C++, and C#, {% data variables.product.prodname_codeql %} analyzes all of the code which was built during the workflow run. To limit the amount of code being analyzed, build only the code which you wish to analyze by specifying your own build steps in a `run` block. You can combine specifying your own build steps with using the `paths` or `paths-ignore` filters on the `pull_request` and `push` events to ensure that your workflow only runs when specific code is changed. For more information, see "[AUTOTITLE](/actions/using-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore)." For languages like{% ifversion codeql-go-autobuild %}{% else %} Go,{% endif %} JavaScript, Python, and TypeScript, that {% data variables.product.prodname_codeql %} analyzes without compiling the source code, you can specify additional configuration options to limit the amount of code to analyze. For more information, see "[AUTOTITLE](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#specifying-directories-to-scan)." diff --git a/data/reusables/code-scanning/beta-kotlin-or-swift-support.md b/data/reusables/code-scanning/beta-kotlin-or-swift-support.md deleted file mode 100644 index b440bd2b76..0000000000 --- a/data/reusables/code-scanning/beta-kotlin-or-swift-support.md +++ /dev/null @@ -1,19 +0,0 @@ -{% ifversion codeql-swift-beta and codeql-kotlin-beta %} - {% note %} - - **Note:** {% data variables.product.prodname_codeql %} analysis for Kotlin and Swift is currently in beta. During the beta, analysis of Kotlin and Swift code, and the accompanying documentation, will not be as comprehensive as for other languages. Additionally, Swift 5.9 is not yet supported. - - {% endnote %} -{% elsif codeql-swift-beta %} - {% note %} - - **Note:** {% data variables.product.prodname_codeql %} analysis for Swift is currently in beta. During the beta, analysis of Swift code, and the accompanying documentation, will not be as comprehensive as for other languages. Additionally, Swift 5.8 is not yet supported. - - {% endnote %} -{% elsif codeql-kotlin-beta %} - {% note %} - - **Note:** {% data variables.product.prodname_codeql %} analysis for Kotlin is currently in beta. During the beta, analysis of Kotlin code, and the accompanying documentation, will not be as comprehensive as for other languages. - - {% endnote %} -{% endif %} diff --git a/data/reusables/code-scanning/beta-kotlin-support.md b/data/reusables/code-scanning/beta-kotlin-support.md deleted file mode 100644 index db54caba63..0000000000 --- a/data/reusables/code-scanning/beta-kotlin-support.md +++ /dev/null @@ -1,9 +0,0 @@ -{% ifversion codeql-kotlin-beta %} - -{% note %} - -**Note**: {% data variables.product.prodname_codeql %} analysis for Kotlin is currently in beta. During the beta, analysis of Kotlin will be less comprehensive than {% data variables.product.prodname_codeql %} analysis of other languages. - -{% endnote %} - -{% endif %} diff --git a/data/reusables/code-scanning/beta-swift-support.md b/data/reusables/code-scanning/beta-swift-support.md deleted file mode 100644 index 4e6cc5cf13..0000000000 --- a/data/reusables/code-scanning/beta-swift-support.md +++ /dev/null @@ -1,8 +0,0 @@ -{% ifversion codeql-swift-beta %} -{% note %} - -**Notes:** -* {% data variables.product.prodname_codeql %} analysis for Swift is currently in beta. During the beta, analysis of Swift code, and the accompanying documentation, will not be as comprehensive as for other languages. - -{% endnote %} -{% endif %} diff --git a/data/reusables/code-scanning/codeql-language-identifiers-table.md b/data/reusables/code-scanning/codeql-language-identifiers-table.md index 8def181409..e9d7951b1b 100644 --- a/data/reusables/code-scanning/codeql-language-identifiers-table.md +++ b/data/reusables/code-scanning/codeql-language-identifiers-table.md @@ -9,9 +9,7 @@ | JavaScript/TypeScript | `javascript-typescript` | `javascript` or `typescript` | | Python | `python` | | Ruby | `ruby` -{%- ifversion codeql-swift-beta %} | Swift | `swift` -{%- endif %} {% note %} @@ -26,12 +24,10 @@ | C/C++ | `cpp` | C# | `csharp` | Go | `go` -| Java{% ifversion codeql-kotlin-beta %}/Kotlin{% endif %} | `java` +| Java/Kotlin | `java` | JavaScript/TypeScript | `javascript` | Python | `python` | Ruby | `ruby` -{%- ifversion codeql-swift-beta %} | Swift | `swift` -{%- endif %} {% endif %} diff --git a/data/reusables/code-scanning/codeql-languages-bullets.md b/data/reusables/code-scanning/codeql-languages-bullets.md index 866b735076..a18f355da7 100644 --- a/data/reusables/code-scanning/codeql-languages-bullets.md +++ b/data/reusables/code-scanning/codeql-languages-bullets.md @@ -2,21 +2,17 @@ * C/C++ * C# * Go -* Java{% ifversion codeql-kotlin-beta %}/Kotlin{% endif %} +* Java/Kotlin * JavaScript/TypeScript * Python * Ruby -{% ifversion codeql-swift-beta %}- Swift{% endif %} +* Swift {% note %} **Notes**: -{% ifversion codeql-swift-beta %} -* {% data variables.product.prodname_codeql %} analysis for Swift is currently in beta. During the beta, analysis of Swift will be less comprehensive than {% data variables.product.prodname_codeql %} analysis of other languages. Additionally, Swift 5.8 is not yet supported.{% endif %} -{% ifversion codeql-kotlin-beta %} -* {% data variables.product.prodname_codeql %} analysis for Kotlin is currently in beta. During the beta, analysis of Kotlin will be less comprehensive than {% data variables.product.prodname_codeql %} analysis of other languages. -* Use {% ifversion codeql-language-identifiers-311 %}`java-kotlin`{% else %}`java`{% endif %} to analyze code written in Java, Kotlin or both.{% endif %} +* Use {% ifversion codeql-language-identifiers-311 %}`java-kotlin`{% else %}`java`{% endif %} to analyze code written in Java, Kotlin or both. * Use {% ifversion codeql-language-identifiers-311 %}`javascript-typescript`{% else %}`javascript`{% endif %} to analyze code written in JavaScript, TypeScript or both. {% endnote %} diff --git a/data/reusables/code-scanning/codeql-languages-keywords.md b/data/reusables/code-scanning/codeql-languages-keywords.md index 9d9e0975b7..f48194a2a5 100644 --- a/data/reusables/code-scanning/codeql-languages-keywords.md +++ b/data/reusables/code-scanning/codeql-languages-keywords.md @@ -1 +1 @@ -{% ifversion codeql-language-identifiers-311 %}`c-cpp`, `csharp`, `go`, `java-kotlin`, `javascript-typescript`, `python`, {% ifversion codeql-swift-beta %}`ruby`, and `swift`{% else %}and `ruby`{% endif %}{% else %}`cpp`, `csharp`, `go`, `java`, `javascript`, `python`, {% ifversion codeql-swift-beta %}`ruby`, and `swift`{% else %}and `ruby`{% endif %}{% endif %} +{% ifversion codeql-language-identifiers-311 %}`c-cpp`, `csharp`, `go`, `java-kotlin`, `javascript-typescript`, `python`, `ruby`, and `swift`{% else %}`cpp`, `csharp`, `go`, `java`, `javascript`, `python`, `ruby`, and `swift`{% endif %} diff --git a/data/variables/code-scanning.yml b/data/variables/code-scanning.yml index 386a8991ac..edad4694ff 100644 --- a/data/variables/code-scanning.yml +++ b/data/variables/code-scanning.yml @@ -10,7 +10,7 @@ tool_status_page: 'tool status page' no_build_support: 'Java{% ifversion codeql-no-build-csharp %} and C#{% endif %}' # List of compiled languages -compiled_languages: 'C/C++, C#, {% ifversion codeql-go-autobuild %} Go,{% endif %} {% ifversion codeql-swift-beta %} Java, and Swift{% else %} and Java{% endif %}' +compiled_languages: 'C/C++, C#, {% ifversion codeql-go-autobuild %} Go,{% endif %} Java, and Swift' # List of languages where the libraries support expansion using CodeQL model packs at the repository level. codeql_model_packs_support: '{% ifversion fpt or ghec or ghes > 3.12 %}C#, Java/Kotlin, and Ruby{% elsif ghes > 3.10 %}Java/Kotlin{% endif %}' From d4138062cef27c4afee1dcad217f675e253aa7c4 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Thu, 25 Jul 2024 17:38:26 +0100 Subject: [PATCH 24/58] Update about-security-overview.md for customer feedback (#34090) Co-authored-by: Alex Nguyen <150945400+nguyenalex836@users.noreply.github.com> --- .../security-overview/about-security-overview.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/content/code-security/security-overview/about-security-overview.md b/content/code-security/security-overview/about-security-overview.md index 3f0ef263c8..e9677833b0 100644 --- a/content/code-security/security-overview/about-security-overview.md +++ b/content/code-security/security-overview/about-security-overview.md @@ -128,27 +128,29 @@ For information about permissions, see "[Permission to view data in security ove If you are an owner or security manager for an organization, you can see data for all the repositories in the organization in all views. -If you are an organization member, you can view security overview for the organization and see data for repositories where you have access. +If you are an organization or team member, you can view security overview for the organization and see data for repositories where you have an appropriate level of access. {% ifversion security-overview-dashboard %} {% rowheaders %} -| Organization member with | Overview dashboard (beta) view | Risk and alerts views | Coverage view | +| Organization or team member with | Overview dashboard (beta) view | Risk and alerts views | Coverage view | |--------------------|-------------|---------------------|---------| | `admin` access for one or more repositories | View data for those repositories | View data for those repositories | View data for those repositories{% ifversion security-configurations-beta-and-pre-beta %}, and enable and disable security features{% endif %} | -| `write` access for one or more repositories | View {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} data for those repositories | View {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} data for those repositories | No access for those repositories | -| Security alert access for one or more repositories | View all security alert data for those repositories | View all security alert data for those repositories | No access for those repositories +| `write` access for one or more repositories | View {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} data for those repositories | View {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} data for those repositories | No access | +| `read` or `triage` access for one or more repositories | No access | No access | No access | +| Security alert access for one or more repositories | View all security alert data for those repositories | View all security alert data for those repositories | No access | | Custom organization role with permission to view one or more types of security alert | View allowed alert data for all repositories | View allowed alert data for all repositories in all views | No access | {% endrowheaders %} {% else %} {% rowheaders %} -| Organization member with | Risk and alerts views | Coverage view | +| Organization or team member with | Risk and alerts views | Coverage view | |--------------------|-------------|---------------------| | `admin` access for one or more repositories | View data for those repositories | View data for those repositories, and enable and disable security features | -| `write` access for one or more repositories | View {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} data for those repositories | No access for those repositories | -| Security alert access for one or more repositories | View all security alert data for those repositories | No access for those repositories +| `write` access for one or more repositories | View {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} data for those repositories | No access | +| `read` or `triage` access for one or more repositories | No access | No access | +| Security alert access for one or more repositories | View all security alert data for those repositories | No access | | Custom organization role with permission to view one or more types of security alert | View allowed alert data for all repositories in all views | No access | {% endrowheaders %} From e0ee8bd49070f84d2ecc2cf62762feb89d32e644 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:57:17 -0700 Subject: [PATCH 25/58] Bump docker/build-push-action from 6.3.0 to 6.5.0 (#51782) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/azure-preview-env-deploy-public.yml | 2 +- .github/workflows/azure-preview-env-deploy.yml | 2 +- .github/workflows/azure-prod-build-deploy.yml | 2 +- .github/workflows/azure-staging-build-deploy.yml | 2 +- .github/workflows/main-preview-docker-cache.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/azure-preview-env-deploy-public.yml b/.github/workflows/azure-preview-env-deploy-public.yml index 020550d37a..0c977f53cf 100644 --- a/.github/workflows/azure-preview-env-deploy-public.yml +++ b/.github/workflows/azure-preview-env-deploy-public.yml @@ -112,7 +112,7 @@ jobs: run: src/workflows/prune-for-preview-env.sh - name: 'Build and push image' - uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c + uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 with: context: . push: true diff --git a/.github/workflows/azure-preview-env-deploy.yml b/.github/workflows/azure-preview-env-deploy.yml index fd6fd2a918..91929613ea 100644 --- a/.github/workflows/azure-preview-env-deploy.yml +++ b/.github/workflows/azure-preview-env-deploy.yml @@ -171,7 +171,7 @@ jobs: run: src/workflows/prune-for-preview-env.sh - name: 'Build and push image' - uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c + uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 with: context: . push: true diff --git a/.github/workflows/azure-prod-build-deploy.yml b/.github/workflows/azure-prod-build-deploy.yml index bd1cc03963..b5cabc9afe 100644 --- a/.github/workflows/azure-prod-build-deploy.yml +++ b/.github/workflows/azure-prod-build-deploy.yml @@ -92,7 +92,7 @@ jobs: token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }} - name: 'Build and push image' - uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c + uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 with: context: . push: true diff --git a/.github/workflows/azure-staging-build-deploy.yml b/.github/workflows/azure-staging-build-deploy.yml index 1506b74f94..d92dad5ffe 100644 --- a/.github/workflows/azure-staging-build-deploy.yml +++ b/.github/workflows/azure-staging-build-deploy.yml @@ -91,7 +91,7 @@ jobs: run: src/early-access/scripts/merge-early-access.sh - name: 'Build and push image' - uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c + uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 with: context: . push: true diff --git a/.github/workflows/main-preview-docker-cache.yml b/.github/workflows/main-preview-docker-cache.yml index 01c8a64cfc..2c849dc057 100644 --- a/.github/workflows/main-preview-docker-cache.yml +++ b/.github/workflows/main-preview-docker-cache.yml @@ -68,7 +68,7 @@ jobs: run: src/workflows/prune-for-preview-env.sh - name: 'Build and push image' - uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c + uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 with: context: . push: true From 2844807aecadb6b9f7f808e0c53502f91badf34a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:57:58 -0700 Subject: [PATCH 26/58] Bump docker/setup-buildx-action from 3.4.0 to 3.5.0 (#51781) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/azure-preview-env-deploy-public.yml | 2 +- .github/workflows/azure-preview-env-deploy.yml | 2 +- .github/workflows/azure-prod-build-deploy.yml | 2 +- .github/workflows/azure-staging-build-deploy.yml | 2 +- .github/workflows/main-preview-docker-cache.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/azure-preview-env-deploy-public.yml b/.github/workflows/azure-preview-env-deploy-public.yml index 0c977f53cf..16320d0cdd 100644 --- a/.github/workflows/azure-preview-env-deploy-public.yml +++ b/.github/workflows/azure-preview-env-deploy-public.yml @@ -66,7 +66,7 @@ jobs: password: ${{ secrets.NONPROD_REGISTRY_PASSWORD }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 + uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 - name: Check out main branch uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/azure-preview-env-deploy.yml b/.github/workflows/azure-preview-env-deploy.yml index 91929613ea..f89a48ecae 100644 --- a/.github/workflows/azure-preview-env-deploy.yml +++ b/.github/workflows/azure-preview-env-deploy.yml @@ -79,7 +79,7 @@ jobs: password: ${{ secrets.NONPROD_REGISTRY_PASSWORD }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 + uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 - name: Check out PR code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/azure-prod-build-deploy.yml b/.github/workflows/azure-prod-build-deploy.yml index b5cabc9afe..c6e0539d34 100644 --- a/.github/workflows/azure-prod-build-deploy.yml +++ b/.github/workflows/azure-prod-build-deploy.yml @@ -49,7 +49,7 @@ jobs: password: ${{ secrets.PROD_REGISTRY_PASSWORD }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 + uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 - name: Check out repo uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/azure-staging-build-deploy.yml b/.github/workflows/azure-staging-build-deploy.yml index d92dad5ffe..33d9ed119c 100644 --- a/.github/workflows/azure-staging-build-deploy.yml +++ b/.github/workflows/azure-staging-build-deploy.yml @@ -57,7 +57,7 @@ jobs: password: ${{ secrets.NONPROD_REGISTRY_PASSWORD }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 + uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 - name: Check out repo uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/main-preview-docker-cache.yml b/.github/workflows/main-preview-docker-cache.yml index 2c849dc057..daa8fb7f3e 100644 --- a/.github/workflows/main-preview-docker-cache.yml +++ b/.github/workflows/main-preview-docker-cache.yml @@ -42,7 +42,7 @@ jobs: password: ${{ secrets.NONPROD_REGISTRY_PASSWORD }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 + uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 - name: Check out repo uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 From 70e8340723aefcf3e2d0908f71bd824c269e6167 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:02:09 +0000 Subject: [PATCH 27/58] Bump express-rate-limit from 7.3.0 to 7.4.0 (#51768) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1b2008de26..4334a2a4eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "dotenv": "^16.4.5", "escape-string-regexp": "5.0.0", "express": "4.19.2", - "express-rate-limit": "7.3.0", + "express-rate-limit": "7.4.0", "fastest-levenshtein": "1.0.16", "file-type": "19.1.0", "flat": "^6.0.1", @@ -6601,9 +6601,9 @@ } }, "node_modules/express-rate-limit": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.3.0.tgz", - "integrity": "sha512-ZPfWlcQQ1PsZonB/vqksOsBQV74z5osi/QcdoBCyKJXl/wOVjS1yRDmvkpMM52KJeLbiF2+djwVEnEgVCDdvtw==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.4.0.tgz", + "integrity": "sha512-v1204w3cXu5gCDmAvgvzI6qjzZzoMWKnyVDk3ACgfswTQLYiGen+r8w0VnXnGMmzEN/g8fwIQ4JrFFd4ZP6ssg==", "engines": { "node": ">= 16" }, diff --git a/package.json b/package.json index 95548ae3e8..e8f0a938fe 100644 --- a/package.json +++ b/package.json @@ -251,7 +251,7 @@ "dotenv": "^16.4.5", "escape-string-regexp": "5.0.0", "express": "4.19.2", - "express-rate-limit": "7.3.0", + "express-rate-limit": "7.4.0", "fastest-levenshtein": "1.0.16", "file-type": "19.1.0", "flat": "^6.0.1", From 38d62daa2da9c21bf23e76ee74b8f14772573582 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:13:01 -0700 Subject: [PATCH 28/58] Bump glob from 10.4.1 to 11.0.0 (#51766) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 146 +++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 41 insertions(+), 107 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4334a2a4eb..4a98e3bc08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "file-type": "19.1.0", "flat": "^6.0.1", "github-slugger": "^2.0.0", - "glob": "10.4.1", + "glob": "11.0.0", "got": "^13.0.0", "gray-matter": "^4.0.3", "hast-util-from-parse5": "^8.0.1", @@ -7170,21 +7170,22 @@ "license": "ISC" }, "node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", + "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", + "jackspeak": "^4.0.1", + "minimatch": "^10.0.0", "minipass": "^7.1.2", - "path-scurry": "^1.11.1" + "package-json-from-dist": "^1.0.0", + "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -7201,6 +7202,20 @@ "node": ">= 6" } }, + "node_modules/glob/node_modules/minimatch": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/globals": { "version": "11.12.0", "license": "MIT", @@ -8627,14 +8642,14 @@ } }, "node_modules/jackspeak": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", - "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", + "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, "engines": { - "node": ">=14" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -9311,11 +9326,11 @@ } }, "node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", + "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", "engines": { - "node": "14 || >=16.14" + "node": "20 || >=22" } }, "node_modules/magic-string": { @@ -10463,6 +10478,7 @@ "version": "9.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -11070,8 +11086,7 @@ "node_modules/package-json-from-dist": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", - "dev": true + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" }, "node_modules/parent-module": { "version": "1.0.1", @@ -11152,15 +11167,15 @@ "license": "MIT" }, "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -12693,7 +12708,7 @@ "integrity": "sha512-u+yqhM92LW+89cxUQK0SRyvXYQmyuKHx0jkx4W7KfwLGLqJnQM5031Uv1trE4gB9XEXBM/s6MxKlfW95IidqaA==", "dev": true, "dependencies": { - "glob": "^11.0.0" + "glob": "11.0.0" }, "bin": { "rimraf": "dist/esm/bin.mjs" @@ -12705,87 +12720,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/glob": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", - "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^4.0.1", - "minimatch": "^10.0.0", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^2.0.0" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/jackspeak": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", - "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", - "dev": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/rimraf/node_modules/lru-cache": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", - "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", - "dev": true, - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/path-scurry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", - "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", - "dev": true, - "dependencies": { - "lru-cache": "^11.0.0", - "minipass": "^7.1.2" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/robots-parser": { "version": "3.0.0", "dev": true, diff --git a/package.json b/package.json index e8f0a938fe..1336b0cf24 100644 --- a/package.json +++ b/package.json @@ -256,7 +256,7 @@ "file-type": "19.1.0", "flat": "^6.0.1", "github-slugger": "^2.0.0", - "glob": "10.4.1", + "glob": "11.0.0", "got": "^13.0.0", "gray-matter": "^4.0.3", "hast-util-from-parse5": "^8.0.1", From 23d285f4603f84cebd0e2a661ef3135934fdc294 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:15:18 -0700 Subject: [PATCH 29/58] Bump eslint-plugin-primer-react from 5.3.0 to 5.4.0 (#51767) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evan Bonsignori --- package-lock.json | 8 ++++---- package.json | 2 +- src/rest/components/RestCodeSamples.tsx | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a98e3bc08..c51d3522a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -137,7 +137,7 @@ "eslint-plugin-github": "^5.0.1", "eslint-plugin-import": "^2.29.1", "eslint-plugin-jsx-a11y": "^6.9.0", - "eslint-plugin-primer-react": "^5.3.0", + "eslint-plugin-primer-react": "^5.4.0", "event-to-promise": "^0.8.0", "graphql": "^16.9.0", "http-status-code": "^2.1.0", @@ -6205,9 +6205,9 @@ } }, "node_modules/eslint-plugin-primer-react": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-primer-react/-/eslint-plugin-primer-react-5.3.0.tgz", - "integrity": "sha512-Nw9pAZww4ZPgzffrvexbNytOkoyKm4RLOmrPio5VEZ5BIFNy+uLyiBE5WGRuig4a0KbbjjOM5haLCvC43daAvw==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-primer-react/-/eslint-plugin-primer-react-5.4.0.tgz", + "integrity": "sha512-t3F8RGOG+88SOZTjC5+ZBDhLIJitlRN4qkdRmwDuaL5mkxIA4LzyhLf4KfM595NwDan8mj37Fjbt3Nj04PxUDQ==", "dev": true, "dependencies": { "@styled-system/props": "^5.1.5", diff --git a/package.json b/package.json index 1336b0cf24..6766cd0835 100644 --- a/package.json +++ b/package.json @@ -353,7 +353,7 @@ "eslint-plugin-github": "^5.0.1", "eslint-plugin-import": "^2.29.1", "eslint-plugin-jsx-a11y": "^6.9.0", - "eslint-plugin-primer-react": "^5.3.0", + "eslint-plugin-primer-react": "^5.4.0", "event-to-promise": "^0.8.0", "graphql": "^16.9.0", "http-status-code": "^2.1.0", diff --git a/src/rest/components/RestCodeSamples.tsx b/src/rest/components/RestCodeSamples.tsx index 9162e6a7f0..ede5cc4d15 100644 --- a/src/rest/components/RestCodeSamples.tsx +++ b/src/rest/components/RestCodeSamples.tsx @@ -1,5 +1,6 @@ import { useState, useEffect, useRef, FormEvent } from 'react' -import { FormControl, Select, Tooltip, TabNav } from '@primer/react' +import { FormControl, Select, TabNav } from '@primer/react' +import { Tooltip } from '@primer/react/next' import { CheckIcon, CopyIcon } from '@primer/octicons-react' import Cookies from 'src/frame/components/lib/cookies' import cx from 'classnames' @@ -283,7 +284,7 @@ export function RestCodeSamples({ operation, slug, heading }: Props) {