From 7828c9d9674e9595d6fe34f16466449bfa02ffa7 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Wed, 1 Oct 2025 06:51:44 -0700
Subject: [PATCH] Fix update changelog script

---
 .github/workflows/update-changelog.yml | 4 ++--
 CHANGELOG.md                           | 5 +++++
 tasks/snapTasks.ts                     | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 59cd6a659..8f3bc0536 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -25,9 +25,9 @@ jobs:
           node-version: '20.x'
       - name: Install dependencies
         run: npm ci
-      - name: Update version.json
+      - name: Update CHANGELOG
         run: npx gulp updateChangelog
-      - name: Create version update PR
+      - name: Create update PR
         uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fa3f4dda..7cd76e087 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # 2.94.x
+* Update RoslynCopilot url to 18.0.797-alpha (PR: [#8652](https://github.com/OmniSharp/omnisharp-vscode/pull/8652))
+* Fix GH action (PR: [#8662](https://github.com/OmniSharp/omnisharp-vscode/pull/8662))
+* Adds a new GH action to update the CHANGELOG (PR: [#8658](https://github.com/OmniSharp/omnisharp-vscode/pull/8658))
+* Do not run legacy Razor tests in CI (PR: [#8656](https://github.com/OmniSharp/omnisharp-vscode/pull/8656))
+* Update third party notices for currently shipped version (PR: [#8653](https://github.com/OmniSharp/omnisharp-vscode/pull/8653))
 * Bump xamlTools to 18.0.11016.94 (PR: [#8665](https://github.com/dotnet/vscode-csharp/pull/8665))
 * Bump Roslyn to 5.1.0-1.25475.3 (PR: [#8665](https://github.com/dotnet/vscode-csharp/pull/8665))
   * Fix index out of bounds producing diagnostic in error recovery scenario (PR: [#80391](https://github.com/dotnet/roslyn/pull/80391))
diff --git a/tasks/snapTasks.ts b/tasks/snapTasks.ts
index b284d2cb0..bea8efa28 100644
--- a/tasks/snapTasks.ts
+++ b/tasks/snapTasks.ts
@@ -141,10 +141,10 @@ gulp.task('updateChangelog', async (): Promise<void> => {
     fs.writeFileSync(changelogPath, changelogLines.join(os.EOL));
 });
 
-const prRegex = /^\*.+\(PR: \[#(\d+)\]\(/g;
+const prRegex = /^\*.+\(PR: \[#(\d+)\]\(/;
 
 function findNextVersionHeaderLine(changelogLines: string[], startLine: number = 0): [number, string] {
-    const headerRegex = /^#\s(\d+\.\d+)\.(x|\d+)$/gm;
+    const headerRegex = /^#\s(\d+\.\d+)\.(x|\d+)$/;
     for (let i = startLine; i < changelogLines.length; i++) {
         const line = changelogLines.at(i);
         const match = headerRegex.exec(line!);
@@ -160,7 +160,7 @@ function getPrIdsBetweenHeaders(changelogLines: string[], startLine: number, end
     for (let i = startLine; i < endLine; i++) {
         const line = changelogLines.at(i);
         const match = prRegex.exec(line!);
-        if (match && match[1]) {
+        if (match) {
             prs.push(match[1]);
         }
     }