From f5f805e47e3da880df2458bab7e11eedbc6a35ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Besan=C3=A7on?= Date: Sat, 9 Jan 2021 11:55:36 +0100 Subject: [PATCH 1/2] comment out failing platforms --- src/wizard/deploy.jl | 11 ++++++++++- src/wizard/interactive_build.jl | 10 +++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/wizard/deploy.jl b/src/wizard/deploy.jl index 3e077217e..dd5ece722 100644 --- a/src/wizard/deploy.jl +++ b/src/wizard/deploy.jl @@ -20,7 +20,16 @@ function print_build_tarballs(io::IO, state::WizardState) else platforms_string = """ [ - $(strip(join(repr.(state.platforms),",\n "))) + """ + for platform in state.platforms + rp = repr(platform) + if platform in state.failed_platforms + platforms_string *= "# $rp,\n" + else + platforms_string *= " $rp,\n" + end + end + platforms_string *= """ ] """ end diff --git a/src/wizard/interactive_build.jl b/src/wizard/interactive_build.jl index 9fe85f18d..2e9125040 100644 --- a/src/wizard/interactive_build.jl +++ b/src/wizard/interactive_build.jl @@ -871,20 +871,20 @@ function step6(state::WizardState) println(state.outs) if choice == 1 - filter!(p->!(p in state.failed_platforms), state.platforms) + # filter!(p->!(p in state.failed_platforms), state.platforms) state.step = :step7 elseif choice == 2 plats = collect(state.failed_platforms) if length(plats) > 1 - choice = request(terminal, + plat_choice = request(terminal, "Which platform would you like to revisit?", RadioMenu(map(repr, plats); charset=:ascii)) println(state.outs) else - choice = 1 + plat_choice = 1 end - if step5_internal(state, plats[choice]) - delete!(state.failed_platforms, plats[choice]) + if step5_internal(state, plats[plat_choice]) + delete!(state.failed_platforms, plats[plat_choice]) end # Will wrap back around to step 6 elseif choice == 3 From 25dee6c582f11e375f2e1df29409317e4eccef45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Besan=C3=A7on?= Date: Sat, 9 Jan 2021 12:16:45 +0100 Subject: [PATCH 2/2] remove commented filter --- src/wizard/interactive_build.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wizard/interactive_build.jl b/src/wizard/interactive_build.jl index 2e9125040..70c1e9979 100644 --- a/src/wizard/interactive_build.jl +++ b/src/wizard/interactive_build.jl @@ -871,7 +871,6 @@ function step6(state::WizardState) println(state.outs) if choice == 1 - # filter!(p->!(p in state.failed_platforms), state.platforms) state.step = :step7 elseif choice == 2 plats = collect(state.failed_platforms)