⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
Skip to content

update BuildTrio to support expected update to main #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
marionbarker wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

update BuildTrio to support expected update to main #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions BuildTrio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,26 @@ function select_special_branch() {
branch_select ${URL_THIS_SCRIPT} ${special_branch_name} ${app_name}_${special_branch_name}
}

function special_message_0.2_to_0.7() {
echo -e ""
echo -e "For those who were running versions of Trio starting with 0.2,"
echo -e " when you build main, you will advance to version 0.7:"
echo -e " As part of this, you will go through an onboarding step"
echo -e " ${INFO_FONT} STOP NOW${NC}"
echo -e "Read this information first, then come back and build"
echo -e " https://triodocs.org/configuration/migration/trio-02x-migration/"
}

function special_message_howto_build_feature_branch() {
echo -e ""
echo -e "For those who want to build a special feature branch, you must use"
echo -e " the BuildTrio script and indicate the desired branch."
echo -e "${INFO_FONT}Make sure you join Discord; and before you build, "
echo -e " read about the new pump or cgm being tested in that feature branch${NC}"
echo -e "Read this section of LoopDocs and just use BuildTrio instead of BuildLoop."
echo -e " https://loopkit.github.io/loopdocs/build/build-dev-mac/#build-other-branches"
}

if [ -z "$CUSTOM_BRANCH" ]; then
while [ -z "$BRANCH" ]; do
section_separator
Expand All @@ -838,23 +858,21 @@ if [ -z "$CUSTOM_BRANCH" ]; then
echo -e " Discord : ${URL_FOR_DISCORD}"
echo -e " Documentation : ${URL_FOR_DOCS}"
echo -e ""
echo -e " ${INFO_FONT}Trio dev is recommended${NC}"
echo -e " ${INFO_FONT}* Check the settings screen frequently${NC}"
echo -e " ${INFO_FONT}* Download/rebuild when latest dev is at a higher version${NC}"
echo -e ""
echo -e " If you insist on building Trio main, you can no longer use this script."
echo -e " Ask a mentor for help."
echo -e " ${INFO_FONT}Option 1: Trio main is recommended${NC}"
echo -e " ${INFO_FONT}Join Discord before using dev or building a feature branch${NC}"
special_message_0.2_to_0.7
special_message_howto_build_feature_branch
echo -e ""
echo -e "Before you continue, please ensure"
echo -e " you have Xcode and Xcode command line tools installed\n"

options=(\
#"${app_name} main" \
"${app_name} main" \
"${app_name} dev" \
# "${app_name} ${special_branch_name}" \
"$(exit_or_return_menu)")
actions=(\
#"select_main" \
"select_main" \
"select_dev" \
# "select_special_branch" \
"exit_script")
Expand Down
34 changes: 26 additions & 8 deletions src/BuildTrio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,26 @@ function select_special_branch() {
branch_select ${URL_THIS_SCRIPT} ${special_branch_name} ${app_name}_${special_branch_name}
}

function special_message_0.2_to_0.7() {
echo -e ""
echo -e "For those who were running versions of Trio starting with 0.2,"
echo -e " when you build main, you will advance to version 0.7:"
echo -e " As part of this, you will go through an onboarding step"
echo -e " ${INFO_FONT} STOP NOW${NC}"
echo -e "Read this information first, then come back and build"
echo -e " https://triodocs.org/configuration/migration/trio-02x-migration/"
}

function special_message_howto_build_feature_branch() {
echo -e ""
echo -e "For those who want to build a special feature branch, you must use"
echo -e " the BuildTrio script and indicate the desired branch."
echo -e "${INFO_FONT}Make sure you join Discord; and before you build, "
echo -e " read about the new pump or cgm being tested in that feature branch${NC}"
echo -e "Read this section of LoopDocs and just use BuildTrio instead of BuildLoop."
echo -e " https://loopkit.github.io/loopdocs/build/build-dev-mac/#build-other-branches"
}

if [ -z "$CUSTOM_BRANCH" ]; then
while [ -z "$BRANCH" ]; do
section_separator
Expand All @@ -68,23 +88,21 @@ if [ -z "$CUSTOM_BRANCH" ]; then
echo -e " Discord : ${URL_FOR_DISCORD}"
echo -e " Documentation : ${URL_FOR_DOCS}"
echo -e ""
echo -e " ${INFO_FONT}Trio dev is recommended${NC}"
echo -e " ${INFO_FONT}* Check the settings screen frequently${NC}"
echo -e " ${INFO_FONT}* Download/rebuild when latest dev is at a higher version${NC}"
echo -e ""
echo -e " If you insist on building Trio main, you can no longer use this script."
echo -e " Ask a mentor for help."
echo -e " ${INFO_FONT}Option 1: Trio main is recommended${NC}"
echo -e " ${INFO_FONT}Join Discord before using dev or building a feature branch${NC}"
special_message_0.2_to_0.7
special_message_howto_build_feature_branch
echo -e ""
echo -e "Before you continue, please ensure"
echo -e " you have Xcode and Xcode command line tools installed\n"

options=(\
#"${app_name} main" \
"${app_name} main" \
"${app_name} dev" \
# "${app_name} ${special_branch_name}" \
"$(exit_or_return_menu)")
actions=(\
#"select_main" \
"select_main" \
"select_dev" \
# "select_special_branch" \
"exit_script")
Expand Down