Skip to content

Commit 5d129c4

Browse files
authored
Merge pull request #37236 from github/repo-sync
Repo sync
2 parents 45d6be3 + 9f3284e commit 5d129c4

22 files changed

+14
-105
lines changed

.github/actions/install-cocofix/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ runs:
1818
npm install --no-save \
1919
'--@github:registry=https://npm.pkg.github.com' \
2020
'--//npm.pkg.github.com/:_authToken=${TOKEN}' \
21-
@github/cocofix
21+
@github/cocofix codeql-ts

.github/workflows/generate-code-scanning-query-lists.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
8888
- name: Build code scanning query list
8989
run: |
90-
for lang in "cpp" "csharp" "go" "java" "javascript" "python" "ruby" "swift"; do
90+
for lang in "actions" "cpp" "csharp" "go" "java" "javascript" "python" "ruby" "swift"; do
9191
echo "Generating code scanning query list for $lang"
9292
npm run generate-code-scanning-query-list -- \
9393
--verbose \

content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ You can customize your {% data variables.product.prodname_codeql %} analysis by
6363
{% data reusables.repositories.navigate-to-repo %}
6464
{% data reusables.repositories.sidebar-settings %}
6565
{% data reusables.repositories.navigate-to-code-security-and-analysis %}
66-
1. Scroll down to "{% data variables.product.UI_code_security_scanning %}", select **Set up** {% octicon "triangle-down" aria-hidden="true" %}, then click **Advanced**.
66+
1. Scroll down to "{% data variables.product.UI_code_security_scanning %}", in the "{% data variables.product.prodname_codeql %} analysis" row select **Set up** {% octicon "triangle-down" aria-hidden="true" %}, then click **Advanced**.
6767

6868
> [!NOTE]
69-
> If you are switching from default setup to advanced setup, in the "{% data variables.product.UI_code_security_scanning %}" section, select {% octicon "kebab-horizontal" aria-label="Menu" %}, then click **{% octicon "workflow" aria-hidden="true" %} Switch to advanced**. In the pop-up window that appears, click **Disable {% data variables.product.prodname_codeql %}**.
69+
> If you are switching from default setup to advanced setup, in the "{% data variables.product.prodname_codeql %} analysis" row, select {% octicon "kebab-horizontal" aria-label="Menu" %}, then click **{% octicon "workflow" aria-hidden="true" %} Switch to advanced**. In the pop-up window that appears, click **Disable {% data variables.product.prodname_codeql %}**.
7070
7171
{% ifversion ghas-products %}
7272

@@ -120,6 +120,8 @@ For information on bulk enablement, see [AUTOTITLE](/code-security/code-scanning
120120

121121
![Screenshot showing a workflow template file open for editing. The "Documentation" button is highlighted with an orange outline.](/assets/images/help/security/actions-workflows-documentation.png)
122122

123+
1. When you have finished defining your configuration, add the new workflow to your default branch.
124+
123125
For more information, see [AUTOTITLE](/actions/learn-github-actions/using-starter-workflows#choosing-and-using-a-starter-workflow) and [AUTOTITLE](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning).
124126

125127
{% endif %}

content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,20 @@ If you need to change any other aspects of your {% data variables.product.prodna
3333
1. In the "{% data variables.product.prodname_codeql %} analysis" row of the "{% data variables.product.UI_code_security_scanning %}" section, select {% octicon "kebab-horizontal" aria-label="Menu" %}, then click **{% octicon "gear" aria-hidden="true" %} View {% data variables.product.prodname_codeql %} configuration**.
3434
1. In the "{% data variables.product.prodname_codeql %} default configuration" window, click **{% octicon "pencil" aria-hidden="true" %} Edit**.
3535
1. Optionally, in the "Languages" section, select or deselect languages for analysis.
36-
1. Optionally, in the "Query suite" row of the "Scan settings" section, select a different query suite to run against your code.{% ifversion codeql-threat-models %}
36+
1. Optionally, in the "Query suite" row of the "Scan settings" section, select a different query suite to run against your code.
3737

3838
{% ifversion code-scanning-default-setup-customize-labels %}
3939

4040
1. Optionally, to use labeled runners, in the "Runner type" section of the "{% data variables.product.prodname_codeql %} default configuration" modal dialog, select **Standard {% data variables.product.company_short %} runner** {% octicon "triangle-down" aria-hidden="true" %} to open a dropdown menu, then select **Labeled runner**. Then, next to "Runner label", enter the label of an existing self-hosted or {% data variables.product.company_short %}-hosted runner. For more information, see [AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning#assigning-labels-to-runners).
4141

4242
{% endif %}
4343

44-
1. ({% data variables.release-phases.public_preview_caps %}) Optionally, in the "Threat model" row of the "Scan settings" section, select **Remote and local sources**.
44+
{% ifversion codeql-threat-models %}
45+
46+
1. ({% data variables.release-phases.public_preview_caps %}) Optionally, in the "Threat model" row of the "Scan settings" section, select **Remote and local sources**. This option is only available for repositories with code in a supported language: {% data variables.code-scanning.code_scanning_threat_model_support %}.
47+
4548
{% endif %}
49+
4650
1. To update your configuration, as well as run an initial analysis of your code with the new configuration, click **Save changes**. All future analyses will use your new configuration.
4751

4852
## Defining the alert severities that cause a check failure for a pull request

data/features/security-feature-enablement-policies.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

data/features/security-log-oauth-access-tokens.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

data/features/security-overview-org-risk-coverage-enterprise.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

data/features/security-overview-org-risk-coverage.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

data/features/security-overview-team-write-access.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

data/features/server-statistics.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

data/features/slack-and-team-integrations.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

data/features/ssh-cert-policy-allow-u2s-tokens.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

data/features/streaming-datadog.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

data/features/syncing-fork-web-ui.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

data/features/target-runner-groups.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

data/features/team-discussions-migration.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

data/features/team-mentions-setting.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

data/features/token-audit-log.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

data/features/totp-and-mobile-sudo-challenge.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

data/features/upload-expired-or-revoked-gpg-key.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

data/features/workflow-nav-2022.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/code-scanning/scripts/generate-code-scanning-query-list.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ import chalk from 'chalk'
5555
import { program } from 'commander'
5656
// We don't want to introduce a global dependency on @github/cocofix, so we install it by hand
5757
// as described above and suppress the import warning.
58-
import { getSupportedQueries } from '@github/cocofix/dist/querySuites.js' // eslint-disable-line import/no-extraneous-dependencies
59-
import { type Language } from '@github/cocofix/dist/codeql' // eslint-disable-line import/no-extraneous-dependencies
58+
import { getSupportedQueries } from '@github/cocofix/dist/querySuites.js' /* eslint-disable-line import/no-extraneous-dependencies, import/no-unresolved */
59+
import type { Language } from 'codeql-ts'
6060

6161
program
6262
.description('Generate a reusable Markdown for for a code scanning query language')

0 commit comments

Comments
 (0)