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

Try a different redirect

parent 1524c5c2
No related branches found
No related tags found
No related merge requests found
......@@ -79,7 +79,7 @@ function create_ci_daemon {
echo 'set -e';
echo 'set -x';
echo "cp /usr/local/bin/${PROJECT_NAME}-ci ${ci_run}";
echo "${ci_run} ${ci_target} ${web_dir} ${ci_build_info} 3>&2 2>&1 1>&3 3>&-";
echo "${ci_run} ${ci_target} ${web_dir} ${ci_build_info}";
echo "rm ${ci_run}"; } > "$script_filename"
chmod +x "$script_filename"
birbci --repo "${code_repo}/freedombone" --branch stretch --script "${script_filename}" -w "${web_dir}/index.html" --synchronous yes --install "${install_name}" --build-log yes
......@@ -239,19 +239,19 @@ make install
cd "${build_directory}" || exit 1
if [ ! "$build_info" ]; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" ${extra} --ci yes --build-log "${build_log_filename}"; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" ${extra} --ci yes --build-log "${build_log_filename}" 3>&2 2>&1 1>&3 3>&-; then
check_for_reboot "${build_log_filename}"
exit 10
fi
else
if [[ "$build_info" == 'onion' ]]; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" ${extra} --onion yes --ci yes --build-log "${build_log_filename}"; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" ${extra} --onion yes --ci yes --build-log "${build_log_filename}" 3>&2 2>&1 1>&3 3>&-; then
check_for_reboot "${build_log_filename}"
exit 20
fi
fi
if [[ "$build_info" == 'mesh'* ]]; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" -v "${build_info}" ${extra} --ci yes --build-log "${build_log_filename}"; then
if ! /usr/local/bin/${PROJECT_NAME}-image -t "${target}" -v "${build_info}" ${extra} --ci yes --build-log "${build_log_filename}" 3>&2 2>&1 1>&3 3>&-; then
check_for_reboot "${build_log_filename}"
exit 30
fi
......
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