Skip to content

fix(is-production): crucial fix to detect main correctly as production #66

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
Sep 11, 2025
Merged

fix(is-production): crucial fix to detect main correctly as production #66

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
8c1d1ca
fix(is-production): crucial fix to detect `main` correctly as production
mumenthalers Sep 11, 2025
67265eb
build(release): next version [skip_build]
actions-user Sep 11, 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
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/branch-utilities/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shiftcode/branch-utilities",
"version": "5.0.1",
"version": "5.0.2-pr65.0",
"description": "Utilities for local and ci to get branch name and stage",
"repository": "https://github.com/shiftcode/sc-commons-public",
"license": "MIT",
Expand Down
29 changes: 28 additions & 1 deletion packages/branch-utilities/src/lib/base.utils.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BranchInfo, getBranchInfo, parseBranchName } from './base.utils.js'
import { BranchInfo, getBranchInfo, isProduction, isPullRequest, parseBranchName } from './base.utils.js'
import { CustomGitHubContext, GithubActionEnv, GitHubContext } from './types/index.js'
import { CustomScOverrideEnv } from './types/sc-override-env-var.type.js'

Expand Down Expand Up @@ -109,4 +109,31 @@ describe('base utils', () => {
expect(() => parseBranchName('feat/copilot/fix-123')).toThrow()
})
})

describe('isProduction', () => {
test.each([
['main', true],
['master', true],
['prod', false],
['xx1', false],
['pr1', false],
['pr1-main', false],
['xx1-master', false],
])("when '%s' it returns %s", (stageName, expected) => {
expect(isProduction(stageName)).toBe(expected)
})
})

describe('isPullRequest', () => {
test.each([
['pr1', true],
['pr123456', true],
['xx1', false],
['xx123', false],
['main', false],
['master', false],
])("when '%s' it returns %s", (stageName, expected) => {
expect(isPullRequest(stageName)).toBe(expected)
})
})
})
2 changes: 1 addition & 1 deletion packages/branch-utilities/src/lib/base.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export function parseBranchName(branchName: string): { branchId: number; branchN
* @return returns true if the stage is 'master' or 'main', false if not
*/
export function isProduction(stageName: string): boolean {
return REGEX_MASTER.test(stageName) ?? REGEX_MAIN.test(stageName)
return REGEX_MASTER.test(stageName) || REGEX_MAIN.test(stageName)
}

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/publish-helper/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shiftcode/publish-helper",
"version": "4.1.1",
"version": "4.1.2-pr65.0",
"description": "scripts for conventional (pre)releases",
"repository": "https://github.com/shiftcode/sc-commons-public",
"license": "MIT",
Expand Down Expand Up @@ -32,7 +32,7 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@shiftcode/branch-utilities": "^5.0.1",
"@shiftcode/branch-utilities": "^5.0.2-pr65.0",
"@types/yargs": "^17.0.32"
},
"peerDependencies": {
Expand Down