Skip to content

Commit

Permalink
Separate release version
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed May 17, 2018
1 parent 3dc446a commit 1ef9a53
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions platformio.ini
Expand Up @@ -40,7 +40,7 @@ platform = https://github.com/platformio/platform-espressif32.git

; firmware version, please modify it between releases
; positive integer value
version = 1
release_version = 1

; build configuration based on Bintray and Wi-Fi settings
build_flags =
Expand All @@ -49,7 +49,6 @@ build_flags =
'-DBINTRAY_USER="${bintray.user}"'
'-DBINTRAY_REPO="${bintray.repository}"'
'-DBINTRAY_PACKAGE="${bintray.package}"'
-DVERSION=${common.version}

; extra dependencies
lib_deps = ArduinoJson
Expand All @@ -62,7 +61,9 @@ lib_deps = ArduinoJson
platform = ${common.platform}
framework = arduino
board = esp32dev
build_flags = ${common.build_flags}
build_flags =
${common.build_flags}
-DVERSION=0
lib_deps = ${common.lib_deps}
monitor_speed = 115200
upload_speed = 921600
Expand All @@ -73,7 +74,9 @@ upload_speed = 921600
platform = ${common.platform}
framework = arduino
board = esp32dev
build_flags = ${common.build_flags}
build_flags =
${common.build_flags}
-DVERSION=${common.release_version}
lib_deps = ${common.lib_deps}
upload_protocol = custom
extra_scripts = pre:publish_firmware.py
2 changes: 1 addition & 1 deletion publish_firmware.py
Expand Up @@ -20,7 +20,7 @@

project_config = util.load_project_config()
bintray_config = {k: v for k, v in project_config.items("bintray")}
version = project_config.get("common", "version")
version = project_config.get("common", "release_version")

#
# Push new firmware to the Bintray storage using API
Expand Down

0 comments on commit 1ef9a53

Please sign in to comment.