From bd58cbedf7e9f6928ab3b7ca6dd858622c5c1f13 Mon Sep 17 00:00:00 2001 From: Boris Proshin Date: Sat, 5 Oct 2024 14:59:19 +0300 Subject: [PATCH] Fix formatting --- dist/index.js | Bin 22303572 -> 22304246 bytes dist/index.js.map | Bin 14784413 -> 14785148 bytes src/model/versioning.ts | 8 +++++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dist/index.js b/dist/index.js index ea151c67a187477aceda8e5c55cc091164df72c1..4d073c7c15068ac5b571377ef07e913d2fff2fda 100644 GIT binary patch delta 1937 zcmZwHc~}%>9Ki91V*t54P(b7u72QSH6%`LeK;#ewQ4lDk71m{0Her``2GEGKqO`2Q z4#)1>4lALvcvBC*6!o`6MdeZ9`|`Z-)Cl?_xZgu?;m?$+hFL??SrA~ zyZyTTy92rdcPdpj!&B%VWb~IS!IhPEm!@W`W_yR-t*d&ITeG^{y1CY*+g+wK)nu_W zyET32s>SJZIUD4Dd;C&uQ1az6QJQG}%&&9VI<6Mr&$lxUnLtKO&Y< zDQb3(>T!0c6;4;-npX3%jf|B=N>W&gRd;H-Sr!?66-smfuVn1s=bvb#R|hCt>XeX7 zQ<+z7w>P^R)OM#&b9+51t2MRJ+vaJos#TiX<5C;#&CRRqj@4>|Q*-#-tvbuBM)}r| zc*AZ}a*d74Ln4jdzOdkRyriaA4-H~3zW(@BZnWBTTUMxg{O9m`G+lLgTUy+@md|eb zNsr3sY(H^I^~s&h|C`@swaRhTA3IEkw=LYGb4Gl%&)s4+Ht$wqLW=ELlT0=a)hKG9 z*5vgWd+L-pflz0xPB> z9n&x!GmwFqn1$JxgG|gt7Um%vImpF)o_8Sp`ajyANT18cAr zXQC5lp$lhY9oFLl`N5z UNtQ~MNy;S^e!KWb@#{VEFFXiqaR2}S delta 1460 zcmWmES6B`J0EOYF@>d$7p|Z*YJ}0mXlgVw=GkUQZkB#+k4?s*=7#W$w4F|_<5E%$Foy*!kr!65 zh7D|y4|d3p0&;r;-EMxPD(+=S#eQZl|o8krHE2g zDWvc^GQa!> DnnXrO diff --git a/dist/index.js.map b/dist/index.js.map index f243b1f68908fd868dda2ce7759d2af13102f607..6e813aabe183026722895ea070d7ab5e81acbe6e 100644 GIT binary patch delta 1421 zcmZwDTU1n49LMnm0s~$`9YhRpHbf1R&S+?PYYiB2Q1Dt5sY#7y7b?x}X{Fty^3htXeDSTd@;hogw0iig_1}B#{onilYd_Rv`Mamd za=5FtrL3T}cgo)ZPVwUixi?LD0my;75!op`NUdBR#4AKmDP+Z`8MZ}N0DdphF~ zk3mR4B9dT1GEy)YLogJ>a1&B793wCiR-|DR(lHtt7=xRUi7aGeENoFvr|6z5J!K+E zPS}-cNvcr%hH%T(e~GMufM%HX@xtzO236g!`eJoy$*eio_l&S^x}9EKRm`yNQ%u!f z<&Yia-RZKZICr>=Y`u^m|H-nYWSENIA>4%`q^=bURe#C4NWNL887{f(oUjdZxJ=bB z^J9k`Gh|M2?Wp()MV{SxK23Jy+lKDw$xM`yKSgqieSTQfD*??XTP_OgSeK|Yw2)ua zDuFtkZP0-gzUB>b!=)f4VffT(MxPuZ87}-6ISp z)3ud)O4ec6bEu0xHFl}ziV{* z|J{hSZme!D?-$5HE^a{{ZpCe|BOeajj&T?dCtR3-iMRs=n1so=6L(<>reYeVV+QVq z8-Js7h{y0aHeoZi zpb5>`iYM?Sp2E|32G8O-Y(opSqZQBN1?+&ti+Bk;(T11Nj$PP|4s>D<_F^CQ;{Xog z6}*ZryoT4&jW=)zhj9dN;wXCX7T!h_$8a3)-~`^qdw3ropcfzFBYcdLIE7De8lU1b ue2y>hCBDMf_y%Wi7T@AKe2;TDk00S)TrO|mxW(&kDi;Rd*3nr!oGnv^eW;L7H4Ks(~ zMwrt`bD7&b<~5)BEnt)dEo5PfSkz(`w}d4vW$92_FghtVkUqRYWFY-dbWGq$QrY5( zaet#NV_C~t-U?Qsj9hHnfqAZDLcK+1wVkw3RWowvBCV zXL~!?(N1=@i(TzzcY7FXPkR|>Z~NHSe)e~O10CdGhd9(>4tInj9pz}pIM#8FcY+h0 zzVfwieCs>k`@xTX^0Qz3>Nmgp O!=L^N#r^$VHT6Gx%njH8 diff --git a/src/model/versioning.ts b/src/model/versioning.ts index 15a924af..a0ac3675 100644 --- a/src/model/versioning.ts +++ b/src/model/versioning.ts @@ -209,16 +209,18 @@ export default class Versioning { static async getVersionDescription() { const versionTags = (await this.git(['tag', '--list', '--merged', 'HEAD', '--sort=-creatordate'])) .split('\n') - .filter(tag => new RegExp(this.grepCompatibleInputVersionRegex).test(tag)); - + .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}`; }