Add option to specify which Arduino branch will be target for PR

me-no-dev · me-no-dev · commit fe8eeb0cabef · 2021-04-05T14:01:46.000+03:00
diff --git a/tools/config.sh b/tools/config.sh
@@ -12,6 +12,10 @@ if [ -z $IDF_BRANCH ]; then
 	IDF_BRANCH="release/v3.3"
 fi
 
+if [ -z $AR_PR_TARGET_BRANCH ]; then
+	AR_PR_TARGET_BRANCH="release/v1.0"
+fi
+
 # Owner of the target ESP32 Arduino repository
 AR_USER="espressif"
 
@@ -96,13 +100,14 @@ function git_pr_exists(){ # git_pr_exists <branch-name>
 function git_create_pr(){ # git_create_pr <branch> <title>
 	local pr_branch="$1"
 	local pr_title="$2"
+	local pr_target="$3"
 	local pr_body=""
 	for component in `ls "$AR_COMPS"`; do
 		if [ ! $component == "arduino" ] && [ -d "$AR_COMPS/$component/.git" ]; then
 			pr_body+="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)"\r\n"
 		fi
 	done
-	local pr_data="{\"title\": \"$pr_title\", \"body\": \"$pr_body\", \"head\": \"$AR_USER:$pr_branch\", \"base\": \"master\"}"
+	local pr_data="{\"title\": \"$pr_title\", \"body\": \"$pr_body\", \"head\": \"$AR_USER:$pr_branch\", \"base\": \"$pr_target\"}"
 	git_create_pr_res=`echo "$pr_data" | curl -k -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3.raw+json" --data @- "https://api.github.com/repos/$AR_REPO/pulls"`
 	local done_pr=`echo "$git_create_pr_res" | jq -r '.title'`
 	if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi
diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
@@ -50,7 +50,7 @@ fi
 #
 
 if [ "$AR_HAS_PR" == "0" ]; then
-	pr_created=`git_create_pr "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE"`
+	pr_created=`git_create_pr "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE" "$AR_PR_TARGET_BRANCH"`
 	if [ $pr_created == "0" ]; then
 		echo "ERROR: Failed to create PR '$AR_NEW_PR_TITLE': "`echo "$git_create_pr_res" | jq -r '.message'`": "`echo "$git_create_pr_res" | jq -r '.errors[].message'`
 		exit 1

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ fi`
`50`	`50`	`#`
`51`	`51`
`52`	`52`	`if [ "$AR_HAS_PR" == "0" ]; then`
`53`		- pr_created=`git_create_pr "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE"`
	`53`	+ pr_created=`git_create_pr "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE" "$AR_PR_TARGET_BRANCH"`
`54`	`54`	`if [ $pr_created == "0" ]; then`
`55`	`55`	echo "ERROR: Failed to create PR '$AR_NEW_PR_TITLE': "`echo "$git_create_pr_res" \| jq -r '.message'`": "`echo "$git_create_pr_res" \| jq -r '.errors[].message'`
`56`	`56`	`exit 1`