Skip to content

Commit 73e4cd3

Browse files
authored
Merge pull request #837 from marionbarker/working-docs
Make instructions to build dev branch more straightforward
2 parents 29408ef + ea32183 commit 73e4cd3

File tree

3 files changed

+52
-31
lines changed

3 files changed

+52
-31
lines changed

docs/gh-actions/automatic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Note that the weekly and monthly `Build Loop` actions will continue, but the act
2525
* If you want to only build when an update has been found: set `SCHEDULED_BUILD` to false and either do not create `SCHEDULED_SYNC` or set it to true
2626
* **Warning**: if no updates to your default branch are detected within 90 days, your previous TestFlight build may expire requiring a manual build
2727

28-
| <div style="width:110px">`SCHEDULED_SYNC`</div> | <div style="width:110px">`SCHEDULED_BUILD`</div> | Automatic Actions |
28+
| <div style="width:120px">`SCHEDULED_SYNC`</div> | <div style="width:120px">`SCHEDULED_BUILD`</div> | Automatic Actions |
2929
|---|---|---|
3030
| `true` (or NA) | `true` (or NA) | keep-alive, weekly update check (auto update/build), monthly build with auto update|
3131
| `true` (or NA) | `false` | keep-alive, weekly update check with auto update, only builds if update detected|

