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.

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

phase1: satisfy getver.sh requirements #9

Merged
merged 1 commit into from May 23, 2023
Merged

phase1: satisfy getver.sh requirements #9

merged 1 commit into from May 23, 2023

Conversation

f00b4r0
Copy link
Contributor

@f00b4r0 f00b4r0 commented May 23, 2023

scripts/getver.sh requires upstream branch tracking to correctly compute revision number. Buildbot Git() step does not set branch tracking as it checks out individual commits and then reset the target branch to it, so in order for getver.sh to work, this workaround forcefully sets the upstream branch.

This fixes malformed version code in filenames as observed on openwrt-23.05:

r23001+3-38c150612c
instead of:
r23004-7f0db09513

scripts/getver.sh requires upstream branch tracking to correctly compute
revision number. Buildbot Git() step does not set branch tracking as it
checks out individual commits and then reset the target branch to it, so
in order for getver.sh to work, this workaround forcefully sets the
upstream branch.

This fixes malformed version code in filenames as observed on
openwrt-23.05:

r23001+3-38c150612c
instead of:
r23004-7f0db09513

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
@Ansuel
Copy link
Member

Ansuel commented May 23, 2023

@hnyman tada :D

@hnyman
Copy link

hnyman commented May 23, 2023

@Ansuel
great that the bug (apparently related to the new buildbot config code) and a fix was found. ;-)

Like I earlier said to you, it seemed to be related to the buildbot only, as local build env showed the correct versioning.

@f00b4r0
Copy link
Contributor Author

f00b4r0 commented May 23, 2023

it was indeed done in old code, "hidden" in the gitcheckout step which was removed:

command = "if [ -d .git ]; then git checkout -f %s && git branch --set-upstream-to origin/%s || rm -fr .git; else exit 0; fi" %(repo_branch, repo_branch),

So I think this is indeed the correct fix; assuming it doesn't explode elsewhere of course ;P

@ynezz ynezz merged commit 2b415c0 into openwrt:master May 23, 2023
0 of 2 checks passed
@ynezz
Copy link
Member

ynezz commented May 23, 2023

The build queue is quite long, I've applied this changes manually and it seems to be fine, thanks!

@ynezz
Copy link
Member

ynezz commented May 23, 2023

And first build with that fix https://downloads.openwrt.org/releases/23.05-SNAPSHOT/targets/apm821xx/sata/

@aparcar
Copy link
Member

aparcar commented May 23, 2023

Nice work everyone

@hnyman
Copy link

hnyman commented May 24, 2023

Ps. the mirror https://git.openwrt.org/?p=buildbot.git;a=summary strangely shows the tag "v6" but not the actual commit in the log of master. This commit can only be seen if the v6 tag is opened and then looked at the log from that perspective.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants