Skip to content

Fix update changelog script #8671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2025
Merged

Fix update changelog script #8671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7828c9d
Fix update changelog script
JoeRobich Oct 1, 2025
9f72bec
Merge branch 'main' into dev/jorobich/fix-changelog
JoeRobich Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/update-changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The corrected regexes found these additional PRs.

* 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.11023.10 (PR: [#8669](https://github.com/dotnet/vscode-csharp/pull/8669))
* 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))
Expand Down
6 changes: 3 additions & 3 deletions tasks/snapTasks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+)\]\(/;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the g (global) flag was not only unnecessary since we are looking one line at a time but it also meant the regex was stateful and needed to be reset as it is intended to be rerun on the same string finding additional matches.


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!);
Expand All @@ -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]);
}
}
Expand Down