Message ID | 20230721032031.3584730-1-jon.mason@arm.com |
---|---|
State | New |
Headers | show |
Series | [1/2] CI: add defaults for get-binary-toolchains | expand |
On Thu, 20 Jul 2023 22:20:30 -0500, Jon Mason wrote: > Pre-populate the standard values of get-binary-toolchains so that it > will work without variables in a standard kas container. This will aid > in ease-of-use for development and testing of binary toolchains. > > Applied, thanks! [1/2] CI: add defaults for get-binary-toolchains commit: 887e47b7c59ebe6a45d8a4d959f6966e69789a87 [2/2] CI: workaround 32bit timer warning in binary toolchain commit: cfcc8a4d13c26793ecab2d8da9274eb98b8cb4ce Best regards,
diff --git a/ci/get-binary-toolchains b/ci/get-binary-toolchains index 23c3bbb1..69a4d38e 100755 --- a/ci/get-binary-toolchains +++ b/ci/get-binary-toolchains @@ -5,9 +5,10 @@ BASENAME=arm-gnu-toolchain VER=${VER:-12.2.rel1} HOST_ARCH=${HOST_ARCH:-$(uname -m)} -DOWNLOAD_DIR=$1 -TOOLCHAIN_DIR=$2 -TOOLCHAIN_LINK_DIR=$3 +# Use the standard kas container locations if nothing is passed into the script +DOWNLOAD_DIR="${1:-/builds/persist/downloads/}" +TOOLCHAIN_DIR="${2:-/builds/persist//toolchains/}" +TOOLCHAIN_LINK_DIR="${3:-build/toolchains/}" # These should be already created by .gitlab-ci.yml, but do here if run outside of that env mkdir -p $DOWNLOAD_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
Pre-populate the standard values of get-binary-toolchains so that it will work without variables in a standard kas container. This will aid in ease-of-use for development and testing of binary toolchains. Signed-off-by: Jon Mason <jon.mason@arm.com> --- ci/get-binary-toolchains | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)