From ffb263277b37ca64ae07ef98639cde285a64ee01 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 13 Jun 2019 23:52:30 +0200 Subject: [PATCH 1/3] 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 5a287e4..4190ff6 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/peertube_ynh%20-BRANCH-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/peertube_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/peertube_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/peertube_ynh%20PR-NUM-%20(USERNAME)/) From b8d44ebd8b85128398d9811a05e221ba01703970 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 16 Jun 2019 16:05:09 +0200 Subject: [PATCH 2/3] Update check_process --- check_process | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/check_process b/check_process index a33b389..02afa94 100644 --- a/check_process +++ b/check_process @@ -20,22 +20,13 @@ upgrade=1 from_commit=cc324108b47f3f9f862f03a82eac1370ea11e246 backup_restore=1 multi_instance=1 - incorrect_path=0 + # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. + # incorrect_path=1 port_already_use=1 change_url=0 ;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto -# Level 4: not supported by upstream - Level 4=1 -# Level 5: + # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Options Email=anmol@datamol.org;yalh@yahoo.com Notification=yes From 22ca62492ce32d22ac710758bca4e3be0534566c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 17 Jun 2019 21:08:10 +0200 Subject: [PATCH 3/3] Upgrade to 1.3.1 --- 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 71e59fb..472bf77 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Servers are run independently by different people and organizations. They can ap By watching a video, you help the hosting provider to broadcast it by becoming a broadcaster of the video yourself. Each instance doesn’t need much money to broadcast the videos of its users. -**Shipped version:** 1.3.0 +**Shipped version:** 1.3.1 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 43ec89f..b68a873 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.3.0/peertube-v1.3.0.tar.xz -SOURCE_SUM=651789564bb4238c00f826bbe1e5b1dca9c13b9aaf4a87b922e0b7af5ebb8b77 +SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.3.1/peertube-v1.3.1.tar.xz +SOURCE_SUM=57737960c07122207f0126488750d675c64403f325aea5f094408e0140e2061c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.xz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 71165d3..f4305c0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Video streaming platform using P2P directly in the web browser, connected to a federated network", "fr": "Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé" }, - "version": "1.3.0~ynh2", + "version": "1.3.1~ynh1", "url": "https://github.com/Chocobozzz/PeerTube", "license": "AGPL-3.0-only", "maintainer": [