Skip to content

Commit 89b4a7a

Browse files
committed
test
1 parent 60af3ea commit 89b4a7a

File tree

2 files changed

+127
-92
lines changed

2 files changed

+127
-92
lines changed

tools/check-deploy-needed.sh

Lines changed: 61 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,104 @@
1-
#/bin/bash
2-
3-
exec 3>&1 1>&2
1+
#!/bin/bash
42

53
source ./tools/config.sh
64

7-
IDF_COMMIT=`github_last_commit "$IDF_REPO" "$IDF_BRANCH"`
5+
IDF_COMMIT=$(github_last_commit "$IDF_REPO" "$IDF_BRANCH")
86

9-
if [ -z $IDF_COMMIT ]; then
7+
if [ -z "$IDF_COMMIT" ]; then
108
echo "Failed to get IDF commit for branch $IDF_BRANCH"
119
exit 1
1210
fi
1311

14-
if [ -z $GITHUB_HEAD_REF ]; then
15-
current_branch=`git branch --show-current`
12+
if [ -z "$GITHUB_HEAD_REF" ]; then
13+
current_branch=$(git branch --show-current)
1614
else
1715
current_branch="$GITHUB_HEAD_REF"
1816
fi
1917

2018
AR_BRANCH="master"
21-
if [[ "$current_branch" != "master" && `github_branch_exists "$AR_REPO" "$current_branch"` == "1" ]]; then
19+
if [[ "$current_branch" != "master" && $(github_branch_exists "$AR_REPO" "$current_branch") == "1" ]]; then
2220
AR_BRANCH="$current_branch"
2321
else
2422
AR_BRANCH_NAME="idf-$IDF_BRANCH"
25-
has_ar_branch=`github_branch_exists "$AR_REPO" "$AR_BRANCH_NAME"`
23+
has_ar_branch=$(github_branch_exists "$AR_REPO" "$AR_BRANCH_NAME")
2624
if [ "$has_ar_branch" == "1" ]; then
2725
AR_BRANCH="$AR_BRANCH_NAME"
2826
else
29-
has_ar_branch=`github_branch_exists "$AR_REPO" "$AR_PR_TARGET_BRANCH"`
27+
has_ar_branch=$(github_branch_exists "$AR_REPO" "$AR_PR_TARGET_BRANCH")
3028
if [ "$has_ar_branch" == "1" ]; then
3129
AR_BRANCH="$AR_PR_TARGET_BRANCH"
3230
fi
3331
fi
3432
fi
3533

34+
echo "AR_BRANCH: $AR_BRANCH"
35+
echo "AR_BRANCH_NAME: $AR_BRANCH_NAME"
36+
echo "AR_PR_TARGET_BRANCH: $AR_PR_TARGET_BRANCH"
37+
echo "has_ar_branch: $has_ar_branch"
38+
3639
# format new branch name and pr title
3740
AR_NEW_BRANCH_NAME="idf-$IDF_BRANCH"
3841
AR_NEW_COMMIT_MESSAGE="IDF $IDF_BRANCH $IDF_COMMIT"
3942
AR_NEW_PR_TITLE="IDF $IDF_BRANCH"
4043

