Skip to content

Commit 9237179

Browse files
authored
Merge pull request #53713 from github/repo-sync
Repo sync
2 parents 9eb562c + d1e2842 commit 9237179

File tree

7 files changed

+18
-9
lines changed

7 files changed

+18
-9
lines changed

content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you're new to SARIF and want to learn more, see Microsoft's [`SARIF tutorials
3535

3636
## Providing data to track {% data variables.product.prodname_code_scanning %} alerts across runs
3737

38-
Each time the results of a new code scan are uploaded, the results are processed and alerts are added to the repository. To prevent duplicate alerts for the same problem, {% data variables.product.prodname_code_scanning %} uses fingerprints to match results across various runs so they only appear once in the latest run for the selected branch. This makes it possible to match alerts to the correct line of code when files are edited. The `ruleID` for a result has to be the same across analysis.
38+
Each time the results of a new code scan are uploaded, the results are processed and alerts are added to the repository. To prevent duplicate alerts for the same problem, {% data variables.product.prodname_code_scanning %} uses fingerprints to match results across various runs so they only appear once in the latest run for the selected branch. This makes it possible to match alerts to the correct line of code when files are edited. The `ruleId` for a result has to be the same across analysis.
3939

4040
### Reporting consistent filepaths
4141

@@ -536,7 +536,7 @@ This SARIF output file has example values to show all supported SARIF properties
536536
{
537537
"ruleId": "R01",
538538
"message": {
539-
"text": "Specifying both [ruleIndex](1) and [ruleID](2) might lead to inconsistencies."
539+
"text": "Specifying both [ruleIndex](1) and [ruleId](2) might lead to inconsistencies."
540540
},
541541
"level": "error",
542542
"locations": [

content/copilot/using-github-copilot/getting-code-suggestions-in-your-ide-with-github-copilot.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ This guide demonstrates how to get coding suggestions from {% data variables.pro
445445
{% data variables.product.prodname_copilot %} offers coding suggestions as you type. For example, type this function
446446
signature in a Swift file:
447447

448-
```shell copy
449-
func CalculateDaysBetweenDates(
448+
```swift copy
449+
func calculateDaysBetweenDates(
450450
```
451451

452452
{% data variables.product.prodname_copilot %} will automatically suggest an entire function body in grayed text. To accept the first line of a suggestion, press <kbd>Tab</kbd>. To view the full suggestion, hold <kbd>Option</kbd>, and to accept the full suggestion, press <kbd>Option</kbd>+<kbd>Tab</kbd>.

content/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks.md

+3
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ This will display the code block with syntax highlighting:
6666

6767
![Screenshot of three lines of Ruby code as displayed on {% data variables.product.prodname_dotcom %}. Elements of the code display in purple, blue, and red type for scannability.](/assets/images/help/writing/code-block-syntax-highlighting-rendered.png)
6868

69+
> [!TIP]
70+
> When you create a fenced code block that you also want to have syntax highlighting on a GitHub Pages site, use lower-case language identifiers. For more information, see [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll#syntax-highlighting).
71+
6972
We use [Linguist](https://github.com/github-linguist/linguist) to perform language detection and to select [third-party grammars](https://github.com/github-linguist/linguist/blob/main/vendor/README.md) for syntax highlighting. You can find out which keywords are valid in [the languages YAML file](https://github.com/github-linguist/linguist/blob/main/lib/linguist/languages.yml).
7073

7174
## Creating diagrams

content/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll.md

+3
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ To make your site easier to read, code snippets are highlighted on {% data varia
110110

111111
By default, code blocks on your site will be highlighted by Jekyll. Jekyll uses the [Rouge](https://github.com/rouge-ruby/rouge) highlighter (which is compatible with [Pygments](https://pygments.org/)). If you specify Pygments in your `_config.yml` file, Rouge will be used as the fallback instead. Jekyll cannot use any other syntax highlighter, and you'll get a page build warning if you specify another syntax highlighter in your `_config.yml` file. For more information, see [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/about-jekyll-build-errors-for-github-pages-sites).
112112

113+
> [!NOTE]
114+
> Rouge only recognizes lower-case language identifiers for fenced code blocks. For a list of supported languages, see [Languages](https://rouge-ruby.github.io/docs/file.Languages.html).
115+
113116
If you want to use another highlighter, such as [highlight.js](https://github.com/highlightjs/highlight.js), you must disable Jekyll's syntax highlighting by updating your project's `_config.yml` file.
114117

115118
```yaml

content/webhooks/using-webhooks/automatically-redelivering-failed-deliveries-for-a-github-app-webhook.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- name: Setup Node.js
7777
uses: {% data reusables.actions.action-setup-node %}
7878
with:
79-
node-version: '18.x'
79+
node-version: '20.x'
8080

8181
# This step installs the octokit library. The script that this workflow will run uses the octokit library.
8282
- name: Install dependencies
@@ -98,18 +98,18 @@ jobs:
9898
WORKFLOW_REPO: {% raw %}${{ github.event.repository.name }}{% endraw %}
9999
WORKFLOW_REPO_OWNER: {% raw %}${{ github.repository_owner }}{% endraw %}
100100
run: |
101-
node .github/workflows/scripts/redeliver-failed-deliveries.js
101+
node .github/workflows/scripts/redeliver-failed-deliveries.mjs
102102
```
103103
104104
## Adding the script
105105
106106
This section demonstrates how you can write a script to find and redeliver failed deliveries.
107107
108-
Copy this script into a file called `.github/workflows/scripts/redeliver-failed-deliveries.js` in the same repository where you saved the {% data variables.product.prodname_actions %} workflow file above.
108+
Copy this script into a file called `.github/workflows/scripts/redeliver-failed-deliveries.mjs` in the same repository where you saved the {% data variables.product.prodname_actions %} workflow file above.
109109

110110
```javascript copy annotate
111111
// This script uses {% data variables.product.company_short %}'s Octokit SDK to make API requests. For more information, see "[AUTOTITLE](/rest/guides/scripting-with-the-rest-api-and-javascript)."
112-
const { App, Octokit } = require("octokit");
112+
import { App, Octokit } from "octokit";
113113
114114
//
115115
async function checkAndRedeliverWebhooks() {

data/code-languages.yml

+3
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ shell:
6161
sql:
6262
name: SQL
6363
comment: hyphen
64+
swift:
65+
name: Swift
66+
comment: slash
6467
text:
6568
name: Text
6669
comment: number
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
> [!NOTE]
2-
> This event will only trigger a workflow run if the workflow file is on the default branch.
2+
> This event will only trigger a workflow run if the workflow file exists on the default branch.

0 commit comments

Comments
 (0)