Skip to content

Commit

Permalink
bump module version for 2.3.0-rc.1 (2300)
Browse files Browse the repository at this point in the history
  • Loading branch information
keeramis authored and avtolstoy committed Oct 5, 2021
1 parent d33b4a3 commit 7e5a77e
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 5 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## 2.3.0-rc.1

### FEATURES

- [Boron / B SoM ] Support for SARA R510 [#2359](https://github.com/particle-iot/device-os/pull/2359) [#2365](https://github.com/particle-iot/device-os/pull/2365)
- [Electron] Optional feature to use HSE/LSI as RTC clock source instead of LSE (external 32KHz XTAL) [#2354](https://github.com/particle-iot/device-os/pull/2354)

### INTERNAL

- Fix gcov installation [#2365](https://github.com/particle-iot/device-os/pull/2365)

## 2.2.0

### FEATURES
Expand Down
2 changes: 1 addition & 1 deletion build/release.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -o errexit -o pipefail -o noclobber -o nounset

VERSION="2.2.0"
VERSION="2.3.0-rc.1"

function display_help ()
{
Expand Down
4 changes: 2 additions & 2 deletions build/version.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION_STRING = 2.2.0
VERSION_STRING = 2.3.0-rc.1

# PRODUCT_FIRMWARE_VERSION reported by default
# FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
VERSION = 2202
VERSION = 2300

CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING)
2 changes: 1 addition & 1 deletion modules/shared/system_module_version.mk
Original file line number Diff line number Diff line change
@@ -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 ?= 2202
COMMON_MODULE_VERSION ?= 2300
SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
SYSTEM_PART2_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
SYSTEM_PART3_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
Expand Down
4 changes: 3 additions & 1 deletion system/inc/system_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ extern "C" {
#define SYSTEM_VERSION_v220RC1 SYSTEM_VERSION_RC(2, 2, 0, 1)
#define SYSTEM_VERSION_v220RC2 SYSTEM_VERSION_RC(2, 2, 0, 2)
#define SYSTEM_VERSION_v220 SYSTEM_VERSION_DEFAULT(2, 2, 0)
#define SYSTEM_VERSION SYSTEM_VERSION_v220
#define SYSTEM_VERSION_v230RC1 SYSTEM_VERSION_RC(2, 3, 0, 1)
#define SYSTEM_VERSION SYSTEM_VERSION_v230RC1

/**
* Previously we would set the least significant byte to 0 for the final release, but to make
Expand Down Expand Up @@ -309,6 +310,7 @@ extern "C" {
#define SYSTEM_VERSION_220RC1
#define SYSTEM_VERSION_220RC2
#define SYSTEM_VERSION_220
#define SYSTEM_VERSION_230RC1

typedef struct __attribute__((packed)) SystemVersionInfo
{
Expand Down
1 change: 1 addition & 0 deletions system/system-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
| 1006 | 2200 | 2.2.0-rc.1 | Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
| 1006 | 2201 | 2.2.0-rc.2 | Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
| 1006 | 2202 | 2.2.0 | Photon, P1, Electron, Argon, Boron, B SoM, B5 SoM, Tracker |
| 1006 | 2300 | 2.3.0-rc.1 | 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.

Expand Down

0 comments on commit 7e5a77e

Please sign in to comment.