From 470be5521f4a6652d4752b9fd2828d9abb97c827 Mon Sep 17 00:00:00 2001 From: hossain-khan <99822+hossain-khan@users.noreply.github.com> Date: Fri, 27 Jun 2025 21:51:00 +0000 Subject: [PATCH 1/4] chore: prepare release 1.9.5 --- app/build.gradle.kts | 4 ++-- fastlane/metadata/android/en-US/changelogs/16.txt | 2 ++ metadata/ink.trmnl.android.yml | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/16.txt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4dcfcdf..2ddf48c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,8 +27,8 @@ android { // App versioning is scattered across multiple files. // 👇🏽 Use the following workflow to update versions everywhere automatically ♻️ // https://github.com/usetrmnl/trmnl-android/actions/workflows/version-management.yml - versionCode = 15 - versionName = "1.9.4" + versionCode = 16 + versionName = "1.9.5" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/fastlane/metadata/android/en-US/changelogs/16.txt b/fastlane/metadata/android/en-US/changelogs/16.txt new file mode 100644 index 0000000..b870470 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/16.txt @@ -0,0 +1,2 @@ +- Updated to the latest version (1.9.5) +- Latest TRMNL Mirror app with F-Droid support diff --git a/metadata/ink.trmnl.android.yml b/metadata/ink.trmnl.android.yml index 15db880..c747759 100644 --- a/metadata/ink.trmnl.android.yml +++ b/metadata/ink.trmnl.android.yml @@ -35,9 +35,9 @@ RepoType: git Repo: https://github.com/usetrmnl/trmnl-android.git Builds: - - versionName: 1.9.4 - versionCode: 15 - commit: v1.9.4 + - versionName: 1.9.5 + versionCode: 16 + commit: v1.9.5 subdir: app gradle: - fdroid @@ -47,5 +47,5 @@ MaintainerNotes: This app uses the F-Droid flavor for gradle build. AutoUpdateMode: Version UpdateCheckMode: Tags -CurrentVersion: 1.9.4 -CurrentVersionCode: 15 +CurrentVersion: 1.9.5 +CurrentVersionCode: 16 From c9d73950872e0dd45a6b26360c7dd76f1401275b Mon Sep 17 00:00:00 2001 From: Hossain Khan Date: Fri, 27 Jun 2025 18:07:09 -0400 Subject: [PATCH 2/4] chore: empty commit for triggering workflows From 9706883ebc8591ec330ce2ab18794408c05f6808 Mon Sep 17 00:00:00 2001 From: Hossain Khan Date: Fri, 27 Jun 2025 18:10:42 -0400 Subject: [PATCH 3/4] [ADDED] Note about the limitation of workflow triggering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To ensure that workflows triggered by a bot (like github-actions[bot]) do not get stuck or require manual approval, you need to make the bot a member of your repository or organization. Here's how you can do this: --- ## 1. For GitHub Apps (like Dependabot or a custom bot) - **Install the GitHub App** (e.g., Dependabot, Renovate) directly into your repository or organization. - Go to your repository → Settings → Integrations → GitHub Apps, and click "Configure" or "Install." - Select the repositories or the entire organization where you want the app to have access. - Once installed, the app will act as a member, and workflow runs it triggers will not require manual approval. --- ## 2. For Personal Access Token Bots or Service Accounts If you use a bot account (a separate GitHub user with a PAT): 1. **Invite the bot user** to your repository or organization: - Go to your repo → Settings → Collaborators and teams. - Click "Add people" and invite the bot's GitHub username. - Assign at least "Write" access (higher, if needed). 2. **Accept the invitation** using the bot account. 3. **Configure your workflows or automation** to use this bot's credentials (e.g., via secrets). --- ## 3. For github-actions[bot] (default GitHub Actions bot) - You **cannot add** github-actions[bot] as a member. This bot represents workflow runs triggered by GitHub Actions itself. - To avoid manual approval for this bot: - Set your "Approval for running fork pull request workflows" setting to either: - "Require approval for first-time contributors" (after first PR, future PRs run automatically) - OR "Require approval for first-time contributors who are new to GitHub" (least restrictive) - **Option 3** ("Require approval for all external contributors") will always require manual approval for github-actions[bot], since it cannot be made a member. --- ## 4. For Organization Bots - If you use a bot as part of your organization (like a custom automation user): - Invite the bot to your organization. - Add it to the repository as a member or team member. --- ### Summary Table | Bot Type | Add as Member Possible? | How to Avoid Approval Requirement | |---------------------------|------------------------|---------------------------------------------| | GitHub App (e.g. Dependabot) | Yes | Install app to repo/org | | Custom GitHub User Bot | Yes | Invite as collaborator/org member | | github-actions[bot] | No | Use less restrictive workflow approval mode | --- **Bottom Line:** For github-actions[bot], you can’t add it as a member—just adjust the workflow approval settings as needed. For other bots, invite them as collaborators or install them as apps. If you tell me which specific bot you’re using, I can give more targeted instructions! --- .github/workflows/version-management.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/version-management.yml b/.github/workflows/version-management.yml index b3d97d3..e965519 100644 --- a/.github/workflows/version-management.yml +++ b/.github/workflows/version-management.yml @@ -3,6 +3,10 @@ # # 🔍 TIP: Run `scripts/show_version_info.sh` locally to display current versions and get suggestions # for the next version number before running this workflow. +# +# Due to security restrictions, when PR is opened the workflows are not triggered automatically. +# To trigger the workflows, you can make an empty commit with the following command: +# ```git commit --allow-empty -m "chore: empty commit for triggering workflows" && git push``` name: Version Management on: From 929b69ccb4197483c48817ed4033877271deda90 Mon Sep 17 00:00:00 2001 From: Hossain Khan Date: Fri, 27 Jun 2025 18:12:42 -0400 Subject: [PATCH 4/4] chore: empty commit for triggering workflows