From fd97c220717c7f205ef3245a806a4f6724a1889d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 13 Jun 2019 23:54:48 +0200 Subject: [PATCH 1/2] Update pull_request_template.md --- pull_request_template.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index 6d9c60e..ccfefad 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,13 +11,8 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -- [ ] **Code review** -- [ ] **Approval (LGTM)** -*Code review and approval have to be from a member of @YunoHost/apps group* -- **CI succeeded** : -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/wikijs_ynh%20-BRANCH-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/wikijs_ynh%20-BRANCH-/) -*Please replace '-BRANCH-' in this link by the name of the branch used.* -*If the PR is from a forked repository. Please provide public results from package_check.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* + +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/wikijs_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/wikijs_ynh%20PR-NUM-%20(USERNAME)/) From 2cf76627afd1017b6c6a402ff9482c31a96f460a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 14 Jun 2019 22:48:21 +0200 Subject: [PATCH 2/2] Upgrade to 2.0.0-beta.180 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index da5846b..9192944 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ An open source, modern and powerful wiki app built on Node.js, Git and Markdown **Wiki.js** require a dedicated **root domain**, eg. wikijs.domain.tld -**Shipped version:** 2.0.0-beta.174 +**Shipped version:** 2.0.0-beta.180 ## Screenshots diff --git a/conf/app.src b/conf/app.src index d4f62a2..8c76491 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.0.0-beta.174/wiki-js.tar.gz -SOURCE_SUM=34001cda470c5154d4539871267418b849b8e15b0fbe8cf7ffdae92d12b88c5e +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.0.0-beta.180/wiki-js.tar.gz +SOURCE_SUM=7ad9afb6b84ebbfbd270c6a5b25c46c2b4803c86f4d5f0468f918092749cf3f4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 792d866..9842053 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open source, modern and powerful wiki app built on Node.js, Git and Markdown.", "fr": "Un wiki moderne et open source propulsé Node.js, Git et Markdown." }, - "version": "2.0.0-beta.174~ynh1", + "version": "2.0.0-beta.180~ynh1", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": {