diff options
| author | a1346054 <36859588+a1346054@users.noreply.github.com> | 2021-08-19 11:05:15 +0000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-09-02 12:55:39 +1000 |
| commit | 473664aafdff1f60db99929bdd43c2a9b26d14cd (patch) | |
| tree | a96e6d39b30cf6b5b649090f2512cbe836d24734 /dev | |
| parent | 3a1fa0116a92235ba200228e4bb60d6a3a7f4113 (diff) | |
always use the same perl in $PATH
Different tests may use unexpectedly different versions of perl,
depending on whether they hardcode the path to the perl executable or if
they resolve the path from the environment. This fixes it so that the
same perl is always used.
Fix some trailing whitespace and spelling mistakes as well.
CLA: trivial
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16362)
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/release-aux/fix-title.pl | 2 | ||||
| -rw-r--r-- | dev/release-aux/release-state-fn.sh | 3 | ||||
| -rwxr-xr-x | dev/release.sh | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/dev/release-aux/fix-title.pl b/dev/release-aux/fix-title.pl index d3f00b984b..6fe256ebc4 100644 --- a/dev/release-aux/fix-title.pl +++ b/dev/release-aux/fix-title.pl @@ -1,4 +1,4 @@ -#! /usr/bin/perl +#! /usr/bin/env perl BEGIN { my $prev } ($_ = $prev) =~ s|^( *)(.*)$|"$1" . '=' x length($2)|e diff --git a/dev/release-aux/release-state-fn.sh b/dev/release-aux/release-state-fn.sh index f495cb8536..635b82a8b9 100644 --- a/dev/release-aux/release-state-fn.sh +++ b/dev/release-aux/release-state-fn.sh @@ -64,7 +64,7 @@ next_release_state () { case "$before+$next" in # MAKING ALPHA RELEASES ################################## - + # Alpha releases can't be made from beta versions or real versions beta*+alpha | +alpha ) echo >&2 "Invalid state for an alpha release" @@ -199,4 +199,3 @@ next_release_state () { $DEBUG >&2 "DEBUG[next_release_state]: END: \$RELEASE_DATE=$RELEASE_DATE" done } - diff --git a/dev/release.sh b/dev/release.sh index 351ddc5528..4b778f3b75 100755 --- a/dev/release.sh +++ b/dev/release.sh @@ -471,7 +471,7 @@ for fixup in "$HERE/dev/release-aux"/fixup-*-postrelease.pl; do perl -pi $fixup $file done -$VERBOSE "== Comitting updates" +$VERBOSE "== Committing updates" git add -u git commit $git_quiet -m "Prepare for $release_text" if [ -n "$reviewers" ]; then @@ -502,7 +502,7 @@ if $do_branch; then perl -pi $fixup $file done - $VERBOSE "== Comitting updates" + $VERBOSE "== Committing updates" git add -u git commit $git_quiet -m "Prepare for $release_text" if [ -n "$reviewers" ]; then |