From 6c29e5c3fa4588db545a70095faadb0530187839 Mon Sep 17 00:00:00 2001 From: TobiGr Date: Sun, 31 Dec 2023 12:50:21 +0100 Subject: [PATCH 1/2] Add instructions to update main F-Droid repo --- docs/07_release_instructions.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/07_release_instructions.md b/docs/07_release_instructions.md index f459209..20fd3e8 100644 --- a/docs/07_release_instructions.md +++ b/docs/07_release_instructions.md @@ -238,7 +238,7 @@ Now on the remote `master` branch there is the release code which you need to tu ## Having the APK signed by @TheAssassin -Currently @TheAssassin is the only holder of NewPipe's APK signing keys. Therefore you should send the unsigned APK to him, after which he will sign it and send it back to you. He will also then publish the signed APK in NewPipe's F-Droid repo. +Currently, @TheAssassin is the only holder of NewPipe's APK signing keys. Therefore, you should send the unsigned APK to him, after which he will sign it and send it back to you. He will also then publish the signed APK in NewPipe's F-Droid repo. - Rename `app-release-unsigned.apk` to `NewPipe_vX.X.X.apk` - Generate a signature for the APK file @@ -264,6 +264,17 @@ Currently @TheAssassin is the only holder of NewPipe's APK signing keys. Therefo - Publish the release - Profit :-D +## Publish the release through the F-Droid main repo +Once the release is tagged, F-Droid is able to build and the sign the APK. Since NewPipe's APK is reproducible, the APK built by F-Droid will be identical to the one you built locally. Therefore, you can publish the release through the F-Droid main repo, which will make the new version available to all users. However, a second APK which is only signed by F-Droid is also published in their main repo. For that reason, we need to update the metadata and add signing data for the new version manually: + +- Clone or update F-Droid metadata repo + - `git clone https://gitlab.com/fdroid/fdroiddata.git` / `git pull` +- Change to the fdroiddata directory: `cd fdroiddata` +- Update the metadata for NewPipe in the corresponding file (`metadata/org.schabi.newpipe`) by copying the metadata from the previous version and updating the version number and the commit hash of the tagged release: +- Add the signature of the new version: `fdroid signatures path/to/NewPipe_vX.X.X.apk` (install [`fdroidserver`](https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools/) if you don't have it yet) +- Commit the changes: `git commit -m "Update org.schabi.NewPipe to X.X.X (VERSION_CODE)"` +- Push the changes and open a Merge Request to the fdroiddata repo (choose the app update template for the MR) + ## Blog post The blog post writers need an up-to-date list of merged PRs numbered in chronological order. This is so that they can keep track of what changes have already been detailed in the draft blog post, and which ones still need to be added. So make sure that there is always at least one up-to-date "master copy" of the draft release notes available for them to review. From 49767840927b8b85ec4571521d0ad3850e3339e5 Mon Sep 17 00:00:00 2001 From: Tobi Date: Mon, 20 May 2024 20:27:05 +0200 Subject: [PATCH 2/2] Update docs/07_release_instructions.md Co-authored-by: opusforlife2 <53176348+opusforlife2@users.noreply.github.com> --- docs/07_release_instructions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/07_release_instructions.md b/docs/07_release_instructions.md index 20fd3e8..521db0c 100644 --- a/docs/07_release_instructions.md +++ b/docs/07_release_instructions.md @@ -265,7 +265,7 @@ Currently, @TheAssassin is the only holder of NewPipe's APK signing keys. Theref - Profit :-D ## Publish the release through the F-Droid main repo -Once the release is tagged, F-Droid is able to build and the sign the APK. Since NewPipe's APK is reproducible, the APK built by F-Droid will be identical to the one you built locally. Therefore, you can publish the release through the F-Droid main repo, which will make the new version available to all users. However, a second APK which is only signed by F-Droid is also published in their main repo. For that reason, we need to update the metadata and add signing data for the new version manually: +Once the release is tagged, F-Droid is able to build and sign the APK. Since NewPipe's APK is reproducible, the APK built by F-Droid will be identical to the one you built locally. Therefore, you can publish the release through the F-Droid main repo, which will make the new version available to all users. However, a second APK which is only signed by F-Droid is also published in their main repo. For that reason, we need to update the metadata and add signing data for the new version manually: - Clone or update F-Droid metadata repo - `git clone https://gitlab.com/fdroid/fdroiddata.git` / `git pull`