From 811b7c913cf79d76a0e4fcb6c34967937d7b9877 Mon Sep 17 00:00:00 2001 From: Donald Labaj Date: Thu, 21 May 2026 09:24:22 -0400 Subject: [PATCH 1/5] fix: updated for patch releases --- .github/workflows/pr-preview.yml | 6 +++--- .github/workflows/release.yml | 2 +- release.config.js | 17 +++++++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml index afec6f84d6..6f91042683 100644 --- a/.github/workflows/pr-preview.yml +++ b/.github/workflows/pr-preview.yml @@ -25,10 +25,10 @@ jobs: git checkout tmp - run: | - git rev-parse origin/main + git rev-parse origin/6.5.x git rev-parse HEAD - git rev-parse origin/main..HEAD - git log origin/main..HEAD --format="%b" + git rev-parse origin/6.5.x..HEAD + git log origin/6.5.x..HEAD --format="%b" # Yes, we really want to checkout the PR # Injected by generate-workflows.js diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 63cf57fc59..0f09b08e7c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: release on: push: branches: - - main + - 6.5.x jobs: build-deploy: if: "!contains(github.event.head_commit.message, 'ci skip')" diff --git a/release.config.js b/release.config.js index 7b7b50fbe3..7fe3a0635a 100644 --- a/release.config.js +++ b/release.config.js @@ -2,25 +2,26 @@ module.exports = { branches: [ 'do-not-delete', { name: 'v5', channel: 'prerelease-v5', range: '5.x' }, - { name: 'main', channel: 'prerelease', prerelease: 'prerelease' } + { name: 'main', channel: 'prerelease', prerelease: 'prerelease' }, + { name: '6.5.x', channel: 'prerelease-bugfix', range: '6.5.x' } ], analyzeCommits: { preset: 'angular' }, plugins: [ - [ - '@semantic-release/commit-analyzer', + ['@semantic-release/commit-analyzer', { preset: 'angular', - parserOpts: { - noteKeywords: ['BREAKING-CHANGE'] - } + releaseRules: [ + { type: 'feat', release: 'patch' }, + { type: 'fix', release: 'patch' } + ] } ], '@semantic-release/release-notes-generator', '@semantic-release/github', ['@semantic-release/npm', { pkgRoot: 'dist' }] ], - tagFormat: 'prerelease-v${version}', - dryRun: false + tagFormat: 'patch-v${version}', + dryRun: true }; From 8ef00cd4a267d86cac40a66a6bbdf315060560d1 Mon Sep 17 00:00:00 2001 From: Donald Labaj Date: Thu, 21 May 2026 10:23:30 -0400 Subject: [PATCH 2/5] fix: update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c81dbd219..55d90acb58 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # PatternFly - + ## Contributing We welcome contributions to PatternFly! Please read our [Contributing Guide](https://pf-core-staging.patternfly.org/contribution) to learn how to get started, submit issues, and contribute code to the project. From f3874f3006f2e8eecbe76f2fd435d879557ec672 Mon Sep 17 00:00:00 2001 From: Donald Labaj Date: Thu, 21 May 2026 11:04:48 -0400 Subject: [PATCH 3/5] fix: updated semantic releaseA --- release.config.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/release.config.js b/release.config.js index 7fe3a0635a..9c5e3e838c 100644 --- a/release.config.js +++ b/release.config.js @@ -1,9 +1,12 @@ module.exports = { + // Branch order is significant: each line must be lower than the next. Maintenance + // lines (5.x, 6.5.x) must appear before `main`, or semantic-release intersects ranges + // incorrectly and fails with EINVALIDNEXTVERSION (e.g. ">=6.5.0 <5.4.0"). branches: [ 'do-not-delete', { name: 'v5', channel: 'prerelease-v5', range: '5.x' }, - { name: 'main', channel: 'prerelease', prerelease: 'prerelease' }, - { name: '6.5.x', channel: 'prerelease-bugfix', range: '6.5.x' } + { name: '6.5.x', channel: 'prerelease-bugfix', range: '6.5.x' }, + { name: 'main', channel: 'prerelease', prerelease: 'prerelease' } ], analyzeCommits: { preset: 'angular' @@ -22,6 +25,5 @@ module.exports = { '@semantic-release/github', ['@semantic-release/npm', { pkgRoot: 'dist' }] ], - tagFormat: 'patch-v${version}', - dryRun: true + tagFormat: 'patch-v${version}' }; From d8c920789d30791db3b2e05bce68702196f61201 Mon Sep 17 00:00:00 2001 From: Donald Labaj Date: Thu, 21 May 2026 11:27:47 -0400 Subject: [PATCH 4/5] fix: fixed error with api rate limiting --- release.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.config.js b/release.config.js index 9c5e3e838c..1dc291333b 100644 --- a/release.config.js +++ b/release.config.js @@ -22,7 +22,7 @@ module.exports = { } ], '@semantic-release/release-notes-generator', - '@semantic-release/github', + ['@semantic-release/github', { successComment: false, failComment: false }], ['@semantic-release/npm', { pkgRoot: 'dist' }] ], tagFormat: 'patch-v${version}' From 67d8e2a61ddbbf796b1b8c4383662889a3f410cd Mon Sep 17 00:00:00 2001 From: Donald Labaj Date: Thu, 21 May 2026 12:07:14 -0400 Subject: [PATCH 5/5] fix: updated range --- release.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.config.js b/release.config.js index 1dc291333b..e6a70ec95d 100644 --- a/release.config.js +++ b/release.config.js @@ -5,7 +5,7 @@ module.exports = { branches: [ 'do-not-delete', { name: 'v5', channel: 'prerelease-v5', range: '5.x' }, - { name: '6.5.x', channel: 'prerelease-bugfix', range: '6.5.x' }, + { name: '6.5.x', channel: 'prerelease-bugfix', range: '>=6.5.0 <6.6.0' }, { name: 'main', channel: 'prerelease', prerelease: 'prerelease' } ], analyzeCommits: {