Skip to content

Commit 326e04d

Browse files
committed
feat: jreleaser minor refactor
1 parent e975f02 commit 326e04d

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

contrib/script/jreleaser

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ POM_EFFECTIVE="$JRELEASER_OUTPUT_DIRECTORY/pom-effective.xml"
2727
export JRELEASER_PROJECT_VERSION
2828
JRELEASER_PROJECT_VERSION=$(yq --exit-status '.project.version' "$POM_EFFECTIVE")
2929

30-
# Jreleaser version
31-
JRELEASER_VERSION=$(yq --exit-status '.project.properties."jreleaser.version"' "$POM_EFFECTIVE")
32-
3330
# Jdks (used in Jlink package configuration)
3431
export JDK_DOWNLOAD_DIRECTORY # where the jdks are downloaded
3532
JDK_DOWNLOAD_DIRECTORY=$(yq --exit-status '.project.properties."jdk.download-directory"' "$POM_EFFECTIVE")
@@ -56,4 +53,4 @@ shift # Removes the first argument, leaving the rest in $@
5653
# All relative path are relative to the project root
5754
cd "$PROJECT_ROOT" || exit 1
5855

59-
"$HOME/.sdkman/candidates/jreleaser/${JRELEASER_VERSION}/bin/jreleaser" "$COMMAND" --config-file="$JRELEASER_CONFIG_FILE" "$@"
56+
"$(which -a jreleaser | sed -n '2p')" "$COMMAND" --config-file="$JRELEASER_CONFIG_FILE" "$@"

jreleaser.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ distributions:
295295
matchers:
296296
platform: 'linux_musl-x86_64'
297297
imageNames:
298-
- "ghcr.io/combostrap/{{dockerSpecName}}:{{tagName}}"
299-
- "ghcr.io/combostrap/{{dockerSpecName}}:latest"
298+
- "ghcr.io/{{repoOwner}}/{{dockerSpecName}}:{{tagName}}"
299+
- "ghcr.io/{{repoOwner}}/{{dockerSpecName}}:latest"
300300
preCommands:
301301
- 'RUN apk add unzip bash'
302302
postCommands:

0 commit comments

Comments
 (0)