@@ -162,10 +162,10 @@ shopt -u nocasematch
162
162
163
163
echo " Package version: $ver "
164
164
echo " Git branch name: $branch_name "
165
- echo " Git revision number (short) : $verx "
165
+ echo " Git revision number: $verx "
166
166
echo " Package name extension: $extent "
167
167
echo " Travis CI tag: $TRAVIS_TAG "
168
- echo " Release package name (unzipped) : $package_name "
168
+ echo " Release package name: $package_name "
169
169
170
170
# Set REMOTE_URL environment variable to the address where the package will be
171
171
# available for download. This gets written into package json file.
@@ -191,7 +191,6 @@ echo "Package build processing:"
191
191
echo " ========================="
192
192
echo
193
193
echo " Prepare files for the package main archive:"
194
- echo " -------------------------------------------"
195
194
echo " - copying neccessary files from current Git repository..."
196
195
197
196
# <PACKAGE ROOT>
@@ -257,14 +256,14 @@ pushd $releaseDir >/dev/null
257
256
258
257
zip -qr $package_name_zip $package_name
259
258
if [ $? -ne 0 ]; then
260
- echo " !error: failed to create ${package_name_zip} (ZIP errno: $? ) => aborting"
259
+ echo " !error: failed to create ${package_name_zip} (ZIP errno: $? ) => aborting"
261
260
exit 1
262
261
fi
263
262
264
263
# Calculate SHA sum and size of ZIP archive
265
264
sha=` shasum -a 256 $package_name_zip | cut -f 1 -d ' ' `
266
265
size=` /bin/ls -l $package_name_zip | awk ' {print $5}' `
267
- echo " ${package_name_zip} creation OK (size: $size B , sha2: $sha )"
266
+ echo " ${package_name_zip} creation OK (size: $size , sha2: $sha )"
268
267
echo
269
268
270
269
echo " Making $package_name JSON definition file(s):"
@@ -293,23 +292,30 @@ rm -rf $outdir
293
292
# Get all previously released versions
294
293
echo " - fetching previous (pre)release versions from GitHub..."
295
294
295
+ set +e
296
+
296
297
releasesJson=$releaseDir /releases.json
297
298
curl -sH " Authorization: token $curlAuth " https://api.github.com/repos/$TRAVIS_REPO_SLUG /releases > $releasesJson
298
299
299
- set +e
300
- # Previous final release (prerelase == false)
301
300
prev_release=$( jq -e -r ' . | map(select(.draft == false and .prerelease == false)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name' ${releasesJson} )
302
- # Previous release (possibly a pre-release)
303
301
prev_any_release=$( jq -e -r ' . | map(select(.draft == false)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name' ${releasesJson} )
304
- # Previous pre-release
305
302
prev_pre_release=$( jq -e -r ' . | map(select(.draft == false and .prerelease == true)) | sort_by(.created_at | - fromdateiso8601) | .[0].tag_name' ${releasesJson} )
303
+
304
+ shopt -s nocasematch
305
+ if [ " $prev_any_release " == " $TRAVIS_TAG " ]; then
306
+ prev_release=$( jq -e -r ' . | map(select(.draft == false and .prerelease == false)) | sort_by(.created_at | - fromdateiso8601) | .[1].tag_name' ${releasesJson} )
307
+ prev_any_release=$( jq -e -r ' . | map(select(.draft == false)) | sort_by(.created_at | - fromdateiso8601) | .[1].tag_name' ${releasesJson} )
308
+ prev_pre_release=$( jq -e -r ' . | map(select(.draft == false and .prerelease == true)) | sort_by(.created_at | - fromdateiso8601) | .[1].tag_name' ${releasesJson} )
309
+ fi
310
+ shopt -u nocasematch
311
+
306
312
set -e
307
313
308
314
rm -f " $releasesJson "
309
315
310
- echo " -- previous Release: $prev_release "
311
- echo " -- previous (?Pre-)release: $prev_any_release "
312
- echo " -- previous Pre-release: $prev_pre_release "
316
+ echo " previous Release: $prev_release "
317
+ echo " previous (?Pre-)release: $prev_any_release "
318
+ echo " previous Pre-release: $prev_pre_release "
313
319
314
320
# add generated items to JSON package-definition contents
315
321
jq_arg=" .packages[0].platforms[0].version = \" $ver \" | \
0 commit comments