Changed tag order
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing

This commit is contained in:
Julien Valverdé
2023-09-01 03:53:22 +02:00
parent 2a09ad800d
commit f5e6751136
2 changed files with 10 additions and 13 deletions

View File

@@ -10,8 +10,8 @@ export class DefaultMatcher
match(ref: GitRef) {
return Effect.succeed(
Option.some([
ref.name,
`${ ref.name }-${ ref.commit }`,
ref.name,
] as DockerTag[])
)
}

View File

@@ -1,5 +1,5 @@
import { Effect, Option } from "effect"
import { isEmpty, reverse, tail } from "lodash-es"
import { initial, isEmpty } from "lodash-es"
import semver from "semver"
import { GitRef, GitTagRef } from "../git"
import { DockerTag } from "../tags"
@@ -17,12 +17,12 @@ export class SemVerMatcher
return Option.some(
!prerelease ? [
"latest",
...this.generateTags([
semver.major(ref.name),
semver.minor(ref.name),
semver.patch(ref.name),
]),
"latest",
] :
this.generateTags(prerelease).map(tag =>
`${ semver.coerce(ref.name) }-${ tag }` as DockerTag
@@ -41,16 +41,13 @@ export class SemVerMatcher
Effect.succeed(Option.none())
}
private generateTags(numbers: readonly (string | number)[]) {
const rec = (numbers: readonly (string | number)[]): DockerTag[] =>
isEmpty(numbers)
? []
: [
...rec( tail(numbers) ),
reverse(numbers).join(".") as DockerTag,
]
return rec( reverse(numbers) )
private generateTags(numbers: readonly (string | number)[]): DockerTag[] {
return isEmpty(numbers)
? []
: [
numbers.join(".") as DockerTag,
...this.generateTags( initial(numbers) ),
]
}
}