Assume branch=master and revision=HEAD by default for all apps

This commit is contained in:
Alexandre Aubin 2021-08-15 16:38:07 +02:00
parent 92ecdf29cd
commit 55db4f6916
2 changed files with 8 additions and 6 deletions

View file

@ -33,8 +33,6 @@ To add your application to the catalog:
App example addition: App example addition:
```json ```json
"wallabag": { "wallabag": {
"branch": "master",
"revision": "HEAD",
"url": "https://github.com/abeudin/wallabag_ynh", "url": "https://github.com/abeudin/wallabag_ynh",
"state": "working" "state": "working"
} }
@ -44,9 +42,10 @@ N.B. : We strongly encourage you to transfer the ownership of your repository to
the Yunohost-Apps organization on Github, such that the community will help you the Yunohost-Apps organization on Github, such that the community will help you
with keeping your app working and up to date with packaging evolutions. with keeping your app working and up to date with packaging evolutions.
N.B.2 : If `"revision": "HEAD"` is used in `apps.json`, any commit to the N.B.2 : Implicitly, the catalog publishes the `HEAD` of branch `master`
`master` branch on your app will automatically be published to the catalog. (this can be overwritten by adding keys `branch` and `revision`).
Therefore we strongly encourage you to develop in separate branches, and only Therefore, **be careful that any commit on the `master` branch will automatically be published**.
**We strongly encourage you to develop in separate branches**, and only
merge changes that were carefully tested. Get in touch with the Apps group to merge changes that were carefully tested. Get in touch with the Apps group to
obtain an access to the developer CI where you'll be able to test your app obtain an access to the developer CI where you'll be able to test your app
easily. easily.

View file

@ -212,6 +212,9 @@ def build_app_dict(app, infos):
this_app_cache = app_cache_folder(app) this_app_cache = app_cache_folder(app)
assert os.path.exists(this_app_cache), "No cache yet for %s" % app assert os.path.exists(this_app_cache), "No cache yet for %s" % app
infos['branch'] = infos.get('branch', 'master')
infos['revision'] = infos.get('revision', 'HEAD')
# If using head, find the most recent meaningful commit in logs # If using head, find the most recent meaningful commit in logs
if infos["revision"] == "HEAD": if infos["revision"] == "HEAD":
relevant_files = ["manifest.json", "actions.json", "hooks/", "scripts/", "conf/", "sources/"] relevant_files = ["manifest.json", "actions.json", "hooks/", "scripts/", "conf/", "sources/"]