back to 2.6.0-dev

README.md

@@ -3,7 +3,7 @@ Arduino core for ESP8266 WiFi chip
 
 # Quick links
 
-- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.5.0/)
+- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.5.1/)
 - [Current "git version" documentation](https://arduino-esp8266.readthedocs.io/en/latest/)
 - [Install git version](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version) ([sources](doc/installing.rst#using-git-version))
 
@@ -36,7 +36,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
 #### Latest release [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
 Boards manager link: `https://arduino.esp8266.com/stable/package_esp8266com_index.json`
 
-Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.0/](https://arduino-esp8266.readthedocs.io/en/2.5.0/)
+Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.1/](https://arduino-esp8266.readthedocs.io/en/2.5.1/)
 
 ### Using git version (basic instructions)
 [![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)

package/README.md

@@ -65,6 +65,8 @@ Here is an overview of the release process. See the section below for detailed i
 
 ## Creating a release (for maintainers)
 
+0. Open a new issue to track activities, which will be closed after the release is done.
+
 1. Assemble release notes.
 
     * Since most changes are integrated into master using squash-rebase policy (i.e. one commit per PR), `git log --oneline` gives a good overview of changes in the release.
@@ -113,12 +115,18 @@ The following points assume work in a direct clone of the repository, and not in
    git tag -a -m "Release 2.5.0" 2.5.0
    ```
 
-4. Push the tag created in step 3 to esp8266/Arduino Github repository:
+   then push the tag created in step 3 to esp8266/Arduino Github repository:
 
    ```
    git push origin 2.5.0
    ```
 
+4. In case something goes wrong, release can be canceled at any time:
+
+    * Tag must be removed (`git tag -d X.Y.Z; git push --delete origin X.Y.Z`)
+
+    * Release must be deleted: github > releases > edit x.y.z > remove all files > delete button appears
+
 5. Wait for Travis CI build for the tag to pass, see https://travis-ci.org/esp8266/Arduino/builds. 
 
 6. Check that the new (draft) release has been created (no editing at this point!), see https://github.com/esp8266/Arduino/releases. Check that the boards manager package .zip file has been successfully uploaded as a release artifact.

platform.txt

@@ -5,8 +5,8 @@
 # For more info:
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
 
-name=ESP8266 Boards (2.5.1)
-version=2.5.1
+name=ESP8266 Boards (2.6.0-dev)
+version=2.6.0-dev
 
 # These will be removed by the packager script when doing a JSON release
 runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf