From 2fb71259851d90117adaeb8746d88332ac3ae0f6 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 14 May 2017 15:01:11 +0200 Subject: [PATCH 2/4] Add "Labeling of Issues & Pull Requests" section to CONTRIBUTING.md --- CONTRIBUTING.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c2ef1b9..9d46ede 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,3 +95,34 @@ Version 1.0.0 ``` Travis CI will draft the new [release on GitHub](https://github.com/picocms/Pico/releases) automatically, but will require you to manually amend the descriptions formatting. The latest Pico version is always available at https://github.com/picocms/Pico/releases/latest, so please make sure to publish this URL rather than version-specific URLs. [Packagist](http://packagist.org/packages/picocms/pico) will be updated automatically. + +Labeling of Issues & Pull Requests +---------------------------------- + +Pico makes use of GitHub's label and milestone features, to aide developers in quickly identifying and prioritizing which issues need to be worked on. The starting point for labeling issues and pull requests is the `type` label, which is explained in greater detail below. The `type` label might get combined with a `pri` label, describing the issue's priority, and a `status` label, describing the current status of the issue. + +Issues and pull requests labeled with `info: Feedback Needed` indicate that feedback from others is highly appreciated. We always appreciate feedback at any time and from anyone, but when this label is present, we explicitly *ask* you to give feedback. It would be great if you leave a comment! + +- The `type: Bug` label is assigned to issues or pull requests, which have been identified as bugs or security issues in Pico's core. It might get combined with the `pri: High` label, when the problem was identified as security issue, or as a so-called "show stopper" bug. In contrast, uncritical problems might get labeled with `pri: Low`. `type: Bug` issues and pull requests are usually labeled with one of the following `status` labels when being closed: + - `status: Resolved` is used when the issue has been resolved. + - `status: Conflict` indicates a conflict with another issue. + - `status: Won't Fix` means, that the problem was identified as intended behavior. + - `status: Rejected` is used when the issue was rejected for another reason (e.g. when the issue wasn't reproducible). + +- The `type: Enhancement` and `type: Feature` labels are used to tag pull requests, which introduce either a comparatively small enhancement, or a "big" new feature. As with the `type: Bug` label, they might get combined with the `pri: High` or `pri: Low` labels to indicate the pull request's priority. A pull request isn't necessarily mergeable when being opened, so it might get labeled with `status: Pending Merge` when development of the pull request is finished, but merging isn't intended yet. After merging or closing the pull request, it is labeled with one of the `status` labels as described above for the `type: Bug` label. + +- The `type: Idea` label is similar to the `type: Enhancement` and `type: Feature` labels, but is used for issues or incomplete and abandoned pull requests. It is otherwise used in the exact same way as `type: Enhancement` and `type: Feature`. + +- The `type: Release` label is used in the exact same way as `type: Feature` and indicates the primary pull request of a new Pico release (please refer to the *Branching* and *Build & Release process* sections above). + +- The `type: Notice`, `type: Question` and `type: Discussion` labels are used to indicate "fyi" issues, issues opened by users or developers asking questions, and issues with disucssions about arbitrary topics related to Pico. They are neither combined with `pri` labels, nor with `status` labels. + +- The `type: Duplicate` label is used when there is already another issue or pull request related to this problem or feature request. Issues labeled with `type: Duplicate` are immediately closed. + +- The `type: Invalid` label is used for everything else, e.g. issues or pull requests not related to Pico, or invalid bug reports. + +The `status: Deferred` label might get added to any open issue or pull request to indicate that it still open and will be resolved later. + +Issues and pull requests, which are rather related to upstream projects (i.e. projects Pico depends on, like Twig), are additionally labeled with `info: Upstream`. + +When a issue or pull request isn't directly related to Pico's core, but the project as a whole, it is labeled with `info: Meta`. The same applies to the `info: Website` label, however, in this case it is usually expedient to move the issue to the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io) containing Pico's website. From f0b42cf364aa6d5ca471b4e27eb7a3065a049b1e Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Fri, 26 May 2017 21:43:48 +0200 Subject: [PATCH 3/4] Add explicit dependencies to the PHP extensions "dom" and "mbstring" Pico doesn't require the PHP extensions itself, but erusev/parsedown-extra does. The explicit composer.json requirements are necessary until erusev/parsedown-extra#85 gets merged. Both extensions aren't part of Ubuntu's default LAMP setup anymore. --- composer.json | 2 ++ index.php.dist | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5894970..fc0ad92 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,8 @@ }, "require": { "php": ">=5.3.6", + "ext-dom": "*", + "ext-mbstring": "*", "twig/twig": "^1.18", "erusev/parsedown-extra": "^0.7", "symfony/yaml" : "^2.3" diff --git a/index.php.dist b/index.php.dist index 0ec230c..78125ad 100644 --- a/index.php.dist +++ b/index.php.dist @@ -1,9 +1,15 @@ Date: Mon, 12 Jun 2017 20:11:04 +0200 Subject: [PATCH 4/4] Travis CI: Upgrade to Ubuntu Trusty for HHVM support However, Ubuntu Trusty doesn't support PHP 5.3, so we'll have to continue using Ubuntu Precise for PHP 5.3 --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4389115..fd14373 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: php php: - - 5.3 - 5.4 - 5.5 - 5.6 @@ -11,6 +10,9 @@ php: - hhvm-nightly matrix: + include: + - php: 5.3 + dist: precise allow_failures: - php: nightly - php: hhvm-nightly @@ -44,4 +46,5 @@ deploy: tags: true php: 5.3 +dist: trusty sudo: false