Skip to content

Commit 4e289e8

Browse files
committed
Build (release): Updated release script to use 1-8-stable and Trac reports.
1 parent ca46a3a commit 4e289e8

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

build/release/prepare-release

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ repo_dir="$base_dir/jquery-ui"
55
release_dir="$repo_dir/build/release"
66

77
github_repo="git@github.com:jquery/jquery-ui.git"
8-
remote_cmd="ssh jqadmin@ui-dev.jquery.com /srv/dev.jqueryui.com/prepare-release"
8+
git_branch="1-8-stable"
9+
trac_url="http://bugs.jqueryui.com"
910

1011

1112

@@ -25,6 +26,7 @@ cd $base_dir
2526
echo "Cloning repo from $github_repo..."
2627
git clone $github_repo
2728
cd $repo_dir
29+
git checkout $git_branch
2830

2931
echo
3032
echo "Environment setup complete."
@@ -43,11 +45,12 @@ echo "------------------------"
4345
echo
4446

4547
# NOTE: this will be different for minor and major releases
46-
version=`$remote_cmd/get-latest-version`
47-
major_minor=${version%.*}
48-
point=${version##*.}
49-
version_new="${major_minor}.$(($point + 1))"
50-
version_next=`cat version.txt`
48+
version_new=`cat version.txt`
49+
version_new=${version_new:0:$((${#version_new} - 3))}
50+
major_minor=${version_new%.*}
51+
point=${version_new##*.}
52+
version="${major_minor}.$(($point - 1))"
53+
version_next="${major_minor}.$(($point + 1))pre"
5154

5255
echo "We are going from $version to $version_new."
5356
echo "version.txt will be set to $version_next when complete."
@@ -85,7 +88,9 @@ git whatchanged $version... --pretty=format:"$format_full" \
8588

8689
# find all fixed tickets
8790
echo "Adding Trac tickets to changelog..."
88-
$remote_cmd/generate-changelog >> $base_dir/changelog
91+
trac_changelog="$trac_url/query?format=tab&milestone=$version_new"
92+
trac_changelog="$trac_changelog&resolution=fixed&col=id&col=component&col=summary&order=component"
93+
curl $trac_changelog >> $base_dir/changelog
8994

9095
echo
9196
echo "Changelog complete."
@@ -114,11 +119,11 @@ git whatchanged $version... --pretty=format:"$format_contributors" \
114119

115120
# find all reporters and commenters from Trac
116121
echo "Adding reporters and commenters from Trac..."
117-
$remote_cmd/generate-contributors >> $base_dir/thankyou
122+
curl "$trac_url/report/22?V=$version_new&max=-1&format=tab" | tail -n +2 >> $base_dir/thankyou
118123

119124
# sort names
120125
echo "Sorting contributors..."
121-
LC_ALL='C' sort -f $base_dir/thankyou | uniq > $base_dir/_thankyou
126+
LC_ALL='C' sort -f $base_dir/thankyou | col -b | uniq > $base_dir/_thankyou
122127
mv $base_dir/_thankyou $base_dir/thankyou
123128

124129
# find all people that were thanked
@@ -162,7 +167,7 @@ git tag $version_new
162167
echo "Updating version.txt to $version_next..."
163168
echo $version_next > version.txt
164169

165-
git commit -a -m "Updating the master version to $version_next"
170+
git commit -a -m "Updating the $git_branch version to $version_next"
166171
echo "Committed version.txt..."
167172

168173
echo
@@ -206,7 +211,6 @@ echo
206211

207212
# TODO: automate this
208213
# NOTE: this will be different for minor and major releases
209-
milestone=`$remote_cmd/get-latest-milestone`
210214

211215
# Create new milestrone and version
212216
echo "$version_new was tagged at $version_new_time."
@@ -215,11 +219,6 @@ echo "Create the $version_new Version with the above date and time."
215219
echo "Press enter when done."
216220
read
217221

218-
# Update milestone for all fixed tickets
219-
echo "Change all $milestone fixed tickets to $version_new."
220-
echo "Press enter when done."
221-
read
222-
223222
echo
224223
echo "Trac updates complete."
225224
echo

0 commit comments

Comments
 (0)