From 0e8fde9be6d3918ffe030bed0ba0297bfe330c4d Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Wed, 2 Jan 2019 15:23:59 +1100 Subject: [PATCH] `master` is the new default branch `master` is now the only permanent branch. Features and fixes should be merged into `master` when stable. Pull requests should be forked from `master`. `develop` branch disappear entirely in favor of temporary features/fixes branches. --- .travis.yml | 2 +- CHANGELOG.md | 4 ++++ CONTRIBUTING.md | 6 +++--- README.md | 8 +------- docs/index.md | 3 --- mkdocs.yml | 2 +- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 799a9edf..83931b31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,4 +56,4 @@ jobs: github-token: $GITHUB_TOKEN on: all_branches: true - condition: $TRAVIS_BRANCH =~ ^master|develop$ + condition: $TRAVIS_BRANCH =~ ^master$ diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e015a44..95cf6a20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,10 @@ and this project adheres to [Semantic Versioning](https://semver.org). - Fix time format for duration is incorrect - [#666](https://github.com/PHPOffice/PhpSpreadsheet/pull/666) - Fix iconv unsupported `//IGNORE//TRANSLIT` on IBM i - [#791](https://github.com/PHPOffice/PhpSpreadsheet/issues/791) +### Changed + +- `master` is the new default branch, `develop` does not exist anymore + ## [1.5.2] - 2018-11-25 ### Security diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 62f07721..aed13fe2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,9 +2,9 @@ If you would like to contribute, here are some notes and guidelines: - - All new development happens on feature/fix branches referenced with the GitHub issue number, and are then merged to the develop branch; so the develop branch is always the most up-to-date, working code - - The master branch only contains tagged releases - - If you are going to be submitting a pull request, please fork from develop, and submit your pull request back as a fix/feature branch referencing the GitHub issue number + - All new development happens on feature/fix branches, and are then merged to the `master` branch once stable; so the `master` branch is always the most up-to-date, working code + - Tagged releases are made from the `master` branch + - If you are going to be submitting a pull request, please fork from `master`, and submit your pull request back as a fix/feature branch referencing the GitHub issue number - Code style might be automatically fixed by `composer fix` - All code changes must be validated by `composer check` - [Helpful article about forking](https://help.github.com/articles/fork-a-repo/ "Forking a GitHub repository") diff --git a/README.md b/README.md index 531a9dd3..89f068c9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # PhpSpreadsheet -Master: [![Build Status](https://travis-ci.org/PHPOffice/PhpSpreadsheet.svg?branch=master)](https://travis-ci.org/PHPOffice/PhpSpreadsheet) [![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master) @@ -9,11 +8,6 @@ Master: [![License](https://poser.pugx.org/phpoffice/phpspreadsheet/license.png)](https://packagist.org/packages/phpoffice/phpspreadsheet) [![Join the chat at https://gitter.im/PHPOffice/PhpSpreadsheet](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PhpSpreadsheet) -Develop: -[![Build Status](https://travis-ci.org/PHPOffice/PhpSpreadsheet.png?branch=develop)](https://travis-ci.org/PHPOffice/PhpSpreadsheet) -[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=develop) -[![Code Coverage](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/coverage.png?b=develop)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=develop) - PhpSpreadsheet is a library written in pure PHP and providing a set of classes that allow you to read from and to write to different spreadsheet file formats, like Excel and LibreOffice Calc. ## Documentation @@ -26,7 +20,7 @@ Please ask your support questions on [StackOverflow](https://stackoverflow.com/q PhpSpreadsheet is the next version of PHPExcel. It breaks compatibility to dramatically improve the code base quality (namespaces, PSR compliance, use of latest PHP language features, etc.). -Because all efforts have shifted to PhpSpreadsheet, PHPExcel will no longer be maintained. All contributions for PHPExcel, patches and new features, should target PhpSpreadsheet develop branch. +Because all efforts have shifted to PhpSpreadsheet, PHPExcel will no longer be maintained. All contributions for PHPExcel, patches and new features, should target PhpSpreadsheet `master` branch. ## License diff --git a/docs/index.md b/docs/index.md index fd03afb1..be4e0fd0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -44,9 +44,6 @@ Use [composer](https://getcomposer.org) to install PhpSpreadsheet into your proj composer require phpoffice/phpspreadsheet ``` -**Note:** If you want the unreleased, unstable development version use -`phpoffice/phpspreadsheet:dev-develop` instead. - ## Hello World This would be the simplest way to write a spreadsheet: diff --git a/mkdocs.yml b/mkdocs.yml index 1a224f5c..cf87a142 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,6 +1,6 @@ site_name: PhpSpreadsheet Documentation repo_url: https://github.com/PHPOffice/phpspreadsheet -edit_uri: edit/develop/docs/ +edit_uri: edit/master/docs/ theme: readthedocs extra_css: