mirror of
https://github.com/mtan93/Installomator.git
synced 2026-03-08 05:31:53 +00:00
updated test script
This commit is contained in:
@@ -121,7 +121,6 @@ chmod +x $destination_file
|
|||||||
if [[ $runScript -eq 1 ]]; then
|
if [[ $runScript -eq 1 ]]; then
|
||||||
$destination_file "$@"
|
$destination_file "$@"
|
||||||
exit_code=$?
|
exit_code=$?
|
||||||
echo "exit_code is $exit_code"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# copy the script to root of repo when flag is set
|
# copy the script to root of repo when flag is set
|
||||||
|
|||||||
@@ -9,17 +9,23 @@
|
|||||||
pr_num=${1:?"arg 1 is the PR number"}
|
pr_num=${1:?"arg 1 is the PR number"}
|
||||||
label=${2:?"arg 2 is label"}
|
label=${2:?"arg 2 is label"}
|
||||||
|
|
||||||
gh pr checkout $pr_num -b "pr/$pr_num"
|
if ! gh pr checkout $pr_num -b "pr/$pr_num"; then
|
||||||
|
exit $?
|
||||||
|
fi
|
||||||
|
|
||||||
if ! utils/assemble.sh $label; then
|
if ! utils/assemble.sh $label; then
|
||||||
echo "something went wrong, stopping here"
|
echo "something went wrong, stopping here"
|
||||||
else
|
else
|
||||||
echo
|
echo
|
||||||
echo "All good! merging..."
|
echo "All good!"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
git checkout main
|
read -q query"?Merge into main? (y/n)"
|
||||||
git merge "pr/$pr_num" -m "new label: $label"
|
|
||||||
git branch -d "pr/$pr_num"
|
if [[ $query == 'y' ]]; then
|
||||||
gh pr comment $pr_num --body 'Thank you!'
|
git checkout main
|
||||||
|
git merge "pr/$pr_num" -m "new label: $label"
|
||||||
|
git branch -d "pr/$pr_num"
|
||||||
|
gh pr comment $pr_num --body 'Thank you!'
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user