mirror of
https://github.com/docker-library/php.git
synced 2025-08-05 00:09:03 +00:00
Fix generate-stackbrew-library.sh to skip released RCs
This commit is contained in:
@ -82,16 +82,27 @@ join() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for version; do
|
for version; do
|
||||||
export version
|
rcVersion="${version%-rc}"
|
||||||
|
export version rcVersion
|
||||||
|
|
||||||
if ! fullVersion="$(jq -er '.[env.version] | if . then .version else empty end' versions.json)"; then
|
if ! fullVersion="$(jq -er '.[env.version] | if . then .version else empty end' versions.json)"; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$rcVersion" != "$version" ] && rcFullVersion="$(jq -er '.[env.rcVersion] | if . then .version else empty end' versions.json)"; then
|
||||||
|
# if this is a "-rc" release, let's make sure the release it contains isn't already GA (and thus something we should not publish anymore)
|
||||||
|
latestVersion="$({ echo "$fullVersion"; echo "$rcFullVersion"; } | sort -V | tail -1)"
|
||||||
|
if [[ "$fullVersion" == "$rcFullVersion"* ]] || [ "$latestVersion" = "$rcFullVersion" ]; then
|
||||||
|
# "x.y.z-rc1" == x.y.z*
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)"
|
variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)"
|
||||||
eval "variants=( $variants )"
|
eval "variants=( $variants )"
|
||||||
|
|
||||||
versionAliases=(
|
versionAliases=(
|
||||||
|
$fullVersion
|
||||||
$version
|
$version
|
||||||
${aliases[$version]:-}
|
${aliases[$version]:-}
|
||||||
)
|
)
|
||||||
@ -102,12 +113,11 @@ for version; do
|
|||||||
dir="$version/$dir"
|
dir="$version/$dir"
|
||||||
[ -f "$dir/Dockerfile" ] || continue
|
[ -f "$dir/Dockerfile" ] || continue
|
||||||
|
|
||||||
baseAliases=( $fullVersion "${versionAliases[@]}" )
|
variantAliases=( "${versionAliases[@]/%/-$variant}" )
|
||||||
variantAliases=( "${baseAliases[@]/%/-$variant}" )
|
|
||||||
variantAliases=( "${variantAliases[@]//latest-/}" )
|
variantAliases=( "${variantAliases[@]//latest-/}" )
|
||||||
|
|
||||||
if [ "$variant" = 'cli' ]; then
|
if [ "$variant" = 'cli' ]; then
|
||||||
variantAliases+=( "${baseAliases[@]}" )
|
variantAliases+=( "${versionAliases[@]}" )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
suiteVariantAliases=( "${variantAliases[@]/%/-$suite}" )
|
suiteVariantAliases=( "${variantAliases[@]/%/-$suite}" )
|
||||||
|
Reference in New Issue
Block a user