Skip to content

git-node: add git-node-release #388

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
codebytere merged 16 commits into from
Apr 3, 2020
Merged

git-node: add git-node-release #388

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4e6da65
git-node: add git-node-release
codebytere Feb 26, 2020
8a3bb80
feat: verify Releaser status
codebytere Mar 1, 2020
7318bab
Address review feedback
codebytere Mar 1, 2020
cfda042
Add notables to commmit msg body
codebytere Mar 1, 2020
f09a47c
refactor: address review comments
codebytere Mar 2, 2020
09d5c0b
fix: update for new cli.prompt
codebytere Mar 2, 2020
ee51222
Create proposal branch automatically
codebytere Mar 3, 2020
f9c8cbb
Address some feedback from @mylesborins
codebytere Mar 11, 2020
7e8f11a
Automatically calculate version based on commits
codebytere Mar 11, 2020
15bbc23
fix: create release commit w/o markdown
codebytere Mar 11, 2020
6cda82a
fix: use changelog to determine new version
codebytere Mar 11, 2020
c0693d7
fix: use Current branch instead of master for LTS comparison
codebytere Mar 12, 2020
66d6a06
Move initial branchDiff to prepare
codebytere Mar 17, 2020
079b860
Remove push/pr automation
codebytere Mar 19, 2020
30dbaa8
Fix accidental splice removal
codebytere Mar 24, 2020
be4c952
Add changelog-maker dep per @rvagg feedback
codebytere Mar 24, 2020
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
Prev Previous commit
Next Next commit
fix: use changelog to determine new version
  • Loading branch information
@codebytere
codebytere committed Mar 11, 2020
commit 6cda82a2bf856073c6927375976836379ef6c3a3
20 changes: 6 additions & 14 deletions lib/prepare_release.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,11 @@ class ReleasePreparation {
patch: semver.patch(lastTagVersion)
};

const raw = this.getBranchDiff({
onlyNotableChanges: false,
comparisonBranch: `v${lastTagVersion}`
});
const changelog = this.getChangelog();

if (raw.includes('SEMVER-MAJOR')) {
if (changelog.includes('SEMVER-MAJOR')) {
newVersion = `${lastTag.major + 1}.0.0`;
} else if (raw.includes('SEMVER-MINOR')) {
} else if (changelog.includes('SEMVER-MINOR')) {
newVersion = `${lastTag.major}.${lastTag.minor + 1}.0`;
} else {
newVersion = `${lastTag.major}.${lastTag.minor}.${lastTag.patch + 1}`;
Expand Down Expand Up @@ -431,11 +428,11 @@ class ReleasePreparation {
branchDiffOptions = [
`${upstream}/${releaseBranch}`,
proposalBranch,
`--require-label=${notableLabels.join(',')}`,
`--require-label=${notableLabels.join(',')}`
];

if (opts.simple) {
branchDiffOptions.push('--simple')
branchDiffOptions.push('--simple');
}
} else {
const excludeLabels = [
Expand All @@ -451,15 +448,10 @@ class ReleasePreparation {
excludeLabels.push('semver-minor');
}

let comparisonBranch = 'master';
if (opts.comparisonBranch) {
comparisonBranch = opts.comparisonBranch;
}

branchDiffOptions = [
stagingBranch,
// TODO(codebytere): use Current branch instead of master for LTS
comparisonBranch,
'master',
`--exclude-label=${excludeLabels.join(',')}`,
'--filter-release'
];
Expand Down