diff options
| author | Charles Baylis <charles.baylis@linaro.org> | 2017-04-13 17:58:36 +0100 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-04-14 12:08:19 +0000 |
| commit | fd7c156fa61434cc09574b1c9c69c15b0cee8a13 (patch) | |
| tree | ffc49fa6ceaba21f85541f4a20f7141ec2a42b30 /tcwg-make-release.yaml | |
| parent | 91bb2585c40beba39609f768eb4857ac9485add3 (diff) | |
tcwg-make-release: Remove use of find.
Use the artifact lists which are created by MakeRelease.job to
eliminate the need to use 'find' to determine the name of
the toolchain binary tarball(s).
Change-Id: Ica664b442de967256e9462d026e40419d6f0927c
Diffstat (limited to 'tcwg-make-release.yaml')
| -rw-r--r-- | tcwg-make-release.yaml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tcwg-make-release.yaml b/tcwg-make-release.yaml index a16ce07d..45e62709 100644 --- a/tcwg-make-release.yaml +++ b/tcwg-make-release.yaml @@ -263,16 +263,23 @@ # not shared between host and container. So, we need to # execute the find command inside the container. + if test x"${canadian}" = x"true"; then + linux_artifacts=artifacts1.txt + mingw_artifacts=artifacts2.txt + else + linux_artifacts=artifacts2.txt + fi + # We always build a Linux tarball, even in canadian cross mode - tarball_linux="$(${BUILD_CONTAINER} find ${WORKSPACE} -name gcc-linaro\*${tcwg_release}\*${target}\*.tar.xz | grep -v mingw)" - if test x"${tarball_linux}" = x""; then + tarball_linux=$(grep "^toolchain=" ${WORKSPACE}/${linux_artifacts} | cut -d = -f 2-) + if test x"${tarball_linux}" = x"" -o ! -f "${tarball_linux}"; then echo "ERROR: no binary Linux tarball found!" exit 1 fi if test x"${canadian}" = x"true"; then - tarball_mingw="$(${BUILD_CONTAINER} find ${WORKSPACE} -name gcc-linaro\*${tcwg_release}\*${target}\*.tar.xz | grep mingw)" - if test x"${tarball_mingw}" = x""; 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!" exit 1 fi |