2023-02-15 15:11:03 +00:00
|
|
|
# Create K-9 Mail releases
|
|
|
|
|
|
|
|
## One-time setup
|
|
|
|
|
|
|
|
1. Download `tb-android keystore` from 1Password and place it somewhere outside the root of the Git repository.
|
|
|
|
2. Add the following to `~/.gradle/gradle.properties` (create the file if necessary)
|
|
|
|
```
|
2023-02-16 16:50:51 +00:00
|
|
|
k9mail.storeFile=<path to keystore>
|
|
|
|
k9mail.storePassword=<password 'tb-android keystore' in 1Password>
|
|
|
|
k9mail.keyAlias=k9mail
|
|
|
|
k9mail.keyPassword=<password 'k9mail@tb-android' in 1Password>
|
2023-02-15 15:11:03 +00:00
|
|
|
```
|
|
|
|
|
2024-01-17 14:01:18 +00:00
|
|
|
### One-time setup for F-Droid builds
|
2023-10-04 12:42:26 +00:00
|
|
|
|
2024-01-17 14:01:18 +00:00
|
|
|
1. Install _fdroidserver_ by following
|
|
|
|
the [installation instructions](https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools).
|
|
|
|
1. On MacOS, it's best to install the latest version from source, because the version in Homebrew has some issues.
|
|
|
|
1. Install the android command line tools if not available already.
|
|
|
|
```
|
|
|
|
brew install --cask android-commandlinetools
|
|
|
|
```
|
|
|
|
2. Install latest _fdroidserver_ from source:
|
|
|
|
```
|
|
|
|
python -m venv fdroidserver-env
|
|
|
|
source fdroidserver-env/bin/activate
|
|
|
|
pip install git+https://gitlab.com/fdroid/fdroidserver.git
|
|
|
|
```
|
|
|
|
3. To use _fdroidserver_ from the command line, you need to activate the virtual environment before each use:
|
|
|
|
```
|
|
|
|
source fdroidserver-env/bin/activate
|
|
|
|
```
|
|
|
|
4. To deactivate the virtual environment:
|
|
|
|
```
|
|
|
|
deactivate
|
|
|
|
```
|
|
|
|
2. [Sign up for a Gitlab account](https://gitlab.com/users/sign_up) and fork
|
|
|
|
the [fdroiddata](https://gitlab.com/fdroid/fdroiddata) repository.
|
2023-10-05 13:50:04 +00:00
|
|
|
3. Clone your fork of the _fdroiddata_ repository.
|
2023-10-04 12:42:26 +00:00
|
|
|
|
2023-02-15 15:11:03 +00:00
|
|
|
## Release a beta version
|
|
|
|
|
2024-01-17 14:01:18 +00:00
|
|
|
1. Update versionCode and versionName in `app-k9mail/build.gradle.kts`
|
2023-02-15 15:11:03 +00:00
|
|
|
2. Create change log entries in
|
|
|
|
- `app/ui/legacy/src/main/res/raw/changelog_master.xml`
|
2024-03-14 12:47:42 +00:00
|
|
|
- `app-metadata/com.fsck.k9/en-US/changelogs/${versionCode}.txt`
|
2023-02-15 15:11:03 +00:00
|
|
|
Use past tense. Try to keep them high level. Focus on the user (experience).
|
2024-04-07 12:51:59 +00:00
|
|
|
3. Update the metadata link to point to K-9 Mail's data:
|
|
|
|
`ln --symbolic --no-dereference --force app-metadata/com.fsck.k9 metadata`
|
|
|
|
4. Commit the changes. Message: "Version $versionName"
|
|
|
|
5. Run `./gradlew clean :app-k9mail:assembleRelease --no-build-cache --no-configuration-cache`
|
|
|
|
6. Update an existing installation to make sure the app is signed with the proper key and runs on a real device.
|
2023-02-15 15:11:03 +00:00
|
|
|
```
|
2024-01-17 14:01:18 +00:00
|
|
|
adb install -r app-k9mail/build/outputs/apk/release/app-k9mail-release.apk
|
2023-02-15 15:11:03 +00:00
|
|
|
```
|
2024-04-07 12:51:59 +00:00
|
|
|
7. Tag as $versionName, e.g. `6.508`
|
|
|
|
8. Copy `app-k9mail/build/outputs/apk/release/app-k9mail-release.apk` as `k9-${versionName}.apk` to Google Drive (MZLA
|
2024-01-17 14:01:18 +00:00
|
|
|
Team > K9 > APKs)
|
2024-04-07 12:51:59 +00:00
|
|
|
9. Change versionName in `app-k9mail/build.gradle.kts` to next version name followed by `-SNAPSHOT`
|
|
|
|
10. Commit the changes. Message: "Prepare for version $newVersionName"
|
|
|
|
11. Update `gh-pages` branch with the new change log
|
|
|
|
12. Push `main` branch
|
|
|
|
13. Push tags
|
|
|
|
14. Push `gh-pages` branch
|
2023-02-15 15:11:03 +00:00
|
|
|
|
|
|
|
### Create release on GitHub
|
|
|
|
|
2023-11-02 11:18:12 +00:00
|
|
|
1. Go to https://github.com/thunderbird/thunderbird-android/tags and select the appropriate tag
|
2023-02-15 15:11:03 +00:00
|
|
|
2. Click "Create release from tag"
|
|
|
|
3. Fill out the form
|
|
|
|
- Click "Generate release notes"
|
|
|
|
- Replace contents under "What's changed" with change log entries
|
|
|
|
- Add GitHub handles in parentheses to change log entries
|
|
|
|
- If necessary, add another entry "Internal changes" (or similar) so people who contributed changes outside of the
|
|
|
|
entries mentioned in the change log can be mentioned via GitHub handle.
|
|
|
|
- Attach the APK
|
|
|
|
- Select "Set as a pre-release"
|
|
|
|
- Click "Publish release"
|
|
|
|
|
|
|
|
### Create release on F-Droid
|
|
|
|
|
2023-10-05 13:50:04 +00:00
|
|
|
1. Fetch the latest changes from the _fdroiddata_ repository.
|
|
|
|
2. Switch to a new branch in your copy of the _fdroiddata_ repository.
|
2024-01-17 14:01:18 +00:00
|
|
|
3. Edit `metadata/com.fsck.k9.yml` to create a new entry for the version you want to release. Usually it's copy & paste
|
|
|
|
of the previous entry and adjusting `versionName`, `versionCode`, and `commit` (use the tag name).
|
|
|
|
Leave `CurrentVersion` and `CurrentVersionCode` unchanged. Those specify which version is the stable/recommended
|
|
|
|
build.
|
2024-03-14 13:12:07 +00:00
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
|
|
```yaml
|
|
|
|
- versionName: "${versionName}"
|
|
|
|
versionCode: ${versionCode}
|
|
|
|
commit: "${tagName}"
|
|
|
|
subdir: app-k9mail
|
|
|
|
gradle:
|
|
|
|
- yes
|
|
|
|
scandelete:
|
|
|
|
- build-plugin/build
|
|
|
|
```
|
|
|
|
|
2024-02-22 22:43:48 +00:00
|
|
|
4. Commit the changes. Message: "Update K-9 Mail to $newVersionName (beta)"
|
2023-10-05 13:50:04 +00:00
|
|
|
5. Run `fdroid build --latest com.fsck.k9` to build the project using F-Droid's toolchain.
|
|
|
|
6. Push the changes to your fork of the _fdroiddata_ repository.
|
2024-01-17 14:01:18 +00:00
|
|
|
7. Open a merge request on Gitlab. (The message from the server after the push in the previous step should contain a
|
|
|
|
URL)
|
2023-10-05 13:50:04 +00:00
|
|
|
8. Select the _App update_ template and fill it out.
|
2023-10-04 12:42:26 +00:00
|
|
|
9. Create merge request and the F-Droid team will do the rest.
|
2023-02-15 15:11:03 +00:00
|
|
|
|
|
|
|
### Create release on Google Play
|
|
|
|
|
2024-02-06 10:51:54 +00:00
|
|
|
1. Go to the [Google Play Console](https://play.google.com/console/)
|
|
|
|
2. Select the _K-9 Mail_ app
|
|
|
|
3. Click on _Open testing_ in the left sidebar
|
|
|
|
4. Click on _Create new release_
|
|
|
|
5. Upload the APK to _App bundles_
|
|
|
|
6. Fill out Release name (e.g. "$versionCode ($versionName)")
|
2024-03-14 12:47:42 +00:00
|
|
|
7. Fill out Release notes (copy from `app-metadata/com.fsck.k9/en-US/changelogs/${versionCode}.txt`)
|
2024-02-06 10:51:54 +00:00
|
|
|
8. Click _Next_
|
|
|
|
9. Review the release
|
2024-02-22 22:43:48 +00:00
|
|
|
10. Configure a full rollout for beta versions
|
|
|
|
11. On the Publishing overview page, click _Send change for review_
|
|
|
|
12. Wait for the review to complete
|
|
|
|
13. In case of a rejection, fix the issues and repeat the process
|
|
|
|
|
|
|
|
## Release a stable version
|
|
|
|
|
|
|
|
1. If this is the first stable release in a series, create a new maintenance branch, e.g. `6.8-MAINT`
|
|
|
|
2. Switch to the appropriate maintenance branch
|
|
|
|
3. Update versionCode and versionName in `app-k9mail/build.gradle.kts` (stable releases use an even digit after the
|
|
|
|
dot, e.g. `5.400`, `6.603`)
|
|
|
|
4. Create change log entries in
|
|
|
|
- `app/ui/legacy/src/main/res/raw/changelog_master.xml`
|
|
|
|
- `app-k9mail/fastlane/metadata/android/en-US/changelogs/${versionCode}.txt`
|
|
|
|
Use past tense. Try to keep them high level. Focus on the user (experience).
|
2024-04-07 12:51:59 +00:00
|
|
|
5. Update the metadata link to point to K-9 Mail's data:
|
|
|
|
`ln --symbolic --no-dereference --force app-metadata/com.fsck.k9 metadata`
|
|
|
|
6. Commit the changes. Message: "Version $versionName"
|
|
|
|
7. Run `./gradlew clean :app-k9mail:assembleRelease --no-build-cache --no-configuration-cache`
|
|
|
|
8. Update an existing installation to make sure the app is signed with the proper key and runs on a real device.
|
2024-02-22 22:43:48 +00:00
|
|
|
```
|
|
|
|
adb install -r app-k9mail/build/outputs/apk/release/app-k9mail-release.apk
|
|
|
|
```
|
2024-04-07 12:51:59 +00:00
|
|
|
9. Tag as $versionName, e.g. `6.800`
|
|
|
|
10. Copy `app-k9mail/build/outputs/apk/release/app-k9mail-release.apk` as `k9-${versionName}.apk` to Google Drive (MZLA
|
|
|
|
Team > K9 > APKs)
|
|
|
|
11. Update `gh-pages` branch with the new change log. Create a new file if it's the first stable release in a series.
|
|
|
|
12. Push maintenance branch
|
|
|
|
13. Push tags
|
|
|
|
14. Push `gh-pages` branch
|
2024-02-22 22:43:48 +00:00
|
|
|
|
|
|
|
### Create release on GitHub
|
|
|
|
|
|
|
|
1. Go to https://github.com/thunderbird/thunderbird-android/tags and select the appropriate tag
|
|
|
|
2. Click "Create release from tag"
|
|
|
|
3. Fill out the form
|
|
|
|
- Click "Generate release notes"
|
|
|
|
- Replace contents under "What's changed" with change log entries
|
|
|
|
- Add GitHub handles in parentheses to change log entries
|
|
|
|
- If necessary, add another entry "Internal changes" (or similar) so people who contributed changes outside of the
|
|
|
|
entries mentioned in the change log can be mentioned via GitHub handle.
|
|
|
|
- Attach the APK
|
|
|
|
- Select "Set as the latest release"
|
|
|
|
- Click "Publish release"
|
|
|
|
|
|
|
|
### Create release on F-Droid
|
|
|
|
|
|
|
|
1. Fetch the latest changes from the _fdroiddata_ repository.
|
|
|
|
2. Switch to a new branch in your copy of the _fdroiddata_ repository.
|
|
|
|
3. Edit `metadata/com.fsck.k9.yml` to create a new entry for the version you want to release. Usually it's copy & paste
|
|
|
|
of the previous entry and adjusting `versionName`, `versionCode`, and `commit` (use the tag name).
|
|
|
|
Change `CurrentVersion` and `CurrentVersionCode` to the new values, making this the new stable/recommended build.
|
2024-03-27 12:38:24 +00:00
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
|
|
```yaml
|
|
|
|
- versionName: "${versionName}"
|
|
|
|
versionCode: ${versionCode}
|
|
|
|
commit: "${tagName}"
|
|
|
|
subdir: app-k9mail
|
|
|
|
gradle:
|
|
|
|
- yes
|
|
|
|
scandelete:
|
|
|
|
- build-plugin/build
|
|
|
|
```
|
|
|
|
|
2024-02-22 22:43:48 +00:00
|
|
|
4. Commit the changes. Message: "Update K-9 Mail to $newVersionName"
|
|
|
|
5. Run `fdroid build --latest com.fsck.k9` to build the project using F-Droid's toolchain.
|
|
|
|
6. Push the changes to your fork of the _fdroiddata_ repository.
|
|
|
|
7. Open a merge request on Gitlab. (The message from the server after the push in the previous step should contain a
|
|
|
|
URL)
|
|
|
|
8. Select the _App update_ template and fill it out.
|
|
|
|
9. Create merge request and the F-Droid team will do the rest.
|
|
|
|
|
|
|
|
### Create release on Google Play
|
|
|
|
|
|
|
|
1. Go to the [Google Play Console](https://play.google.com/console/)
|
|
|
|
2. Select the _K-9 Mail_ app
|
|
|
|
3. Click on _Production_ in the left sidebar
|
|
|
|
4. Click on _Create new release_
|
|
|
|
5. Upload the APK to _App bundles_
|
|
|
|
6. Fill out Release name (e.g. "$versionCode ($versionName)")
|
|
|
|
7. Fill out Release notes (copy from `app-k9mail/fastlane/metadata/android/en-US/changelogs/${versionCode}.txt`)
|
|
|
|
8. Click _Next_
|
|
|
|
9. Review the release
|
|
|
|
10. Start with a staged rollout (usually 20%)
|
2024-02-06 10:51:54 +00:00
|
|
|
11. On the Publishing overview page, click _Send change for review_
|
|
|
|
12. Wait for the review to complete
|
|
|
|
13. In case of a rejection, fix the issues and repeat the process
|
|
|
|
14. Once the review is complete, monitor the staged rollout for issues and increase the rollout percentage as necessary
|
2024-02-06 17:37:03 +00:00
|
|
|
|
2024-02-22 22:43:48 +00:00
|
|
|
## Troubleshooting
|
2024-02-06 17:37:03 +00:00
|
|
|
|
|
|
|
### F-Droid
|
|
|
|
|
|
|
|
If the app doesn't show up in the F-Droid client:
|
|
|
|
|
|
|
|
- Check the build cycle, maybe you just missed it and it will be available in the next cycle. (The cycle is usually every 5 days.)
|
|
|
|
- Check [F-Droid Status](https://fdroidstatus.org/status/fdroid) for any issues.
|
|
|
|
- Check [F-Droid Monitor](https://monitor.f-droid.org/builds) for any errors mentioning `com.fsck.k9`.
|