diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-04-30 09:21:19 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-30 16:30:27 +0000 |
| commit | 422494675494e5103bb3903e8b5645d3d5817f89 (patch) | |
| tree | c6a2931e8e722d348cdfdebc599e8789f7fe1e06 | |
| parent | b802d7964f2c82d594ee8b0742f9d766aaa1e72b (diff) | |
| download | chrome-ec-422494675494e5103bb3903e8b5645d3d5817f89.tar.gz | |
zephyr: zmake: Change 2nd underscore for a hyphen in version format
According to CL:2861267, this is apparently a load-bearing underscore,
and should look more like the old CroS EC version format for factory
process, GoldenEye, etc. to work out better.
BUG=b:181337770
BRANCH=none
TEST=unit tests
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: Iab293eade1f8252f58e670175b946730405eb498
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2862904
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | zephyr/zmake/tests/test_version.py | 4 | ||||
| -rw-r--r-- | zephyr/zmake/zmake/version.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/zephyr/zmake/tests/test_version.py b/zephyr/zmake/tests/test_version.py index 4235561545..8384a98308 100644 --- a/zephyr/zmake/tests/test_version.py +++ b/zephyr/zmake/tests/test_version.py @@ -78,11 +78,11 @@ def _setup_example_repos(tmp_path): def test_version_string(tmp_path): project, zephyr_base, modules = _setup_example_repos(tmp_path) assert (version.get_version_string(project, zephyr_base, modules) - == 'prj_v2.5.4_mod1:02fd7a,mod2:b5991f,os:2c65cb') + == 'prj_v2.5.4-mod1:02fd7a,mod2:b5991f,os:2c65cb') def test_version_string_static(tmp_path): project, zephyr_base, modules = _setup_example_repos(tmp_path) assert (version.get_version_string(project, zephyr_base, modules, static=True) - == 'prj_v2.5.0_STATIC') + == 'prj_v2.5.0-STATIC') diff --git a/zephyr/zmake/zmake/version.py b/zephyr/zmake/zmake/version.py index 03ffada947..9128dd2bff 100644 --- a/zephyr/zmake/zmake/version.py +++ b/zephyr/zmake/zmake/version.py @@ -71,5 +71,5 @@ def get_version_string(project, zephyr_base, modules, static=False): '{}:{}'.format(name, _get_revision(repo)[:6]) for name, repo in sorted(repos.items())) - return '{}_v{}.{}.{}_{}'.format( + return '{}_v{}.{}.{}-{}'.format( project_id, major_version, minor_version, num_commits, vcs_hashes) |