Skip to content
Snippets Groups Projects
Commit 6af5a885 authored by Bob Mottram's avatar Bob Mottram
Browse files

Redirection

parent 7aeadc83
No related branches found
No related tags found
No related merge requests found
......@@ -66,7 +66,7 @@ function create_ci_daemon {
{ echo '#!/bin/bash';
echo 'set -e';
echo 'set -x';
echo "/usr/local/bin/${PROJECT_NAME}-ci ${ci_target} ${web_dir} ${ci_build_info}"; } > "$script_filename"
echo "/usr/local/bin/${PROJECT_NAME}-ci ${ci_target} ${web_dir} ${ci_build_info}"; } > "$script_filename 2> build.txt"
chmod +x "$script_filename"
birbci --repo "${code_repo}/freedombone" --branch stretch --script "${script_filename}" -w "${web_dir}/index.html" --root yes --synchronous yes --install "${install_name}"
}
......@@ -184,24 +184,21 @@ if [ ! -d "${downloads_directory}" ]; then
fi
cd "${build_directory}" || exit 1
if [ ! "$build_info" ]; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" ${extra} --ci yes 2> build.txt; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" ${extra} --ci yes; then
exit 10
fi
else
if [[ "$build_info" == 'onion' ]]; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" ${extra} --onion yes --ci yes 2> build.txt; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" ${extra} --onion yes --ci yes; then
exit 20
fi
fi
if [[ "$build_info" == 'mesh'* ]]; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" -v "${build_info}" ${extra} --ci yes 2> build.txt; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" -v "${build_info}" ${extra} --ci yes; then
exit 30
fi
fi
fi
if [ -f "$build_directory/build/${PROJECT_NAME}.log" ]; then
cp "$build_directory/build/${PROJECT_NAME}.log" "$build_directory/build.txt"
fi
xz --no-warn --verbose --keep --threads=3 -3 "${build_directory}"/*.img >> "$build_directory/build.txt"
mv "${build_directory}"/*.xz "${downloads_directory}"
rm "${build_directory}"/*.img
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment