Closed Bug 407351 Opened 12 years ago Closed 12 years ago

trunk support for Bootstrap::Step::Stage

Categories

(Release Engineering :: General, defect, P2)

defect

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: bhearsum, Assigned: bhearsum)

References

Details

Attachments

(5 files, 3 obsolete files)

Attached patch add bz2 support to Stage. (obsolete) — Splinter Review
I missed a line in Stage.pm that forces .tar.gz for Linux. This patch fixes it.
Attachment #292074 - Flags: review?(rhelmer)
Priority: -- → P2
Comment on attachment 292074 [details] [diff] [review]
add bz2 support to Stage.

Hmm I need to look at this code more.. source tarball has been .tar.bz2 for a long time, could this code be confused by that?

Also, why not use the useTarGz variable? Would make it easier to find and remove instances of this kind of thing once 1.8 branch goes away :)
Comment on attachment 292074 [details] [diff] [review]
add bz2 support to Stage.

Ok, I see in the code that the source tarball is dealt with before this.

I don't really feel strongly about the useTarGz thing, how you have it is fine, so that's up to you.
Attachment #292074 - Flags: review?(rhelmer) → review+
Attachment #292074 - Attachment is obsolete: true
Attachment #292389 - Flags: review?(rhelmer)
Attachment #292389 - Flags: review?(rhelmer) → review+
Checking in Bootstrap/Step/Stage.pm;
/cvsroot/mozilla/tools/release/Bootstrap/Step/Stage.pm,v  <--  Stage.pm
new revision: 1.25; previous revision: 1.24
done
Status: ASSIGNED → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Forgot to 'make test' this...:
Backslash found where operator expected at Bootstrap/Step/Stage.pm line 625, near "} elsif ($dirent =~ /\"
  (Might be a runaway multi-line // string starting on line 621)
	(Missing operator before \?)
Global symbol "$config" requires explicit package name at Bootstrap/Step/Stage.pm line 611.
Global symbol "$config" requires explicit package name at Bootstrap/Step/Stage.pm line 612.
Global symbol "$parts" requires explicit package name at Bootstrap/Step/Stage.pm line 621.
syntax error at Bootstrap/Step/Stage.pm line 625, near "} elsif ($dirent =~ /\"
syntax error at Bootstrap/Step/Stage.pm line 629, near "} elsif"
Compilation failed in require at ./release line 15.
BEGIN failed--compilation aborted at ./release line 15.


Patch coming..
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
for f in release t/test.pl `find . -name "*.pm"`; do perl -c $f; done
release syntax OK
t/test.pl syntax OK
./Bootstrap/Config.pm syntax OK
./Bootstrap/Step/Build.pm syntax OK
./Bootstrap/Step/PatcherConfig.pm syntax OK
./Bootstrap/Step/Repack.pm syntax OK
./Bootstrap/Step/Sign.pm syntax OK
./Bootstrap/Step/Source.pm syntax OK
./Bootstrap/Step/Stage.pm syntax OK
./Bootstrap/Step/Tag/Bump.pm syntax OK
./Bootstrap/Step/Tag/l10n.pm syntax OK
./Bootstrap/Step/Tag/Mozilla.pm syntax OK
./Bootstrap/Step/Tag/Talkback.pm syntax OK
./Bootstrap/Step/Tag.pm syntax OK
./Bootstrap/Step/TinderConfig.pm syntax OK
./Bootstrap/Step/Updates.pm syntax OK
./Bootstrap/Step.pm syntax OK
./Bootstrap/Util.pm syntax OK
./MozBuild/TinderLogParse.pm syntax OK
./MozBuild/Util.pm syntax OK
./t/Bootstrap/Step/Dummy.pm syntax OK
Attachment #292459 - Flags: review?(rhelmer)
Attachment #292459 - Flags: review?(rhelmer) → review+
Checking in Bootstrap/Step/Stage.pm;
/cvsroot/mozilla/tools/release/Bootstrap/Step/Stage.pm,v  <--  Stage.pm
new revision: 1.26; previous revision: 1.25
done
bitters:Step bhearsum$ cvs tag -d RELEASE_AUTOMATION_M6_3 Stage.pm
D Stage.pm
bitters:Step bhearsum$ cvs tag  RELEASE_AUTOMATION_M6_3 Stage.pm
T Stage.pm
Status: REOPENED → RESOLVED
Closed: 12 years ago12 years ago
Resolution: --- → FIXED
Stage.pm is actually looking for '.tar..bz2' instead of '.tar.bz2'. Patch upcoming

Sorry :(.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Attached patch use only one dotSplinter Review
Attachment #293696 - Flags: review?(rhelmer)
Attachment #293696 - Flags: review?(rhelmer) → review+
Checking in Bootstrap/Step/Stage.pm;
/cvsroot/mozilla/tools/release/Bootstrap/Step/Stage.pm,v  <--  Stage.pm
new revision: 1.28; previous revision: 1.27
done

bitters:Step bhearsum$ cvs tag -d RELEASE_AUTOMATION_M6_3 Stage.pm
D Stage.pm
bitters:Step bhearsum$ cvs tag RELEASE_AUTOMATION_M6_3 Stage.pm
T Stage.pm
Status: REOPENED → RESOLVED
Closed: 12 years ago12 years ago
Resolution: --- → FIXED
Another problem, alphas/betas aren't being named properly. Currently, they are done as, eg. "Firefox 3.0b2" rather than "Firefox 3.0 Beta 2"
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
For right now, we could rename the affected files and resync. To use this script, collect the filenames first, such as:
find ./stage-merged/ -name "* 3.0b2*" > to_rename.txt
Attachment #293731 - Flags: review?(nrthomas)
Attachment #293731 - Flags: review?(nrthomas) → review+
Attached patch possible long-name patch (obsolete) — Splinter Review
I'm testing this patch on staging-trunk-automation right now. It _should_ rename the Mac/Windows files to the proper "Firefox 3.0 Beta 2..." format. I'll set review when it's done testing.
Summary: add bzip2 support to Bootstrap::Step::Stage → trunk support for Bootstrap::Step::Stage
The code that was just run on staging was the same as that in attachment 293741 [details] [diff] [review]. This is a trivial change that I noticed last-minute.
Attachment #293741 - Attachment is obsolete: true
Attachment #293894 - Flags: review?(nrthomas)
Comment on attachment 293894 [details] [diff] [review]
same as before, support alphas/betas past 9

r+, if you move the + inside the bracket, eg ([0-9]+)
Attachment #293894 - Flags: review?(nrthomas) → review+
Attached patch patch as landedSplinter Review
Checking in Bootstrap/Step/Stage.pm;
/cvsroot/mozilla/tools/release/Bootstrap/Step/Stage.pm,v  <--  Stage.pm
new revision: 1.29; previous revision: 1.28
done
Attachment #293894 - Attachment is obsolete: true
Status: REOPENED → RESOLVED
Closed: 12 years ago12 years ago
Resolution: --- → FIXED
Comment on attachment 293898 [details] [diff] [review]
patch as landed

>+    # Use long alpha/beta name for Win32 and Mac
>+    $newVersion =~ s/a([0-9]+)/ Alpha $1/;
>+    $newVersion =~ s/b([0-9]+)/ Beta $1/;

Is there a particular reason why you used [0-9] here instead of \d ?
Product: mozilla.org → Release Engineering
You need to log in before you can comment on or make changes to this bug.