diff --git a/src/lib/version/px_update_git_header.py b/src/lib/version/px_update_git_header.py index 024563b598..4b9b06d252 100755 --- a/src/lib/version/px_update_git_header.py +++ b/src/lib/version/px_update_git_header.py @@ -97,9 +97,10 @@ except: if tag_or_branch is None: # replace / so it can be used as directory name tag_or_branch = git_branch_name.replace('/', '-') - # either a release or main branch (used for metadata) + # either a release or master branch (used for metadata) + # CI uploads to 'master/' on S3 for legacy QGC compatibility if not tag_or_branch.startswith('release-'): - tag_or_branch = 'main' + tag_or_branch = 'master' header += f""" #define PX4_GIT_VERSION_STR "{git_version}" @@ -109,7 +110,7 @@ header += f""" #define PX4_GIT_OEM_VERSION_STR "{oem_tag}" -#define PX4_GIT_TAG_OR_BRANCH_NAME "{tag_or_branch}" // special variable: git tag, release or main branch +#define PX4_GIT_TAG_OR_BRANCH_NAME "{tag_or_branch}" // special variable: git tag, release or master branch """