Skip to content

Commit 3cd3656

Browse files
authored
Consider MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE as part of VERSION_FROM_MODRINTH_PROJECTS (#3985)
1 parent 387c674 commit 3cd3656

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
5555
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
5656

5757
# renovate: datasource=github-releases packageName=itzg/mc-image-helper versioning=loose
58-
ARG MC_HELPER_VERSION=1.55.3
58+
ARG MC_HELPER_VERSION=1.55.4
5959
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
6060
# used for cache busting local copy of mc-image-helper
6161
ARG MC_HELPER_REV=1

scripts/start-configuration

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,11 @@ export DECLARED_TYPE=${TYPE^^}
156156
export DECLARED_VERSION="$VERSION"
157157

158158
if isTrue "${VERSION_FROM_MODRINTH_PROJECTS:-}" && [[ ${MODRINTH_PROJECTS:-} ]]; then
159-
if ! VERSION=$(mc-image-helper version-from-modrinth-projects --projects "${MODRINTH_PROJECTS}"); then
159+
args=()
160+
if [[ ${MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE:-} ]]; then
161+
args+=(--allowed-version-type "${MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE:-}")
162+
fi
163+
if ! VERSION=$(mc-image-helper version-from-modrinth-projects "${args[@]}" --projects "${MODRINTH_PROJECTS}"); then
160164
logError "failed to resolve version from MODRINTH_PROJECTS: ${MODRINTH_PROJECTS}"
161165
exit 1
162166
fi

0 commit comments

Comments
 (0)