Skip to content
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

Fix getVersionDescription() to prioritize version tags over non-version tags #673

Merged
merged 5 commits into from
Oct 7, 2024
Merged

Fix getVersionDescription() to prioritize version tags over non-version tags #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da6189b
Fix getVersionDescription() to prioritize version tags over non-versi…
OctopBP Oct 3, 2024
b80318f
Update versioning.ts
OctopBP Oct 4, 2024
bd58cbe
Fix formatting
OctopBP Oct 5, 2024
dd91755
Revert "dist"
OctopBP Oct 5, 2024
b6aaa7c
Revert "dist"
OctopBP Oct 5, 2024
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
12 changes: 11 additions & 1 deletion dist/index.js
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 dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 15 additions & 1 deletion src/model/versioning.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,21 @@ export default class Versioning {
* identifies the current commit.
*/
static async getVersionDescription() {
return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
const versionTags = (await this.git(['tag', '--list', '--merged', 'HEAD', '--sort=-creatordate']))
.split('\n')
.filter((tag) => new RegExp(this.grepCompatibleInputVersionRegex).test(tag));

if (versionTags.length === 0) {
core.warning('No valid version tags found. Using fallback description.');

return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
}

const latestVersionTag = versionTags[0];
const commitsCount = (await this.git(['rev-list', `${latestVersionTag}..HEAD`, '--count'])).trim();
const commitHash = (await this.git(['rev-parse', '--short', 'HEAD'])).trim();

return `${latestVersionTag}-${commitsCount}-g${commitHash}`;
}

/**
Expand Down
Loading