Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow increment after successful upload + tidyup #4

Merged
merged 11 commits into from
Jun 4, 2020
+135 −90
Merged

Allow increment after successful upload + tidyup #4

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a5f9235
Rename to pre as there will be two stages
pfeerick May 29, 2020
122b4c7
Pre and post functions with documentation update
pfeerick May 29, 2020
2454360
sys import not used, pre no longer needs upload check
pfeerick May 29, 2020
905a9ff
Format had one to many arguments
pfeerick May 29, 2020
348c3db
Create/use include folder for header
pfeerick May 29, 2020
95f6c41
Changes to make pylint happy or for readability
pfeerick May 29, 2020
84bb135
Consistent use of 'patch number', readme update
pfeerick May 29, 2020
bf22d0b
OCD strikes again
pfeerick May 29, 2020
515561b
Not so stilted language
pfeerick May 29, 2020
0c30fe1
Added example variable usage
pfeerick May 29, 2020
f1bbb40
Use guard file to prevent increment if upload fail
pfeerick Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Format had one to many arguments
@pfeerick
pfeerick committed May 29, 2020
commit 905a9ff9e7101b30aa28edd5d55e5e51b34126a2
2 changes: 1 addition & 1 deletion version_increment_post.py
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ def increment_version(source, target, env):
#ifndef BUILD_TIMESTAMP
#define BUILD_TIMESTAMP "{}"
#endif
""".format(version + str(build_no), datetime.datetime.now(), version+str(build_no))
""".format(version + str(build_no), datetime.datetime.now())

if (os.environ.get('PLATFORMIO_INCLUDE_DIR') != None):
VERSION_FILE = os.environ.get('PLATFORMIO_INCLUDE_DIR') + "/" + VERSION_FILE
2 changes: 1 addition & 1 deletion version_increment_pre.py
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@
#ifndef BUILD_TIMESTAMP
#define BUILD_TIMESTAMP "{}"
#endif
""".format(version + str(build_no), datetime.datetime.now(), version+str(build_no))
""".format(version + str(build_no), datetime.datetime.now())

if (os.environ.get('PLATFORMIO_INCLUDE_DIR') != None):
VERSION_FILE = os.environ.get('PLATFORMIO_INCLUDE_DIR') + "/" + VERSION_FILE