diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-10-08 11:34:47 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-13 13:50:01 +0000 |
| commit | a9c0faf718dc127c619e197cbcbdd5dc92b6b073 (patch) | |
| tree | 54536cd10d4ae54bc9ed7c9a1ec12149739df840 | |
| parent | b3d72538f84ff166d549d2f6abb9546f08278dbe (diff) | |
upload.sh: use BRANCH when uploading artifacts
... from Jenkins builds instead of the Qt version number.
This prepares us for using separate release branches (6.x.y) in addition
to minor branches (6.x).
Change-Id: I63d8fc292f71279542296e60e878768a9c7b0f9d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 55c0d7d0787b7d1771e49270c9c25e2c84fe01f5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | scripts/upload.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/upload.sh b/scripts/upload.sh index c4a21157..b4f07134 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -32,7 +32,7 @@ set -x set -e RELEASE=$(grep PV ../sources/meta-qt6/recipes-qt/qt6/qt6-git.inc | grep -o [0-9.]*) -UPLOADPATH=QT@ci-files02-hki.intra.qt.io:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ +UPLOADPATH=QT@ci-files02-hki.intra.qt.io:/srv/jenkins_data/enterprise/b2qt/yocto/${BRANCH}/ UPLOADS="\ tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt6-image-${MACHINE}.7z \ tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt6-sdk-${MACHINE}.sh \ |