diff --git a/doc/FDROID.md b/doc/FDROID.md index ebf23ee1bb..a2838011dc 100644 --- a/doc/FDROID.md +++ b/doc/FDROID.md @@ -36,7 +36,7 @@ Builds: It contains a list of objects defining each release of the application. In order to add a new release simply copy a previous release object and adjust the following values: * `versionName` - String version like `1.12.0`. -* `versionCode` - Android `versionCode`. We use a timestamp generated by [a script](../scripts/version/gen_build_no.sh). +* `versionCode` - Android `versionCode`. Normally it is generated from timestamp at build time. * `commit` - Specific commit SHA1 from which the given release was built. The `versionCode` should be the same as the one in build that was uploaded to Play Store. @@ -53,6 +53,8 @@ At the bottom of the file you should also update the following keys: Then submit a merge request to the [fdroid/fdroiddata](https://gitlab.com/fdroid/fdroiddata) repository. +:warning: __WARNING__: Currently GitLab PR builds will fail due to running as `root` instead of `vagrant` and failing to install Nix. + # Checking Builds The simplest way to test if the app builds via F-Droid is to use the Docker image: @@ -86,7 +88,7 @@ docker run --rm \ ``` We have to create a user and specify the UID because Nix cannot run as `root` and that is the default user for the F-Droid Docker image. By adding our own user and setting the UID we also make it possible to mount folders like `fdroiddata` and `fdroidserver`. -You can specify a `--vebose` flag for `build` command for additional information. +You can specify a `--verbose` flag for `build` command for additional information. You can provide `--storage-opt size=30G` flag if Docker complains about running out of space. You should also run `lint` and `rewritemeta` for the App ID to verify and fix the YAML metadata formatting.