Merge remote-tracking branch 'origin/beta' into release

Author: dandarnell

.github/actions/setup-gradle/action.yml

@@ -27,7 +27,7 @@ runs:
         java-version: '21'
 
     - name: Set up Gradle without cache
-      uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
       with:
         cache-disabled: ${{ inputs.disable-cache }}
         add-job-summary: ${{ inputs.add-job-summary }}

.github/dependabot.yml

@@ -26,3 +26,15 @@ updates:
     commit-message:
       prefix: chore
       include: scope
+  - package-ecosystem: pip
+    open-pull-requests-limit: 10
+    directories:
+      - "/scripts/*"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "type: dependency"
+      - "type: pip"
+    commit-message:
+      prefix: chore
+      include: scope

.github/pull_request_template.md

@@ -1,4 +1,18 @@
-Please ensure that your pull request meets the following requirements - thanks!
+**Thank you for your contribution!**
+
+### Prior to submitting a pull request, please familiarize yourself with...
+
+- Our [Architecture docs](https://github.com/thunderbird/thunderbird-android/tree/main/docs/architecture)
+  - Including the [Architecture Design Records](https://github.com/thunderbird/thunderbird-android/tree/main/docs/architecture/adr)
+- Read [Mozilla’s Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/)
+- Check out our [contribution code quality guides](https://github.com/thunderbird/thunderbird-android/tree/main/docs/contributing), especially our [git commit guide](https://github.com/thunderbird/thunderbird-android/blob/main/docs/contributing/git-commit-guide.md), which can also help you write your pull request title
+
+> [!IMPORTANT]
+> Pull requests may take a few days to weeks to review. We’re a small team and prioritize contributions aligned with our [current roadmap](https://developer.thunderbird.net/planning/android-roadmap). 
+> You can help us by categorizing your pull request with labels. 
+> We appreciate you working with us and will get to reviewing your contribution as soon as we can!
+
+### Please ensure that your pull request meets the following requirements - thanks!
 
 - Does not contain merge commits. Rebase instead.
 - Contains commits with descriptive titles.
@@ -8,5 +22,10 @@ Please ensure that your pull request meets the following requirements - thanks!
 - Uses a descriptive title; don't put issue numbers in there.
 - Contains a reference to the issue that it fixes (e.g. _Closes #XXX_ or _Fixes #XXX_) in the body text.
 - For cosmetic changes add one or multiple images, if possible.
+- Disclose if and how AI was used in the creation of this content
+
+
+\* Finally, please replace this template text with a description of the change and additional context if necessary.
+You may format it however you’d like. Consider including screenshots, descriptions of the problem it solves and how it goes about solving those issues, and any other information you consider relevant. 
 
-Finally, please replace this template text with a description of the change and additional context if necessary.
+As always, thank you for the contribution!

.github/workflows/build-android.yml

@@ -1,4 +1,5 @@
-name: Android CI
+---
+name: Build - Android
 
 on:
   push:
@@ -24,7 +25,7 @@ concurrency:
 
 jobs:
   build-common:
-    name: Build common code
+    name: Build - Common code
     runs-on: ubuntu-latest
     timeout-minutes: 90
 
@@ -55,7 +56,7 @@ jobs:
         uses: ./.github/actions/disk-usage
 
   build-k9:
-    name: Build K9 application
+    name: Build - K9 application
     runs-on: ubuntu-latest
     timeout-minutes: 90
     needs: [build-common]
@@ -69,7 +70,21 @@ jobs:
         uses: ./.github/actions/setup-gradle
 
       - name: Build K9 application
-        run: ./gradlew :app-k9mail:assemble
+        run: ./gradlew :app-k9mail:assemble -Pci=true
+
+  check-badging-k9:
+    name: Check - K9 badging
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+    needs: [ build-common ]
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1
+
+      - name: Setup Gradle environment
+        uses: ./.github/actions/setup-gradle
 
       - name: Check K9 Badging
         run: |
@@ -79,7 +94,7 @@ jobs:
                     -x build
 
   build-thunderbird:
-    name: Build Thunderbird application
+    name: Build - Thunderbird application
     runs-on: ubuntu-latest
     timeout-minutes: 90
     needs: [build-common]
@@ -93,7 +108,21 @@ jobs:
         uses: ./.github/actions/setup-gradle
 
       - name: Build Thunderbird application
-        run: ./gradlew :app-thunderbird:assemble
+        run: ./gradlew :app-thunderbird:assemble -Pci=true
+
+  check-badging-thunderbird:
+    name: Check - Thunderbird badging
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+    needs: [ build-common ]
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1
+
+      - name: Setup Gradle environment
+        uses: ./.github/actions/setup-gradle
 
       - name: Check Thunderbird Badging
         run: |
@@ -107,7 +136,7 @@ jobs:
                     -x build
 
   build-ui-catalog:
-    name: Build UI-catalog application
+    name: Build - UI-catalog application
     runs-on: ubuntu-latest
     timeout-minutes: 90
     needs: [build-common]

.github/workflows/build-cli-tools.yml

@@ -1,4 +1,5 @@
-name: CLI Tools CI
+---
+name: Build - CLI Tools
 
 on:
   push:

.github/workflows/daily_builds.yml .github/workflows/build-daily.yml.github/workflows/daily_builds.yml renamed to .github/workflows/build-daily.yml

@@ -1,5 +1,6 @@
 ---
-name: Daily Builds
+name: Build - Daily App
+
 on:
   workflow_dispatch:
   schedule:
@@ -9,7 +10,7 @@ permissions:
   contents: read
 
 jobs:
-  trigger_daily_build:
+  build-daily:
     if: ${{ github.repository_owner == 'thunderbird' }}
     uses: ./.github/workflows/shippable_builds.yml
     secrets: inherit

.github/workflows/deploy-docs.yml .github/workflows/build-docs.yml.github/workflows/deploy-docs.yml renamed to .github/workflows/build-docs.yml

@@ -1,5 +1,5 @@
 ---
-name: Deploy docs
+name: Build - Docs & Deploy to GitHub Pages
 
 on:
   push:
@@ -14,6 +14,9 @@ concurrency:
   group: "pages"
   cancel-in-progress: false
 
+permissions:
+  contents: read
+
 jobs:
   build-docs:
     if: ${{ github.repository_owner == 'thunderbird' }}
@@ -34,7 +37,7 @@ jobs:
           token: ${{ steps.app-token.outputs.token || github.token }}
 
       - name: Cargo cache
-        uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c  # v1.15.2
+        uses: actions-rust-lang/setup-rust-toolchain@a0b538fa0b742a6aa35d6e2c169b4bd06d225a98  # v1.15.3
 
       - name: Install mdbook and extensions
         run: ./docs/install.sh

.github/workflows/build-scripts.yml

@@ -0,0 +1,37 @@
+---
+name: Build - Scripts
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'scripts/**'
+      - '.github/workflows/build-scripts.yml'
+  pull_request:
+    paths:
+      - 'scripts/**'
+      - '.github/workflows/build-scripts.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build-scripts:
+    name: Build scripts
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1
+
+      - name: Setup Python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # @v6.2.0
+        with:
+          python-version: '3.14'
+
+      - name: Run Python script tests
+        run: bash scripts/test_python_scripts.sh

.github/workflows/fluidscan.yml

@@ -1,6 +1,5 @@
-
 ---
-name: Remove answered label
+name: Issue - Remove answered label
 
 on:
   issues:
@@ -11,7 +10,8 @@ permissions:
   issues: write
 
 jobs:
-  build:
+  issue-needinfo-answered:
+    name: Remove 'answered' label when both exist
     runs-on: ubuntu-latest
     if: |
       contains(github.event.issue.labels.*.name, 'status: needs information') &&