diff options
| author | Charles Baylis <charles.baylis@linaro.org> | 2017-04-18 21:24:06 +0100 |
|---|---|---|
| committer | Charles Baylis <charles.baylis@linaro.org> | 2017-04-19 08:40:23 +0100 |
| commit | 664b7f5ec4203a278a838be545067de2a6b57fa7 (patch) | |
| tree | 44adebe2d4b04ac280c5f8742ce9bfc26c7f3f6f /MakeRelease.job | |
| parent | b2eeef708d55e09e89615e45423e61c2ac5985f6 (diff) | |
MakeRelease.job: Use predictable path for artifacts lists.
Since tcwg-make-release.yaml needs to locate the artifacts lists, we
need to ensure they are located at a suitable path. Therefore, put them
at the top of ${WORKSPACE}.
Change-Id: If12baa0a5d57b2c06018659f4218dbdbb902eb31
Diffstat (limited to 'MakeRelease.job')
| -rwxr-xr-x | MakeRelease.job | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/MakeRelease.job b/MakeRelease.job index 9fb3be37..e73b97ed 100755 --- a/MakeRelease.job +++ b/MakeRelease.job @@ -155,10 +155,10 @@ manifests=() tarballs=() # Canadian cross builds require a Linux hosted cross compiler first if test x"${canadian}" = x"true"; then - $CONFIG_SHELL ${abe_dir}/abe.sh --list-artifacts artifacts1.txt ${update} --release ${release} ${srcs} ${platform} --build all ${libc} ${extra} --tarbin >> ${logfile} + $CONFIG_SHELL ${abe_dir}/abe.sh --list-artifacts ${user_workspace}/artifacts1.txt ${update} --release ${release} ${srcs} ${platform} --build all ${libc} ${extra} --tarbin >> ${logfile} abe_ret=$? host="--host i686-w64-mingw32" - manifests+=($(read_var artifacts1.txt manifest)) + manifests+=($(read_var ${user_workspace}/artifacts1.txt manifest)) else host="" fi @@ -168,19 +168,19 @@ fi # build the mingw32 compiler only if the previous cross-compiler build was # successful. if test ${abe_ret} -eq 0; then - $CONFIG_SHELL ${abe_dir}/abe.sh --list-artifacts artifacts2.txt ${update} --release ${release} --tarbin ${srcs} ${platform} ${host} --build all ${libc} ${extra} >> ${logfile} + $CONFIG_SHELL ${abe_dir}/abe.sh --list-artifacts ${user_workspace}/artifacts2.txt ${update} --release ${release} --tarbin ${srcs} ${platform} ${host} --build all ${libc} ${extra} >> ${logfile} abe_ret=$? - manifests+=($(read_var artifacts2.txt manifest)) + manifests+=($(read_var ${user_workspace}/artifacts2.txt manifest)) fi if test x"${canadian}" = x"true"; then # take the toolchain, sysroot and runtime tarballs from the linux build - tarballs+=($(read_var artifacts1.txt '\(toolchain\|sysroot\|runtime\)\(_asc\)\?' )) + tarballs+=($(read_var ${user_workspace}/artifacts1.txt '\(toolchain\|sysroot\|runtime\)\(_asc\)\?' )) # and just the toolchain from the mingw build - tarballs+=($(read_var artifacts2.txt 'toolchain\(_asc\)\?' )) + tarballs+=($(read_var ${user_workspace}/artifacts2.txt 'toolchain\(_asc\)\?' )) else - tarballs+=($(read_var artifacts2.txt '\(toolchain\|sysroot\|runtime\)\(_asc\)\?' )) + tarballs+=($(read_var ${user_workspace}/artifacts2.txt '\(toolchain\|sysroot\|runtime\)\(_asc\)\?' )) fi # MakeRelease.job doesn't require an input gcc_src parameter (it'll invoke ABE |