-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Arduino-ESP32 release management scripted #1515
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
89859f7
Calculate an absolute path for a custom partitions table (#1452)
ivankravets 90c99fb
* Arduino-ESP32 release management scripted
pacucha42 8051ab5
* secure env for espressif/arduino-esp32
pacucha42 1ca6777
* build tests enabled
pacucha42 f451d60
* gitter room link fixed
pacucha42 2a37ab6
* filepaths fixed
pacucha42 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| #!/usr/bin/env python | ||
| # This script merges two Arduino Board Manager package json files. | ||
| # Usage: | ||
| # python merge_packages.py package_esp8266com_index.json version/new/package_esp8266com_index.json | ||
| # Written by Ivan Grokhotkov, 2015 | ||
| # | ||
| from __future__ import print_function | ||
| from distutils.version import LooseVersion | ||
| import re | ||
| import json | ||
| import sys | ||
|
|
||
| def load_package(filename): | ||
| pkg = json.load(open(filename))['packages'][0] | ||
| print("Loaded package {0} from {1}".format(pkg['name'], filename), file=sys.stderr) | ||
| print("{0} platform(s), {1} tools".format(len(pkg['platforms']), len(pkg['tools'])), file=sys.stderr) | ||
| return pkg | ||
|
|
||
| def merge_objects(versions, obj): | ||
| for o in obj: | ||
| name = o['name'].encode('ascii') | ||
| ver = o['version'].encode('ascii') | ||
| if not name in versions: | ||
| print("found new object, {0}".format(name), file=sys.stderr) | ||
| versions[name] = {} | ||
| if not ver in versions[name]: | ||
| print("found new version {0} for object {1}".format(ver, name), file=sys.stderr) | ||
| versions[name][ver] = o | ||
| return versions | ||
|
|
||
| # Normalize ESP release version string (x.x.x) by adding '-rc<MAXINT>' (x.x.x-rc9223372036854775807) to ensure having REL above any RC | ||
| # Dummy approach, functional anyway for current ESP package versioning (unlike NormalizedVersion/LooseVersion/StrictVersion & similar crap) | ||
| def pkgVersionNormalized(versionString): | ||
|
|
||
| verStr = str(versionString) | ||
| verParts = re.split('\.|-rc', verStr, flags=re.IGNORECASE) | ||
|
|
||
| if len(verParts) == 3: | ||
| verStr = str(versionString) + '-rc' + str(sys.maxint) | ||
| elif len(verParts) != 4: | ||
| print("pkgVersionNormalized WARNING: unexpected version format: {0})".format(verStr), file=sys.stderr) | ||
|
|
||
| return verStr | ||
|
|
||
|
|
||
| def main(args): | ||
| if len(args) < 3: | ||
| print("Usage: {0} <package1> <package2>".format(args[0]), file=sys.stderr) | ||
| return 1 | ||
|
|
||
| tools = {} | ||
| platforms = {} | ||
| pkg1 = load_package(args[1]) | ||
| tools = merge_objects(tools, pkg1['tools']); | ||
| platforms = merge_objects(platforms, pkg1['platforms']); | ||
| pkg2 = load_package(args[2]) | ||
| tools = merge_objects(tools, pkg2['tools']); | ||
| platforms = merge_objects(platforms, pkg2['platforms']); | ||
|
|
||
| pkg1['tools'] = [] | ||
| pkg1['platforms'] = [] | ||
|
|
||
| for name in tools: | ||
| for version in tools[name]: | ||
| print("Adding tool {0}-{1}".format(name, version), file=sys.stderr) | ||
| pkg1['tools'].append(tools[name][version]) | ||
|
|
||
| for name in platforms: | ||
| for version in platforms[name]: | ||
| print("Adding platform {0}-{1}".format(name, version), file=sys.stderr) | ||
| pkg1['platforms'].append(platforms[name][version]) | ||
|
|
||
| pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: LooseVersion(pkgVersionNormalized(k['version'])), reverse=True) | ||
|
|
||
| json.dump({'packages':[pkg1]}, sys.stdout, indent=2) | ||
|
|
||
| if __name__ == '__main__': | ||
| sys.exit(main(sys.argv)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can do this 2DO now and return the original gitter hook