Opened 9 years ago

Closed 9 years ago

Last modified 8 years ago

#11575 closed defect (fixed)

1.5 shipped with dojo.version = 1.4

Reported by: Douglas Hays Owned by: Douglas Hays
Priority: high Milestone: 1.5.1
Component: Core Version: 1.5
Keywords: Cc: ben hockey
Blocked By: Blocking:

Description

dojo.version for 1.5 (dojo/_base/loader/bootstrap.js) contains:
major: 1, minor: 4, patch: 0, flag: "dev"
Showing as 1.4 is messing up some tools.

Change History (12)

comment:1 Changed 9 years ago by ben hockey

the tag has the right version...

http://bugs.dojotoolkit.org/browser/tags/release-1.5.0/dojo/_base/_loader/bootstrap.js#L245

where are you seeing the problem?

comment:2 Changed 9 years ago by Douglas Hays

I am looking at http://bugs.dojotoolkit.org/browser/branches/1.5/dojo/_base/_loader/bootstrap.js so does that mean the branch for 1.5 service was created before the 1.5.0 tag was made?

comment:3 Changed 9 years ago by ben hockey

that's interesting... the branch was made in r22501 and the version was updated in r22487. i guess we'll wait and see what peller has to say. actually... i have an idea that the branch was made from trunk and the version number change was only applied to the tag. i'll bet that was it, because i know i updated the version number in trunk and at the time it was 1.4 and i changed it to 1.6 in r22497

comment:4 Changed 9 years ago by James Burke

neonstalwart: I think you are correct: http://bugs.dojotoolkit.org/browser/util/trunk/buildscripts/build_release.sh does the build script stuff, but it does not do the branch, so if the branch is done before the release script is run, I can see the version still being old.

comment:5 Changed 9 years ago by Adam Peller

so iiuc bumping the version in the trunk is a manual operation. Doug, please manually update the 1.5 branch as well. Unless we feel there's an obvious way to update the release scripts to know when such a bump is required, we probably leave things the way they are and this is a wontfix (or Doug, you can close this as fixed by updating the version number, but we'll continue to do this manually for future releases and branches)

comment:6 Changed 9 years ago by Douglas Hays

Owner: changed from Adam Peller to Douglas Hays
Status: newassigned

comment:7 Changed 9 years ago by Douglas Hays

Does this line need to be updated for 1.5.0 ?

var rev = "$Rev: 21438 $".match(/\d+/);

comment:8 in reply to:  7 Changed 9 years ago by dante

Replying to doughays:

Does this line need to be updated for 1.5.0 ?

var rev = "$Rev: 21438 $".match(/\d+/);

no. $rev: ... $ is an svn thing. It updates when the export is run.

comment:9 Changed 9 years ago by Douglas Hays

Resolution: fixed
Status: assignedclosed

(In [22734]) Fixes #11575 !strict. Change dojo.version to 1.5.1 in 1.5 branch.

comment:10 Changed 9 years ago by Adam Peller

to be technical, on the branch, it should really say 1.5.0 dev or 1.5 something dev. The version will be set to 1.5.1 and beyond when those tags get cut from the branch.

comment:11 Changed 9 years ago by dante

agree with peller. branches/1.5/ should have hard coded version number

Perhaps we could switch up the release step? make the branch first, and tag 1.5.0 from the immediate branching of /1.5/ ?

we burn the release number into the tree we use to cut the release and commit back already.

comment:12 Changed 8 years ago by dante

(In [23930]) bumping trunk to 1.7.0dev. 1.6.0 final tagged, running docs etc now. 1.6/ branch in place for 1.6.1 commits. 1.5.1rc1 is still outstanding, should run a build from that too? refs #11575 \!strict

Note: See TracTickets for help on using tickets.