Skip to content

Commit c915561

Browse files
dnzxydnzxy
authored
Merge pull request nightscout#1059 from nightscout/release/v0.7.0
Release/v0.7.0
2 parents a50a3f6 + c5b7ecd commit c915561

1,340 files changed

Lines changed: 375654 additions & 84705 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/FUNDING.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
custom: ["https://www.nightscoutfoundation.org/donate"]

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: "🆘 Individual troubleshooting help: Please go to the Discord Trio Server"
4-
url: https://discord.com/invite/FnwFEFUwXE
4+
url: https://discord.triodocs.org
55
about: Are you having an issue with your individual setup? Please first go to the Discord Trio Server and post there, with details of your setup (App version, pump, CGM, and CGM app) and the issue you are observing

‎.github/workflows/add_identifiers.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ jobs:
88
name: Validate
99
uses: ./.github/workflows/validate_secrets.yml
1010
secrets: inherit
11-
11+
1212
identifiers:
1313
name: Add Identifiers
1414
needs: validate
15-
runs-on: macos-15
15+
runs-on: macos-26
1616
steps:
1717
# Checks-out the repo
1818
- name: Checkout Repo
19-
uses: actions/checkout@v4
20-
19+
uses: actions/checkout@v5
20+
2121
# Patch Fastlane Match to not print tables
2222
- name: Patch Match Tables
2323
run: |
@@ -36,7 +36,7 @@ jobs:
3636
# Sync the GitHub runner clock with the Windows time server (workaround as suggested in https://github.com/actions/runner/issues/2996)
3737
- name: Sync clock
3838
run: sudo sntp -sS time.windows.com
39-
39+
4040
# Create or update identifiers for app
4141
- name: Fastlane Provision
4242
run: bundle exec fastlane identifiers

‎.github/workflows/add_to_project.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 8. DONT RUN Add bugs to bugs project
1+
name: zzz [DO NOT RUN] Add Bugs to Project 'Bugs'
22

33
on:
44
issues:

‎.github/workflows/auto_version_dev.yml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
# -----------------------------------------------------------------------------
2+
# Workflow: `auto_version_dev.yml`
3+
#
4+
# Description:
5+
# This GitHub Actions workflow automatically manages and increments the
6+
# `APP_DEV_VERSION` defined in `Config.xcconfig` on every push to `dev` branch.
7+
# This version is used for internal tracking and diagnostics (e.g. in
8+
# Crashlytics) and follows a 4-digit semantic versioning format:
9+
# `MAJOR.MINOR.PATCH.FEATURE`.
10+
#
11+
# Versioning Logic:
12+
# - Reads the base version from `APP_VERSION = x.y.z`
13+
# - Reads the last internal dev version from `APP_DEV_VERSION`
14+
#
15+
# Behavior:
16+
# - If `APP_DEV_VERSION` matches `APP_VERSION` (e.g. both are `0.5.0`),
17+
# it assumes the first dev push after a release and sets `APP_DEV_VERSION`
18+
# to `APP_VERSION.1` (e.g. `0.5.0.1`)
19+
# - If `APP_DEV_VERSION` is already in 4-digit form (e.g. `0.5.0.3`),
20+
# it increments the fourth digit (e.g. → `0.5.0.4`)
21+
#
22+
# Example Progression:
23+
# - Release sets `APP_VERSION = 0.5.0`, `APP_DEV_VERSION = 0.5.0`
24+
# - First push to `dev`: → `APP_DEV_VERSION = 0.5.0.1`
25+
# - Second push to `dev`: → `APP_DEV_VERSION = 0.5.0.2`
26+
# - ...
27+
#
28+
# Commit Handling:
29+
# The updated value is committed and pushed back to the `dev` branch.
30+
# - The bump commit includes the `[skip ci]` tag in its message
31+
# - This prevents the workflow from re-triggering itself in a loop
32+
#
33+
#
34+
# Prerequisites:
35+
# - `APP_VERSION` must be present in `Config.xcconfig` in the form `x.y.z`
36+
# - `APP_DEV_VERSION` must either match `APP_VERSION` or be `x.y.z.w`
37+
# - GitHub Actions must have write permission to push to `dev`
38+
# - This workflow only runs when the repository owner is `nightscout`
39+
# -----------------------------------------------------------------------------
40+
41+
name: zzz [DO NOT RUN] Bump APP_DEV_VERSION on dev push
42+
43+
on:
44+
push:
45+
branches:
46+
- dev
47+
48+
jobs:
49+
bump-dev-version:
50+
if: github.repository_owner == 'nightscout'
51+
runs-on: ubuntu-latest
52+
53+
steps:
54+
- name: Checkout repo
55+
uses: actions/checkout@v5
56+
with:
57+
token: ${{ secrets.TRIO_TOKEN_AUTOBUMP }}
58+
59+
- name: Set up Git
60+
run: |
61+
git config --global user.name "github-actions[bot]"
62+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
63+
64+
- name: Bump APP_DEV_VERSION
65+
run: |
66+
FILE=Config.xcconfig
67+
68+
# Read current APP_VERSION
69+
BASE_VERSION=$(grep '^APP_VERSION' "$FILE" | cut -d '=' -f2 | xargs)
70+
71+
# Read existing APP_DEV_VERSION, if any
72+
DEV_LINE=$(grep '^APP_DEV_VERSION' "$FILE" || echo "")
73+
if [ -z "$DEV_LINE" ]; then
74+
CURRENT_DEV_VERSION="$BASE_VERSION"
75+
else
76+
CURRENT_DEV_VERSION=$(echo "$DEV_LINE" | cut -d '=' -f2 | xargs)
77+
fi
78+
79+
echo "APP_VERSION = $BASE_VERSION"
80+
echo "APP_DEV_VERSION = $CURRENT_DEV_VERSION"
81+
82+
# Decide next dev version
83+
if [ "$CURRENT_DEV_VERSION" = "$BASE_VERSION" ]; then
84+
# First post-release commit to dev → bump to .1
85+
NEW_DEV_VERSION="${BASE_VERSION}.1"
86+
if [ -z "$DEV_LINE" ]; then
87+
echo "APP_DEV_VERSION = $NEW_DEV_VERSION" >> "$FILE"
88+
else
89+
sed -i -E "s|^APP_DEV_VERSION *= *.*|APP_DEV_VERSION = $NEW_DEV_VERSION|" "$FILE"
90+
fi
91+
else
92+
# Already in .X form → bump last digit
93+
IFS='.' read -r MAJOR MINOR PATCH FEATURE <<< "$CURRENT_DEV_VERSION"
94+
FEATURE=$((FEATURE + 1))
95+
NEW_DEV_VERSION="$MAJOR.$MINOR.$PATCH.$FEATURE"
96+
sed -i -E "s|^APP_DEV_VERSION *= *.*|APP_DEV_VERSION = $NEW_DEV_VERSION|" "$FILE"
97+
fi
98+
99+
echo "NEW APP_DEV_VERSION = $NEW_DEV_VERSION"
100+
echo "NEW_DEV_VERSION=$NEW_DEV_VERSION" >> $GITHUB_ENV
101+
102+
- name: Commit and push updated dev version
103+
run: |
104+
git add Config.xcconfig
105+
git commit -m "CI: Bump APP_DEV_VERSION to $NEW_DEV_VERSION [skip ci]"
106+
git push

0 commit comments

Comments
 (0)