From 55f59c1dd0975618aa84fd7247ff5e45e0adb23c Mon Sep 17 00:00:00 2001 From: Andrey Tolstoy Date: Thu, 4 Jun 2020 01:55:15 +0700 Subject: [PATCH] bump module version for 2.0.0-alpha.2 (2001) --- CHANGELOG.md | 2 +- build/release.sh | 2 +- build/version.mk | 4 ++-- modules/shared/system_module_version.mk | 2 +- system/inc/system_version.h | 4 +++- system/system-versions.md | 1 + 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea4c990527..cf63a9283e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.0.0-alpha.1 +## 2.0.0-alpha.1, 2.0.0-alpha.2 ### BREAKING CHANGES diff --git a/build/release.sh b/build/release.sh index 40d9e93ec0..30ac2f19ff 100755 --- a/build/release.sh +++ b/build/release.sh @@ -1,7 +1,7 @@ #!/bin/bash set -o errexit -o pipefail -o noclobber -o nounset -VERSION="2.0.0-alpha.1" +VERSION="2.0.0-alpha.2" function display_help () { diff --git a/build/version.mk b/build/version.mk index 36409f0dfc..965a87b384 100755 --- a/build/version.mk +++ b/build/version.mk @@ -1,7 +1,7 @@ -VERSION_STRING = 2.0.0-alpha.1 +VERSION_STRING = 2.0.0-alpha.2 # PRODUCT_FIRMWARE_VERSION reported by default # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release -VERSION = 2000 +VERSION = 2001 CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING) diff --git a/modules/shared/system_module_version.mk b/modules/shared/system_module_version.mk index 4c0a5a2955..62a8ba5a43 100644 --- a/modules/shared/system_module_version.mk +++ b/modules/shared/system_module_version.mk @@ -1,6 +1,6 @@ # Skip to next 100 every v0.x.0 release (e.g. 108 for v0.6.2 to 200 for v0.7.0-rc.1) # Bump by 1 for every prerelease or release with the same v0.x.* base. -COMMON_MODULE_VERSION ?= 2000 +COMMON_MODULE_VERSION ?= 2001 SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) SYSTEM_PART2_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) SYSTEM_PART3_MODULE_VERSION ?= $(COMMON_MODULE_VERSION) diff --git a/system/inc/system_version.h b/system/inc/system_version.h index 7d8d855b29..560db20e84 100644 --- a/system/inc/system_version.h +++ b/system/inc/system_version.h @@ -154,7 +154,8 @@ extern "C" { #define SYSTEM_VERSION_v152 SYSTEM_VERSION_DEFAULT(1, 5, 2) #define SYSTEM_VERSION_v153TRACKER1 SYSTEM_VERSION_RC(1, 5, 3, 1) #define SYSTEM_VERSION_v200ALPHA1 SYSTEM_VERSION_ALPHA(2, 0, 0, 1) -#define SYSTEM_VERSION SYSTEM_VERSION_v200ALPHA1 +#define SYSTEM_VERSION_v200ALPHA2 SYSTEM_VERSION_ALPHA(2, 0, 0, 2) +#define SYSTEM_VERSION SYSTEM_VERSION_v200ALPHA2 /** * Previously we would set the least significant byte to 0 for the final release, but to make @@ -273,6 +274,7 @@ extern "C" { #define SYSTEM_VERSION_152 #define SYSTEM_VERSION_153TRACKER1 #define SYSTEM_VERSION_200ALPHA1 +#define SYSTEM_VERSION_200ALPHA2 typedef struct __attribute__((packed)) SystemVersionInfo { diff --git a/system/system-versions.md b/system/system-versions.md index 92012bc378..03b246fd52 100644 --- a/system/system-versions.md +++ b/system/system-versions.md @@ -120,6 +120,7 @@ | 502 | 1512 | 1.5.2 | Photon, P1, Electron, Xenon, Argon, Boron, B SoM, B5 SoM | | 502 | 1513 | 1.5.3-tracker.1 | Tracker | | 1000 | 2000 | 2.0.0-alpha.1 | Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker | +| 1000 | 2001 | 2.0.0-alpha.2 | Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker | [1] For 0.8.0-rc.1, The v101 bootloader was also released in the Github releases as v200. Thus the next released bootloader in the 0.8.x line should be v201. As of 4/5/2018: 22 device had v200 bootloaders.