From ade76372a06fc2c0c2cd6496c9ffe798267dfd60 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Sat, 11 May 2019 18:01:45 +0200 Subject: [PATCH 1/4] back to dev --- README.md | 4 ++-- platform.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5bfcca8e76..eee84f1652 100644 --- a/README.md +++ b/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) diff --git a/platform.txt b/platform.txt index 7097d93161..fa26b2d6b2 100644 --- a/platform.txt +++ b/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) +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 From 8f108fcd22c5a5b5007359947b15f495ee4284b0 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Sun, 12 May 2019 00:12:10 +0200 Subject: [PATCH 2/4] emergency procedure --- package/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/README.md b/package/README.md index c80f6a6998..10adb8fbc6 100644 --- a/package/README.md +++ b/package/README.md @@ -65,6 +65,12 @@ Here is an overview of the release process. See the section below for detailed i ## Creating a release (for maintainers) +0. In case something goes wrong, release can be canceled: + + * 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 + 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. From 62615a52d2f0a823c07794208e6c4f5131c800af Mon Sep 17 00:00:00 2001 From: david gauchard Date: Sun, 12 May 2019 00:38:23 +0200 Subject: [PATCH 3/4] per review --- package/README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/README.md b/package/README.md index 10adb8fbc6..a67a77d3ad 100644 --- a/package/README.md +++ b/package/README.md @@ -65,11 +65,7 @@ Here is an overview of the release process. See the section below for detailed i ## Creating a release (for maintainers) -0. In case something goes wrong, release can be canceled: - - * 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 +0. Open a new issue to track activities, which will be closed after the release is done. 1. Assemble release notes. @@ -119,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. From b533512be1d176164584cad95659a3f1df6866a2 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Sun, 12 May 2019 01:30:14 +0200 Subject: [PATCH 4/4] 2.6.0-dev per review --- platform.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.txt b/platform.txt index fa26b2d6b2..2ba6dfefa0 100644 --- a/platform.txt +++ b/platform.txt @@ -5,7 +5,7 @@ # For more info: # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification -name=ESP8266 Boards (2.6.0) +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