diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2017-07-16 23:10:38 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2017-07-16 23:11:36 +0000 |
| commit | 9ccebe9487fcf71059fc48f65a2e25dbd7eee11e (patch) | |
| tree | 10e2fe460e9748c383b96124db7371db38c25ccb /tcwg-make-release.yaml | |
| parent | 838d741697d56e760fcadc8b9b8d0384a190fcd7 (diff) | |
tcwg-make-release: Fix trigger of tcwg-test-release for mingw.
Also add ${tcwg_version} in release parameter for
tcwg-test-release, for better display in Jenkins UI.
Change-Id: I0b17326b9768d30a334f91e5b6e569de4fccc185
Diffstat (limited to 'tcwg-make-release.yaml')
| -rw-r--r-- | tcwg-make-release.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tcwg-make-release.yaml b/tcwg-make-release.yaml index 8fe61301..75682475 100644 --- a/tcwg-make-release.yaml +++ b/tcwg-make-release.yaml @@ -268,7 +268,7 @@ # not shared between host and container. So, we need to # execute the find command inside the container. - if test x"${canadian}" = x"true"; then + if test x"${canadian}" = x"--canadian"; then linux_artifacts=artifacts1.txt mingw_artifacts=artifacts2.txt else @@ -282,7 +282,7 @@ exit 1 fi - if test x"${canadian}" = x"true"; then + if test x"${canadian}" = x"--canadian"; then tarball_mingw=$(grep "^toolchain=" ${WORKSPACE}/${mingw_artifacts} | cut -d = -f 2-) if test x"${tarball_mingw}" = x"" -o ! -f "${tarball_mingw}"; then echo "ERROR: no binary MingW tarball found!" @@ -295,16 +295,16 @@ tarball_linux_url="http://${fileserver}/${url_prefix}/${target}/${tarball_linux}" cat << EOF > tcwg.params.linux tarball_url=${tarball_linux_url} - release=${tcwg_release} + release=${tcwg_version}-${tcwg_release} target=${host}-${target} EOF - if test x"${canadian}" = x"true"; then + if test x"${canadian}" = x"--canadian"; then tarball_mingw="`basename ${tarball_mingw}`" tarball_mingw_url="http://${fileserver}/${url_prefix}/${target}/${tarball_mingw}" cat << EOF > tcwg.params.mingw tarball_url=${tarball_mingw_url} - release=${tcwg_release} + release=${tcwg_version}-${tcwg_release} target=mingw-${target} EOF fi |