Skip to content

Commit d65de4a

Browse files
d-a-vdevyte
authored andcommitted
back to 2.6.0-dev (#6072)
* back to dev * emergency procedure * per review * 2.6.0-dev per review
1 parent ac02aff commit d65de4a

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Arduino core for ESP8266 WiFi chip
33

44
# Quick links
55

6-
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.5.0/)
6+
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.5.1/)
77
- [Current "git version" documentation](https://arduino-esp8266.readthedocs.io/en/latest/)
88
- [Install git version](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version) ([sources](doc/installing.rst#using-git-version))
99

@@ -36,7 +36,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
3636
#### Latest release [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
3737
Boards manager link: `https://arduino.esp8266.com/stable/package_esp8266com_index.json`
3838

39-
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.0/](https://arduino-esp8266.readthedocs.io/en/2.5.0/)
39+
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.1/](https://arduino-esp8266.readthedocs.io/en/2.5.1/)
4040

4141
### Using git version (basic instructions)
4242
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)

package/README.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ Here is an overview of the release process. See the section below for detailed i
6565

6666
## Creating a release (for maintainers)
6767

68+
0. Open a new issue to track activities, which will be closed after the release is done.
69+
6870
1. Assemble release notes.
6971

7072
* 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
113115
git tag -a -m "Release 2.5.0" 2.5.0
114116
```
115117
116-
4. Push the tag created in step 3 to esp8266/Arduino Github repository:
118+
then push the tag created in step 3 to esp8266/Arduino Github repository:
117119
118120
```
119121
git push origin 2.5.0
120122
```
121123
124+
4. In case something goes wrong, release can be canceled at any time:
125+
126+
* Tag must be removed (`git tag -d X.Y.Z; git push --delete origin X.Y.Z`)
127+
128+
* Release must be deleted: github > releases > edit x.y.z > remove all files > delete button appears
129+
122130
5. Wait for Travis CI build for the tag to pass, see https://travis-ci.org/esp8266/Arduino/builds.
123131
124132
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# For more info:
66
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
77

8-
name=ESP8266 Boards (2.5.1)
9-
version=2.5.1
8+
name=ESP8266 Boards (2.6.0-dev)
9+
version=2.6.0-dev
1010

1111
# These will be removed by the packager script when doing a JSON release
1212
runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf

0 commit comments

Comments
 (0)