Skip to content

Commit 7cbf86d

Browse files
Fix equality checks in on-release.sh
1 parent 77ba1b5 commit 7cbf86d

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

.github/scripts/on-release.sh

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@
33
export BASE_DIR="$GITHUB_WORKSPACE/arduino-esp32-fork"
44
export MODS_DIR="$GITHUB_WORKSPACE/arduino-esp32-fork-mods"
55

6-
if [ ! $GITHUB_EVENT_NAME == "release" ]; then
6+
if [[ ! $GITHUB_EVENT_NAME == "release" ]]; then
77
echo "Wrong event '$GITHUB_EVENT_NAME'!"
88
exit 1
99
fi
1010

11+
echo "Github event '$GITHUB_EVENT_NAME'!"
12+
1113
EVENT_JSON=`cat $GITHUB_EVENT_PATH`
1214

1315
action=`echo $EVENT_JSON | jq -r '.action'`
14-
if [ ! $action == "published" ]; then
16+
if [[ ! $action == "published" ]]; then
1517
echo "Wrong action '$action'. Exiting now..."
1618
exit 0
1719
fi
1820

1921
draft=`echo $EVENT_JSON | jq -r '.release.draft'`
20-
if [ $draft == "true" ]; then
22+
if [[ $draft == "true" ]]; then
2123
echo "It's a draft release. Exiting now..."
2224
exit 0
2325
fi
@@ -233,7 +235,7 @@ jq_arg=".packages[0].platforms[0].version = \"$RELEASE_TAG\" | \
233235
# Generate package JSONs
234236
echo "Genarating $PACKAGE_JSON_DEV ..."
235237
cat "$PACKAGE_JSON_TEMPLATE" | jq "$jq_arg" > "$OUTPUT_DIR/$PACKAGE_JSON_DEV"
236-
if [ "$RELEASE_PRE" == "false" ]; then
238+
if [[ "$RELEASE_PRE" == "false" ]]; then
237239
echo "Genarating $PACKAGE_JSON_REL ..."
238240
cat "$PACKAGE_JSON_TEMPLATE" | jq "$jq_arg" > "$OUTPUT_DIR/$PACKAGE_JSON_REL"
239241
fi
@@ -249,16 +251,16 @@ prev_any_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == fal
249251
prev_branch_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .prerelease == false and .target_commitish == \"$RELEASE_BRANCH\")) | sort_by(.published_at | - fromdateiso8601) | .[0].tag_name")
250252
prev_branch_any_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .target_commitish == \"$RELEASE_BRANCH\")) | sort_by(.published_at | - fromdateiso8601) | .[0].tag_name")
251253
shopt -s nocasematch
252-
if [ "$prev_release" == "$RELEASE_TAG" ]; then
254+
if [[ "$prev_release" == "$RELEASE_TAG" ]]; then
253255
prev_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .prerelease == false)) | sort_by(.published_at | - fromdateiso8601) | .[1].tag_name")
254256
fi
255-
if [ "$prev_any_release" == "$RELEASE_TAG" ]; then
257+
if [[ "$prev_any_release" == "$RELEASE_TAG" ]]; then
256258
prev_any_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false)) | sort_by(.published_at | - fromdateiso8601) | .[1].tag_name")
257259
fi
258-
if [ "$prev_branch_release" == "$RELEASE_TAG" ]; then
260+
if [[ "$prev_branch_release" == "$RELEASE_TAG" ]]; then
259261
prev_branch_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .prerelease == false and .target_commitish == \"$RELEASE_BRANCH\")) | sort_by(.published_at | - fromdateiso8601) | .[1].tag_name")
260262
fi
261-
if [ "$prev_branch_any_release" == "$RELEASE_TAG" ]; then
263+
if [[ "$prev_branch_any_release" == "$RELEASE_TAG" ]]; then
262264
prev_branch_any_release=$(echo "$releasesJson" | jq -e -r ". | map(select(.draft == false and .target_commitish == \"$RELEASE_BRANCH\")) | sort_by(.published_at | - fromdateiso8601) | .[1].tag_name")
263265
fi
264266
shopt -u nocasematch
@@ -269,13 +271,13 @@ echo "Previous (any)release: $prev_any_release"
269271
echo
270272

271273
# Merge package JSONs with previous releases
272-
if [ ! -z "$prev_any_release" ] && [ "$prev_any_release" != "null" ]; then
274+
if [ ! -z "$prev_any_release" ] && [[ "$prev_any_release" != "null" ]]; then
273275
echo "Merging with JSON from $prev_any_release ..."
274276
merge_package_json "$prev_any_release/$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV"
275277
fi
276278

277279
if [ "$RELEASE_PRE" == "false" ]; then
278-
if [ ! -z "$prev_release" ] && [ "$prev_release" != "null" ]; then
280+
if [ ! -z "$prev_release" ] && [[ "$prev_release" != "null" ]]; then
279281
echo "Merging with JSON from $prev_release ..."
280282
merge_package_json "$prev_release/$PACKAGE_JSON_REL" "$OUTPUT_DIR/$PACKAGE_JSON_REL"
281283
fi
@@ -312,8 +314,8 @@ if [ $arrLen > 3 ] && [ "${msgArray[0]:0:3}" == "tag" ]; then
312314
else
313315
oneLine="$(echo -e "${msgArray[ind]}" | sed -e 's/^[[:space:]]*//')"
314316
if [ ${#oneLine} -gt 0 ]; then
315-
if [ "${oneLine:0:2}" == "* " ]; then oneLine=$(echo ${oneLine/\*/-}); fi
316-
if [ "${oneLine:0:2}" != "- " ]; then releaseNotes+="- "; fi
317+
if [[ "${oneLine:0:2}" == "* " ]]; then oneLine=$(echo ${oneLine/\*/-}); fi
318+
if [[ "${oneLine:0:2}" != "- " ]]; then releaseNotes+="- "; fi
317319
releaseNotes+="$oneLine"
318320
releaseNotes+=$'\r\n'
319321
fi
@@ -329,13 +331,13 @@ echo "Previous Branch (any)release: $prev_branch_any_release"
329331
echo
330332
commitFile="$OUTPUT_DIR/commits.txt"
331333
COMMITS_SINCE_RELEASE="$prev_branch_any_release"
332-
if [ "$RELEASE_PRE" == "false" ]; then
334+
if [[ "$RELEASE_PRE" == "false" ]]; then
333335
COMMITS_SINCE_RELEASE="$prev_branch_release"
334336
fi
335-
if [ ! -z "$COMMITS_SINCE_RELEASE" ] && [ "$COMMITS_SINCE_RELEASE" != "null" ]; then
337+
if [ ! -z "$COMMITS_SINCE_RELEASE" ] && [[ "$COMMITS_SINCE_RELEASE" != "null" ]]; then
336338
echo "Getting commits since $COMMITS_SINCE_RELEASE ..."
337339
git -C "$BASE_DIR" log --oneline -n 500 "$COMMITS_SINCE_RELEASE..HEAD" > "$commitFile"
338-
elif [ "$RELEASE_BRANCH" != "master" ]; then
340+
elif [[ "$RELEASE_BRANCH" != "master" ]]; then
339341
echo "Getting all commits on branch '$RELEASE_BRANCH' ..."
340342
git -C "$BASE_DIR" log --oneline -n 500 --cherry-pick --left-only --no-merges HEAD...origin/master > "$commitFile"
341343
else
@@ -354,7 +356,7 @@ done
354356
rm -f $commitFile
355357

356358
# Prepend the original release body
357-
if [ "${RELEASE_BODY: -1}" == $'\r' ]; then
359+
if [[ "${RELEASE_BODY: -1}" == $'\r' ]]; then
358360
RELEASE_BODY="${RELEASE_BODY:0:-1}"
359361
else
360362
RELEASE_BODY="$RELEASE_BODY"

0 commit comments

Comments
 (0)