bump module version for 1.2.0-beta.1 (v1201), update CHANGELOG.md

particle-iot · Apr 18, 2019 · 054df97 · 054df97
1 parent 688d4f2
commit 054df97
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,21 @@
+## 1.2.0-beta.1
+
+### FEATURES
+
+- [Enterprise] Immediate Product Firmware Updates [#1732](https://github.com/particle-iot/device-os/pull/1732)
+- [Enterprise] Device Vitals reporting [#1724](https://github.com/particle-iot/device-os/pull/1724)
+
+### INTERNAL
+
+- [test] fixes unit-tests for testing version string with pre-release [#1749](https://github.com/particle-iot/device-os/pull/1749)
+- [test] update upgrade-downgrade.sh to 1.2.0-beta.1 [#1749](https://github.com/particle-iot/device-os/pull/1749)
+
 ## 1.2.0-alpha.1
 
 ### FEATURES
 
-- [Enterprise] Immediate Product Firmware Updates
-- [Enterprise] Device Vitals reporting
+- [Enterprise] Immediate Product Firmware Updates [#1732](https://github.com/particle-iot/device-os/pull/1732)
+- [Enterprise] Device Vitals reporting [#1724](https://github.com/particle-iot/device-os/pull/1724)
 
 ## 1.1.0-rc.1
 

diff --git a/build/release.sh b/build/release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit -o pipefail -o noclobber -o nounset
 
-VERSION="1.2.0-alpha.1"
+VERSION="1.2.0-beta.1"
 
 function display_help ()
 {

diff --git a/build/version.mk b/build/version.mk
@@ -1,7 +1,7 @@
-VERSION_STRING = 1.2.0-alpha.1
+VERSION_STRING = 1.2.0-beta.1
 
 # PRODUCT_FIRMWARE_VERSION reported by default
 # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
-VERSION = 1200
+VERSION = 1201
 
 CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING)
diff --git 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 ?= 1200
+COMMON_MODULE_VERSION ?= 1201
 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
@@ -122,7 +122,8 @@ extern "C" {
 #define SYSTEM_VERSION_v101     0x01000100
 #define SYSTEM_VERSION_v110RC1  0x01010001
 #define SYSTEM_VERSION_v120ALPHA1  SYSTEM_VERSION_ALPHA(1, 2, 0, 1)
-#define SYSTEM_VERSION SYSTEM_VERSION_v120ALPHA1
+#define SYSTEM_VERSION_v120BETA1    SYSTEM_VERSION_BETA(1, 2, 0, 1)
+#define SYSTEM_VERSION SYSTEM_VERSION_v120BETA1
 
 /* previously we would set the least significant byte to 0 for the final release, but to make
  * version comparisons simpler, we will continue incrementing the LSB for the final release in a given
@@ -208,6 +209,7 @@ extern "C" {
 #define SYSTEM_VERSION_101
 #define SYSTEM_VERSION_110RC1
 #define SYSTEM_VERSION_120ALPHA1
+#define SYSTEM_VERSION_120BETA1
 
 typedef struct __attribute__((packed)) SystemVersionInfo
 {

diff --git a/system/system-versions.md b/system/system-versions.md
@@ -88,6 +88,7 @@
 | 201 | 1002 | 1.0.1       |       Core, Photon, P1, Electron |
 | 300 | 1100 | 1.1.0-rc.1  |       Core, Photon, P1, Electron, Xenon, Argon, Boron, Xenon-SoM, Argon-SoM, Boron-SoM |
 | 300 | 1200 | 1.2.0-alpha.1  |    Photon, P1, Electron, Boron |
+| 300 | 1201 | 1.2.0-beta.1   |    Core, Photon, P1, Electron, Xenon, Argon, Boron |
 
 [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.