File tree Expand file tree Collapse file tree 1 file changed +14
-4
lines changed Expand file tree Collapse file tree 1 file changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -82,16 +82,27 @@ join() {
82
82
}
83
83
84
84
for version; do
85
- export version
85
+ rcVersion=" ${version% -rc} "
86
+ export version rcVersion
86
87
87
88
if ! fullVersion=" $( jq -er ' .[env.version] | if . then .version else empty end' versions.json) " ; then
88
89
continue
89
90
fi
90
91
92
+ if [ " $rcVersion " != " $version " ] && rcFullVersion=" $( jq -er ' .[env.rcVersion] | if . then .version else empty end' versions.json) " ; then
93
+ # 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)
94
+ latestVersion=" $( { echo " $fullVersion " ; echo " $rcFullVersion " ; } | sort -V | tail -1) "
95
+ if [[ " $fullVersion " == " $rcFullVersion " * ]] || [ " $latestVersion " = " $rcFullVersion " ]; then
96
+ # "x.y.z-rc1" == x.y.z*
97
+ continue
98
+ fi
99
+ fi
100
+
91
101
variants=" $( jq -r ' .[env.version].variants | map(@sh) | join(" ")' versions.json) "
92
102
eval " variants=( $variants )"
93
103
94
104
versionAliases=(
105
+ $fullVersion
95
106
$version
96
107
${aliases[$version]:- }
97
108
)
@@ -102,12 +113,11 @@ for version; do
102
113
dir=" $version /$dir "
103
114
[ -f " $dir /Dockerfile" ] || continue
104
115
105
- baseAliases=( $fullVersion " ${versionAliases[@]} " )
106
- variantAliases=( " ${baseAliases[@]/%/ -$variant } " )
116
+ variantAliases=( " ${versionAliases[@]/%/ -$variant } " )
107
117
variantAliases=( " ${variantAliases[@]// latest-/ } " )
108
118
109
119
if [ " $variant " = ' cli' ]; then
110
- variantAliases+=( " ${baseAliases [@]} " )
120
+ variantAliases+=( " ${versionAliases [@]} " )
111
121
fi
112
122
113
123
suiteVariantAliases=( " ${variantAliases[@]/%/ -$suite } " )
You can’t perform that action at this time.
0 commit comments