forked from xjm/drupal_core_release
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathsec.sh
More file actions
executable file
·364 lines (301 loc) · 9.57 KB
/
sec.sh
File metadata and controls
executable file
·364 lines (301 loc) · 9.57 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
#!/bin/bash
if [[ -z $1 ]] ; then
echo -e "Usage: ./sec.sh 9.3.3 9.2.11 7.84"
echo -e "(List the releases that will be tagged.)"
exit 1
fi
# @param $1
# Replacement pattern
# @param $2
# File path.
function portable_sed() {
if [[ "$OSTYPE" == "darwin"* ]]; then
sed -i '' -e "$1" "$2"
else
sed -i -e "$1" "$2"
fi
}
# @param $1
# Version string.
function validate_version() {
re="^[ ]*([0-9]+)\.([0-9]+)(\.([0-9]+))?[ ]*$"
message="\n$1 can't be tagged automatically. To use $1, tag the release manually."
if [[ ! $1 =~ $re ]] ; then
echo -e "$message"
echo -e "The regex does not match."
exit 1
fi
# D7 must only have major.patch.
if [[ ${BASH_REMATCH[1]} = 7 ]] ; then
if [[ ! -z ${BASH_REMATCH[4]} ]] ; then
echo -e "$message"
echo -e "The Drupal 7 version should not be semver."
exit 1
fi
else
# Later branches must have major.minor.patch.
if [[ -z ${BASH_REMATCH[4]} ]] ; then
echo -e "$message"
echo -e "The Drupal 8 or higher version must be semver."
exit 1
fi
fi
}
# @param $1
# The major branch.
function includes_file() {
includes_file=''
if [[ $1 = 7 ]] ; then
includes_file="includes/bootstrap.inc"
else
includes_file="core/lib/Drupal.php"
fi
}
# @param $1
# The Drupal 7 version.
# @param $2
# The old version constant.
# @param $3
# Whether to remove the 'development version' lines.
function insert_changelog_entry() {
# This assumes the D7 changelog location, because D8 does not maintain a
# list of releases in a changelog.
find="Drupal $2, "
date=$(date +"%Y-%m-%d")
changelog="Drupal $1, $date\\
-----------------------\\
- Fixed security issues:\\
"
# @todo This is relying on a global.
for advisory in "${advisories[@]}" ; do
changelog="$changelog - $advisory\\
"
done
changelog="$changelog\\
$find"
grep -q "$find" CHANGELOG.txt
if [ ! $? -eq 0 ] ; then
echo -e "Cannot match version constant $2 in the CHANGELOG. The CHANGELOG must be corrected manually."
exit 1
fi
portable_sed "s/$find/$changelog/1" "CHANGELOG.txt"
if [ "$3" = true ] ; then
dev="Drupal 7.xx, xxxx-xx-xx \(development version\)
-----------------------
\n"
perl -i -p0e "s/$dev//g" CHANGELOG.txt
fi
}
# @param $1
# The version constant to use.
# @param $2
# The old version constant.
# @param $3
# The major version.
function update_constant() {
# Update the version constant.
includes_file "$3"
find=''
replace=''
if [[ "$3" = 7 ]] ; then
find="'VERSION', '$2'"
replace="'VERSION', '$1'"
else
find="VERSION = '$2'"
replace="VERSION = '$1'"
fi
grep -q "$find" "$includes_file"
if [ ! $? -eq 0 ] ; then
echo -e "Cannot match version constant $2. The release must be tagged manually."
exit 1
fi
portable_sed "s/$find/$replace/1" "$includes_file"
}
# @param $1
# The Drupal version to set.
# @param $2
# The previous version.
# @param $3
# The major version.
# @param $4
# The minor version.
function set_version() {
if [[ $3 -ge 10 ]] || [[ $3 -eq 9 && $4 -gt 0 ]] ; then
echo -e "\n\n Setting version with Composer for 9.1+ \n"
php -r "include 'vendor/autoload.php'; \Drupal\Composer\Composer::setDrupalVersion('.', '$1');" || ! $? -eq 0
else
update_constant $1 $2 $3 || ! $? -eq 0
fi
}
versions=( "$@" )
echo -e "Enter the remote name (blank for origin):"
read remote
if [ -z $remote ] ; then
remote='origin'
fi
echo -e "How many advisories will be included in the release?"
read advisory_count
echo -e "First SA number in this release (e.g. '3' if SA-CORE-2019-003 is next):"
read first_advisory
year=$(date +%Y)
declare -a advisories
declare -a advisory_contributors
for i in $( eval echo {1..$advisory_count} )
do
advisory_number=$(( $i + $first_advisory - 1 ))
advisory_name=$(printf '%03d' $advisory_number)
advisories[$i]="SA-CORE-$year-$advisory_name"
done
for sa in "${!advisories[@]}"
do
# @todo soet it so the oldest tag/branch is first.
declare -a base
declare -a major
declare -a minor
declare -a branches
declare -a previous
declare -a next
echo -e "\n\n==== ${advisories[$sa]} ===="
for i in "${!versions[@]}"; do
v="${versions[$i]}"
validate_version "$v" || ! $? -eq 0
if [[ -z ${BASH_REMATCH[4]} ]] ; then
major[$i]="${BASH_REMATCH[1]}"
base[$i]="${BASH_REMATCH[1]}"
previous[$i]="${base[$i]}.$(( ${BASH_REMATCH[2]} - 1 ))"
next[$i]="${base[$i]}.$(( ${BASH_REMATCH[2]} + 1 ))"
else
major[$i]="${BASH_REMATCH[1]}"
minor[$i]="${BASH_REMATCH[2]}"
base[$i]="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
previous[$i]="${base[$i]}.$(( ${BASH_REMATCH[4]} - 1 ))"
next[$i]="${base[$i]}.$(( ${BASH_REMATCH[4]} + 1 ))"
fi
branches[$i]="${base[$i]}.x"
patch=''
if [[ $i -eq 0 ]]; then
echo -e "\nPath to the ${branches[$i]} patch for ${advisories[$sa]} (tab completion works but not '~'):"
read -e patch
# This will be empty on the first pass because it is initialized above.
# Thereafter it will be whatever was entered for the last branch (based
# on input order, not version order).
if [ -z $patch ] ; then
echo -e "\nYou must specify at least one patch name:"
read -e patch
fi
else
echo -e "\nPath to the ${branches[$i]} patch for ${advisories[$sa]} (blank to use the last patch):"
read -e patch
fi
if [[ -s "$patch" ]] ; then
# Use indirect expansion, because bash 3 doesn't support associative
# arrays.
declare patches_${sa}_${i}="$patch"
else
if [[ -z "$patch" ]] ; then
last_index=$(( $i - 1 ))
last_patch=patches_${sa}_${last_index}
declare patches_${sa}_${i}=${!last_patch}
else
echo -e "\nNo valid filename was supplied."
exit 1
fi
fi
done
echo -e "\nEnter the list of contributors for ${advisories[$sa]}, separated by commas (blank for none):"
read -e contributors
advisory_contributors[$sa]=$contributors
done
echo -e "\n\n==== Beginning tagging ====\n"
# Loop over version list.
for i in "${!versions[@]}"; do
version="${versions[$i]}"
p="${previous[$i]}"
n="${next[$i]}"
branch="${branches[$i]}"
includes_file "${major[$i]}" || ! $? -eq 0
git checkout -b "$version"-security "$p"
if [ ! $? -eq 0 ] ; then
echo -e "Error: Could not create a working branch."
exit 1
fi
echo -e "\nWorking branch created.\n"
for sa in "${!advisories[@]}"; do
varname=patches_${sa}_${i}
f=${!varname}
echo -e "\nAttempting to apply patch $f...\n"
# Check that the patch doesn't update Drupal.php or bootstrap.inc,
# because our strategy for resolving the version constant merge
# conflict won't work.
# grep_output="$(grep $includes_file $patch)"
# echo -e "\nPast the grep call...\n"
# if [ ! -z "$grep_output" ] ; then
# echo -e "The $v patch includes changes to $includes_file. $v must be tagged manually."
# exit 1
# fi
echo -e "\nPast the grep exit condition...\n"
git apply --index "$f"
if [ ! $? -eq 0 ] ; then
echo -e "Error: Could not apply the specified patch $f."
exit 1
fi
# Prepare the commit message
commit_message="${advisories[$sa]}"
if [ ! -z "${advisory_contributors[$sa]}" ] ; then
commit_message="$commit_message by ${advisory_contributors[$sa]}"
fi
git commit -am "$commit_message" --no-verify
done
# If we're on D8 or higher, perform a clean Composer install.
if [[ "${major[$i]}" -gt 7 ]] ; then
rm -rf vendor
composer install --no-progress --no-suggest -n -q
fi
# Update the version constant.
set_version "$version" "$p" "${major[$i]}" "${minor[$i]}"
# Only D7 uses a changelog now.
if [[ "${major[$i]}" = 7 ]] ; then
insert_changelog_entry "$version" "$p" true
git add CHANGELOG.txt
# D8 and higher need to have the lock file updated prior to tagging.
else
echo -e "\nUpdating metapackage versions and lock file to ${version}...\n"
COMPOSER_ROOT_VERSION="$version" composer update drupal/core*
fi
echo -e "\nTagging ${version}...\n"
git commit -am "Drupal $version" --no-verify
git tag -a "$version" -m "Drupal $version"
# Merge the changes back into the main branch.
git checkout "$branch"
# We expect a merge conflict here.
# @todo Following https://www.drupal.org/project/drupal/issues/3090906 there
# will be additional merge conflicts to resolve here.
git merge --no-ff "$version" 1> /dev/null
# Fix it by checking out the HEAD version and updating that.
git checkout HEAD -- "$includes_file"
# For D7 only, merge the changelog entry into HEAD manually.
if [[ "${major[$i]}" = 7 ]] ; then
git checkout HEAD -- CHANGELOG.txt
insert_changelog_entry "$version" "$p" false
git add CHANGELOG.txt
# For D8 and higher, fix up the lock file again.
else
git checkout HEAD -- composer.lock
echo -e "\nRe-updating metapackage versions and lock file for the dev branch...\n"
devbranch="$branch""-dev"
COMPOSER_ROOT_VERSION="$devbranch" composer update drupal/core*
fi
git commit -am "Merged $version." --no-verify
set_version "$n-dev" "$version-dev" "${major[$i]}" "${minor[$i]}"
git add "$includes_file"
git commit -am "Back to dev." --no-verify
git branch -D "$version"-security
done
branch_list=$(IFS=' ' ; echo ${branches[*]})
tag_list=$(IFS=' ' ; echo ${versions[*]})
echo -e "To push use:\n\n"
echo -e "git push $remote $tag_list"
echo -e "\nCreate the release notes to begin packaging."
echo -e "Once the release nodes have tarballs, then push the full branch data:"
echo -e "\ngit push $remote $branch_list"
echo -e "\n"