41-
LIBS_RELEASE_TAG="idf-"${IDF_BRANCH//\//_}""
44+
LIBS_RELEASE_TAG="idf-${IDF_BRANCH//\//_}"
4245
LIBS_VERSION_PREFIX="$LIBS_RELEASE_TAG-$IDF_COMMIT-v"
4346
VERSION_COUNTER=1
4447

45-
AR_HAS_BRANCH=`github_branch_exists "$AR_REPO" "$AR_NEW_BRANCH_NAME"`
48+
AR_HAS_BRANCH=$(github_branch_exists "$AR_REPO" "$AR_NEW_BRANCH_NAME")
4649
if [ "$AR_HAS_BRANCH" == "1" ]; then
47-
LATEST_LIBS_IDF=`github_get_libs_idf "$AR_REPO" "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE"`
50+
LATEST_LIBS_IDF=$(github_get_libs_idf "$AR_REPO" "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE")
4851
else
49-
LATEST_LIBS_IDF=`github_get_libs_idf "$AR_REPO" "$AR_BRANCH" "$AR_NEW_PR_TITLE"`
52+
LATEST_LIBS_IDF=$(github_get_libs_idf "$AR_REPO" "$AR_BRANCH" "$AR_NEW_PR_TITLE")
5053
fi
5154

55+
echo "AR_NEW_BRANCH_NAME: $AR_NEW_BRANCH_NAME"
56+
echo "AR_NEW_COMMIT_MESSAGE: $AR_NEW_COMMIT_MESSAGE"
57+
echo "AR_NEW_PR_TITLE: $AR_NEW_PR_TITLE"
58+
59+
echo "LIBS_RELEASE_TAG: $LIBS_RELEASE_TAG"
60+
echo "LIBS_VERSION_PREFIX: $LIBS_VERSION_PREFIX"
61+
echo "VERSION_COUNTER: $VERSION_COUNTER"
62+
63+
echo "AR_HAS_BRANCH: $AR_HAS_BRANCH"
64+
echo "LATEST_LIBS_IDF: $LATEST_LIBS_IDF"
65+
5266
echo "Current IDF commit: $IDF_COMMIT"
5367
echo "Latest IDF commit in $AR_BRANCH of $AR_REPO: $LATEST_LIBS_IDF"
5468

55-
AR_HAS_COMMIT=`if [ "$LATEST_LIBS_IDF" == "$IDF_COMMIT" ]; then echo "1"; else echo "0"; fi`
56-
AR_HAS_PR=`github_pr_exists "$AR_REPO" "$AR_NEW_BRANCH_NAME"`
57-
58-
curl -sf -H "Authorization: token $GITHUB_TOKEN" \
59-
-H "Accept: application/vnd.github.v3+json" \
60-
"https://api.github.com/repos/$AR_LIBS_REPO/releases?per_page=1" | head -n 20
69+
AR_HAS_COMMIT=$(if [ "$LATEST_LIBS_IDF" == "$IDF_COMMIT" ]; then echo "1"; else echo "0"; fi)
70+
AR_HAS_PR=$(github_pr_exists "$AR_REPO" "$AR_NEW_BRANCH_NAME")
6171

72+
echo "AR_HAS_COMMIT: $AR_HAS_COMMIT"
73+
echo "AR_HAS_PR: $AR_HAS_PR"
6274

63-
LIBS_RELEASE_ID=`github_release_id "$AR_LIBS_REPO" "$LIBS_RELEASE_TAG" 2>&1 >/dev/null`
64-
LIBS_HAS_RELEASE=`if [ -n "$LIBS_RELEASE_ID" ]; then echo "1"; else echo "0"; fi`
75+
LIBS_RELEASE_ID=$(github_release_id "$AR_LIBS_REPO" "$LIBS_RELEASE_TAG")
76+
LIBS_HAS_RELEASE=$(if [ -n "$LIBS_RELEASE_ID" ]; then echo "1"; else echo "0"; fi)
6577

66-
echo "DEBUG: Start of output sanitization"
78+
echo "LIBS_RELEASE_ID: $LIBS_RELEASE_ID"
79+
echo "LIBS_HAS_RELEASE: $LIBS_HAS_RELEASE"
6780

6881
if [ "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]; then
6982
echo "Workflow dispatch event. Generating new libs."
7083
while true; do
71-
LIBS_ASSET_ID=`github_release_asset_id "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "esp32-arduino-libs-$LIBS_VERSION_PREFIX$VERSION_COUNTER.zip"`
84+
LIBS_ASSET_ID=$(github_release_asset_id "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "esp32-arduino-libs-$LIBS_VERSION_PREFIX$VERSION_COUNTER.zip")
7285
if [ -n "$LIBS_ASSET_ID" ]; then
7386
VERSION_COUNTER=$((VERSION_COUNTER+1))
7487
else
7588
break
7689
fi
7790
done
7891
else
79-
LIBS_ASSET_ID=`github_release_asset_id "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "esp32-arduino-libs-$LIBS_VERSION_PREFIX$VERSION_COUNTER.zip"`
92+
LIBS_ASSET_ID=$(github_release_asset_id "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "esp32-arduino-libs-$LIBS_VERSION_PREFIX$VERSION_COUNTER.zip")
8093
fi
8194

95+
echo "LIBS_ASSET_ID: $LIBS_ASSET_ID"
96+
8297
LIBS_VERSION="$LIBS_VERSION_PREFIX$VERSION_COUNTER"
83-
LIBS_HAS_ASSET=`if [ -n "$LIBS_ASSET_ID" ]; then echo "1"; else echo "0"; fi`
98+
LIBS_HAS_ASSET=$(if [ -n "$LIBS_ASSET_ID" ]; then echo "1"; else echo "0"; fi)
99+
100+
echo "LIBS_VERSION: $LIBS_VERSION"
101+
echo "LIBS_HAS_ASSET: $LIBS_HAS_ASSET"
84102

85103
export IDF_COMMIT
86104

@@ -112,37 +130,25 @@ else
112130
exit 1
113131
fi
114132

115-
echo "IDF_COMMIT: $IDF_COMMIT"
116-
echo "AR_BRANCH: $AR_BRANCH"
117-
echo "AR_NEW_COMMIT_MESSAGE: $AR_NEW_COMMIT_MESSAGE"
118-
echo "AR_NEW_BRANCH_NAME: $AR_NEW_BRANCH_NAME"
119-
echo "AR_NEW_PR_TITLE: $AR_NEW_PR_TITLE"
120-
echo "AR_HAS_COMMIT: $AR_HAS_COMMIT"
121-
echo "AR_HAS_BRANCH: $AR_HAS_BRANCH"
122-
echo "AR_HAS_PR: $AR_HAS_PR"
123-
echo "LIBS_RELEASE_TAG: $LIBS_RELEASE_TAG"
124-
echo "LIBS_VERSION: $LIBS_VERSION"
125-
echo "LIBS_RELEASE_ID: $LIBS_RELEASE_ID"
126-
echo "LIBS_HAS_RELEASE: $LIBS_HAS_RELEASE"
127-
echo "LIBS_ASSET_ID: $LIBS_ASSET_ID"
128-
echo "LIBS_HAS_ASSET: $LIBS_HAS_ASSET"
129133
echo "DEPLOY_NEEDED: $DEPLOY_NEEDED"
130134

131135
if [ -n "$GITHUB_OUTPUT" ]; then
132-
echo "idf_commit=$IDF_COMMIT" >> "$GITHUB_OUTPUT"
133-
echo "ar_branch=$AR_BRANCH" >> "$GITHUB_OUTPUT"
134-
echo "ar_new_commit_message=$AR_NEW_COMMIT_MESSAGE" >> "$GITHUB_OUTPUT"
135-
echo "ar_new_branch_name=$AR_NEW_BRANCH_NAME" >> "$GITHUB_OUTPUT"
136-
echo "ar_new_pr_title=$AR_NEW_PR_TITLE" >> "$GITHUB_OUTPUT"
137-
echo "ar_has_commit=$AR_HAS_COMMIT" >> "$GITHUB_OUTPUT"
138-
echo "ar_has_branch=$AR_HAS_BRANCH" >> "$GITHUB_OUTPUT"
139-
echo "ar_has_pr=$AR_HAS_PR" >> "$GITHUB_OUTPUT"
140-
echo "libs_release_tag=$LIBS_RELEASE_TAG" >> "$GITHUB_OUTPUT"
141-
echo "libs_version=$LIBS_VERSION" >> "$GITHUB_OUTPUT"
142-
echo "libs_release_id=$LIBS_RELEASE_ID" >> "$GITHUB_OUTPUT"
143-
echo "libs_has_release=$LIBS_HAS_RELEASE" >> "$GITHUB_OUTPUT"
144-
echo "libs_asset_id=$LIBS_ASSET_ID" >> "$GITHUB_OUTPUT"
145-
echo "libs_has_asset=$LIBS_HAS_ASSET" >> "$GITHUB_OUTPUT"
146-
echo "deploy_needed=$DEPLOY_NEEDED" >> "$GITHUB_OUTPUT"
136+
{
137+
echo "idf_commit=$IDF_COMMIT"
138+
echo "ar_branch=$AR_BRANCH"
139+
echo "ar_new_commit_message=$AR_NEW_COMMIT_MESSAGE"
140+
echo "ar_new_branch_name=$AR_NEW_BRANCH_NAME"
141+
echo "ar_new_pr_title=$AR_NEW_PR_TITLE"
142+
echo "ar_has_commit=$AR_HAS_COMMIT"
143+
echo "ar_has_branch=$AR_HAS_BRANCH"
144+
echo "ar_has_pr=$AR_HAS_PR"
145+
echo "libs_release_tag=$LIBS_RELEASE_TAG"
146+
echo "libs_version=$LIBS_VERSION"
147+
echo "libs_release_id=$LIBS_RELEASE_ID"
148+
echo "libs_has_release=$LIBS_HAS_RELEASE"
149+
echo "libs_asset_id=$LIBS_ASSET_ID"
150+
echo "libs_has_asset=$LIBS_HAS_ASSET"
151+
echo "deploy_needed=$DEPLOY_NEEDED"
152+
} >> "$GITHUB_OUTPUT"
147153
fi
148154

0 commit comments

Comments
 (0)