diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-11-02 19:58:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-11-02 19:58:18 +0100 |
| commit | 1e54719c0e155ca217f8b7a28adee00d113d5080 (patch) | |
| tree | ce04b65099ad3b6dd2e5b775324b862c02e391c8 /scripts | |
| parent | 7c633bf98a9831784d1492b0a0b2f9dc6be7840c (diff) | |
| parent | dff0f8193d46e2ab93e1801cb24b1cd052b8125e (diff) | |
| download | vyos-build-1e54719c0e155ca217f8b7a28adee00d113d5080.tar.gz vyos-build-1e54719c0e155ca217f8b7a28adee00d113d5080.zip | |
Merge pull request #1341 from c-po/T9547
build: T9547: rolling images use the 999 default version instead of 1.5
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 8ac5d4dc..469e4a3b 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -485,9 +485,12 @@ def build(): with open('../data/versions') as f: version_mapping = json.load(f) - branch_version = version_mapping[git_branch] - - version = "{0}-rolling-{1}".format(branch_version, build_timestamp) + # Branches without a mapping (e.g. rolling) use the default version + branch_version = version_mapping.get(git_branch) + if branch_version: + version = "{0}-rolling-{1}".format(branch_version, build_timestamp) + else: + version = "999.{0}".format(build_timestamp) except Exception as e: print("W: Could not build a version string specific to git branch, falling back to default: {0}".format(str(e))) version = "999.{0}".format(build_timestamp) |
