Merge to v4 2024 10 03 01 (#67)

merge v4-beta to v4

actions/detect-version/src/main.ts

@@ -28,7 +28,7 @@ async function genDevVersion(
   baseRef: string
 ): Promise<version.versionInfo> {
   const currentRefName = process.env.GITHUB_REF_NAME as string
-  const sanitizedRefName = utils.sanitizeVersionInput(currentRefName)
+  const sanitizedRefName = version.sanitize(currentRefName)
   const count = await git.countCommits(baseRef, 'HEAD')
 
   return {
@@ -48,9 +48,8 @@ async function loadBranchVersions(targetBranch: string): Promise<void> {
   const runNumber: string = process.env.GITHUB_RUN_NUMBER as string
   const currentSha: string = await git.resolveRef('HEAD')
   const currentVersionStr = `${runNumber}-${currentSha.substring(0, 8)}`
-  const sanitizedRefName = utils.sanitizeVersionInput(currentVersionStr)
 
-  const currentVersion = version.parse(sanitizedRefName)
+  const currentVersion = version.sanitize(currentVersionStr)
   const isRelease = refType === 'branch' && refName === targetBranch
   const isBranchHead = await utils.isBranchHead()
 
@@ -83,8 +82,7 @@ async function getSanitizedVersion(
 ): Promise<version.versionInfo | null> {
   const originalVersion = knownVersions[tag]
   if (originalVersion && originalVersion.original) {
-    const sanitizedStr = utils.sanitizeVersionInput(originalVersion.original)
-    return version.parse(sanitizedStr)
+    return version.sanitize(originalVersion.original)
   }
   // Handle the case where version parsing fails or original is missing
   return null

actions/detect-version/src/utils.ts

@@ -89,14 +89,6 @@ export function isLatestMajor(
   }
   return false
 }
-/**
- Check an input string and replace all characters that
- do not conform to semantic versioning (semver) criteria with the - character
- */
-export function sanitizeVersionInput(input: string): string {
-  const regex = /[^0-9A-Za-z.+-]/g
-  return input.replace(regex, '-')
-}
 
 /**
  Filter out tags that are not valid semantic versions