docs/gh-actions/build-dev-browser.md

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* You should be following along with zulipchat when using the `dev branch`
1919
* Summary build updates can be found under the [One-Time Changes](#one-time-changes) section
2020

21-
You can build any desired branch (available at LoopKit/LoopWorkspace) using the *GitHub* Browser build method. This section is suitable if you have already built either `dev` or main branch using the [GitHub First-Time](gh-first-time.md) instructions.
21+
You can build any desired branch (available at LoopKit/LoopWorkspace) using the *GitHub* Browser build method. This section is suitable if you have already built either `dev` or main branch using the [GitHub First-Time](gh-first-time.md){: target="_blank" } instructions.
2222

2323
The graphics on this page show the `dev` branch. If you want a different branch, just substitute that branch name for `dev`.
2424

@@ -56,6 +56,8 @@ Each step in the list below matches with the number in the graphic. In the top h
5656

5757
### Update `Branch`
5858

59+
> **If you normally build released code, but decided to build the `dev branch` because you want the features and bug fixes found there, please do not update the fork for the `dev branch` without first finding out what has changed since your last build.**
60+
5961
Tap the `Code` button (upper left) and ensure this branch in your `fork` is up to date.
6062

6163
* Select the desired branch in the dropdown menu (this graphic shows `dev` branch)
@@ -72,41 +74,41 @@ If you have already completed the One-Time Changes, skip ahead to [Build `Branch
7274

7375
#### Transition to `dev`
7476

75-
When updating from&nbsp;_<span translate="no">Loop</span>_&nbsp;3.2.x to `dev`, you will need to take some extra steps.
77+
When updating from&nbsp;_<span translate="no">Loop</span>_&nbsp;3.2.3 to `dev`, you will need to take some extra steps.
7678

77-
You have a choice:
79+
**We recommend most users leave their default branch as `main`.**
7880

79-
* You can change your default branch to `dev`, see [Change Default `Branch`](#change-default-branch) and then your&nbsp;_<span translate="no">Loop</span>_&nbsp;app will be automatically updated and automatically built at least once a month
80-
* Be sure to review the [Modify Automatic Building](automatic.md#modify-automatic-building) section
81-
* You can leave your default branch at main, but no automated updates will happen
82-
* Running each action below requires you to select the `dev` branch in the drop-down menu
81+
* This is the safest choice if you are choosing to build `dev branch` now because you want the bug fixes and features that are found in `dev`
82+
* When version 3.4.0 is released, most users will return to the building the `main branch`
83+
* At that time, simply update your `main` branch and return to using released code
84+
* Each action below requires you to select the `dev` branch in the drop-down menu
8385

84-
Here is a summary of the extra steps; each step has an associated link. This assumes you have already updated your `fork` and are at the correct branch.
86+
Here is a summary of the extra steps you will follow as you progress through this section.
8587

86-
1. Confirm the status of your &nbsp;<span translate="no">*GitHub* Personal Access Token</span>
88+
1. Confirm the status of your&nbsp;<span translate="no">*GitHub* Personal Access Token</span>
8789
* It should be configured with permission scope of `repo, workflow` and to never expire
88-
* You can check this using directions at [*GitHub* Token](gh-update.md#github-token)
89-
1. Next, follow along in this section to perform these steps before you build
90-
* Add and Update `New Indentifier`
91-
* `Create Certificates`
90+
* You can check this using directions at [*GitHub* Token](gh-update.md#github-token){: target="_blank" }
91+
1. [Add and Update `New Identifier`](#add-and-update-new-identifier)
92+
1. [`Create Certificates`](#create-certificates)
93+
1. [`Build Loop`](#build-branch)
9294

9395
#### Automatic Creation of `alive branch`
9496

95-
!!! warning "What about the `alive branch`"
97+
The `alive branch` is created automatically when you run the `Build Loop` action using the `dev branch` (version 3.3 or later). It is used as part of the automatic build process that will be released with the next version.
98+
99+
??? warning "I got an error regarding the `alive branch` (click to open/close)"
96100
* Sometimes you get an error about the `alive branch`
97-
* It should be created for you automatically if you are building with the `dev branch` **and** you have `workflow` permission added to the `scope` for your *GitHub* `Personal Access Token`
98-
* If necessary, delete the `alive branch` and run the `Build Loop` action again
101+
* If you do get an error, delete the `alive branch` and run the `Build Loop` action again
102+
* Use this [GitHub link](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository#deleting-a-branch){: target="_blank" } or ask for help when deleting a branch
99103

100104
#### Add and Update New `Identifier`
101105

102106
The `bundle ID` for the "`widget`" changed from "`SmallStatusWidget`" to the more descriptive "`LoopWidgetExtension`".
103107

104-
* You need to run Add Identifier - be sure that you run this for the `dev branch`
108+
* You need to run `Add Identifier` - be sure to select the `dev branch` when you run this action
105109
* Wait for it to succeed
106110
* Add the `App Group` to this one new Identifier
107111

108-
All other identifiers should be already set up. If they are not, please go through the steps on the [Configure to Use Browser](gh-first-time.md) page to figure out what you are missing.
109-
110112
| `NAME` | `IDENTIFIER` |
111113
|-------|------------|
112114
| `Loop Widget Extension` | `com.TEAMID.loopkit.Loop.LoopWidgetExtension` |
@@ -115,26 +117,41 @@ All other identifiers should be already set up. If they are not, please go throu
115117
* Click on the "`LoopWidgetExtension`" identifier
116118
* Edit the App Group to include `group.com.TEAMID.loopkit.LoopGroup` where you use your `TEAMID`
117119

118-
#### Create Certificates and Build
120+
??? tip "Other Identifiers (Click to Open/Close)"
121+
All other identifiers should be already set up.
122+
123+
* If they are not, refer to [Configure to Use Browser: Add App Group to Identifiers](gh-first-time.md#add-app-group-to-identifiers){: target="_blank" }
124+
* With the `dev branch`, only the App Group needs to be added; all other `Identifier` settings are automatically included.
119125

120-
You must create certificates again to cover the new Identifier name and to provide support for the addition of the Libre sensors. (This step is required whether you use Libre or not - Loop needs permission to have that capability). Once the certificate action succeeds, then run the action to build Loop.
126+
#### Create Certificates
121127

122-
1. Run the Action for Create Certificates - be sure that you run this for the `dev branch`
123-
1. Run the Action for `Build Loop` (see [Build `Branch`](#build-branch))
128+
You must run the action `Create Certificates` again because the `Identifiers` were updated. Be sure that you run this for the `dev branch`
124129

125130
### Build `Branch`
126131

127-
If you want a branch to be the one you build all the time, you may choose to [Change Default `Branch`](#change-default-branch). This is not necessary except for special cases.
132+
> **We recommend most users leave their default branch as `main`.**
128133
129-
If you have one branch as default, for example main, and choose to build a different branch, there is an extra step when you `Build Loop`. Refer to step 4 in the graphic below. Use the branch dropdown menu to select the branch you want before hitting the green Run workflow button.
134+
If you have one branch as default, for example `main`, and choose to build a different branch, there is an extra step when you `Build Loop`. In addition to the normal steps 1, 2 and 3 in the graphic below, you must also do the (optional) step. Select the `dev branch` in the `branch dropdown` menu before continuing to step 4 and tapping on the green Run workflow button.
130135

131136
![build loop using github actions](img/action-04-build-loop.svg){width="700"}
132137
{align="center"}
133138

134-
!!!
139+
#### Refresh, Do Not Repeat
140+
141+
!!! tip "Hit Refresh"
142+
After you tap the green Run workflow button, *GitHub* can be slow to update.
143+
144+
* Refresh the browser if you are unsure if the action started
145+
* Do not start a new action until the first one completes
146+
147+
## Automatic Update & Build
148+
149+
The automatic update and build features of the development branch are only available if you set the `dev` branch as your default branch. Be sure to read the [Automatic Update & Build](automatic.md) if you did this.
135150

136151
## Change Default `Branch`
137152

153+
> **We recommend most users leave their default branch as `main`.**
154+
138155
There can be several reasons why you would change your default branch.
139156

140157
* It can be convenient to have the branch you build most be configured as the default branch
@@ -171,7 +188,3 @@ For the numbered steps below, refer to the graphic found under each group of ste
171188
{align="center"}
172189

173190
Your default branch has been changed.
174-
175-
## Automatic Update & Build
176-
177-
The automatic update and build features of the development branch are only available if you set the `dev` branch as your default branch. Be sure to read the [Automatic Update & Build](automatic.md) if you did this.

docs/gh-actions/gh-first-time.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,14 @@ You will now be checking the status for 3 more identifiers to ensure the `App Gr
10441044
| `Loop Status Extension` | `com.TEAMID.loopkit.Loop.statuswidget` |
10451045
| `Small Status Widget` | `com.TEAMID.loopkit.Loop.SmallStatusWidget` |
10461046
1047+
Tap on the **IDENTIFIER** row:
1048+
1049+
* In the `App Services` column, scroll down to the `App Groups` row
1050+
* Ensure the check box (under the `Capabilities` column) for `App Groups` is checked
1051+
* If the word `Configure` shows up, tap on it
1052+
* This opens the `App Group Assignment` screen
1053+
* Check the box by `Loop` *App Group* that uses your `TEAMID` in `group.com.TEAMID.loopkit.LoopGroup` and then `Continue`
1054+
10471055
!!! tip "Double-check when finished with this step"
10481056
When you think you have completed this step, double check to make sure all 4 `Identifiers` listed in the table have the `App Group` added.
10491057

0 commit comments

Comments
 (0)