diff options
| author | Diana Picus <diana.picus@linaro.org> | 2019-03-28 13:41:28 +0100 |
|---|---|---|
| committer | Diana Picus <diana.picus@linaro.org> | 2019-03-28 12:51:29 +0000 |
| commit | 02a7a7652d1f1aef48c11d97ea947a7b35936066 (patch) | |
| tree | d7fb7793dc9a53bcc091c92c42c4874a2458df93 /tcwg-llvm-release.sh | |
| parent | 9a3008b40cc987ef4caa06e99903260553584fd7 (diff) | |
tcwg-llvm-release.sh: Use tags instead of branches
We are currently pulling the release script from
branches/release_${MAJOR}${MINOR}
This is a problem for the 7.1.0 release (first minor version with the
new, post-LLVM-4.0 numbering scheme) because the release_71 branch
doesn't exist. We could ask for it to be created, but it seems more
robust to pull from tags/RELEASE_${MAJOR}${MINOR}${PATCH}/${RC} instead,
since that's the path used by the upstream test-release.sh itself.
Note that this doesn't work for --candidate values of 'trunk' or
'branch=', but I'm not sure the current version works either (in any
case I didn't manage to guess a parameter combination that would work
with such values). That can be fixed in a future patch.
Change-Id: I19aa7e8a97eb635d076ac1c74bfa0f02200f046d
Diffstat (limited to 'tcwg-llvm-release.sh')
| -rwxr-xr-x | tcwg-llvm-release.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tcwg-llvm-release.sh b/tcwg-llvm-release.sh index edebc0bc..5fe79141 100755 --- a/tcwg-llvm-release.sh +++ b/tcwg-llvm-release.sh @@ -163,8 +163,8 @@ LOGEXT="txt" # Release script RELEASE_SCRIPT="test-release.sh" -SVN_RELEASE_TAG="release_$(echo "$RELEASE" | awk 'BEGIN { FS="." }; { print $1 $2 }')" -SCRIPT_URL=http://llvm.org/svn/llvm-project/llvm/branches/$SVN_RELEASE_TAG/utils/release/test-release.sh +SVN_RELEASE_TAG="RELEASE_$(echo "$RELEASE" | awk 'BEGIN { FS="." }; { print $1 $2 $3}')" +SCRIPT_URL=http://llvm.org/svn/llvm-project/llvm/tags/$SVN_RELEASE_TAG/$RCDIR/utils/release/$RELEASE_SCRIPT cd "$WORKSPACE" && svn cat "$SCRIPT_URL" > $RELEASE_SCRIPT cd "$WORKSPACE" && chmod +x $RELEASE_SCRIPT |