From 2d3c43cb28b06038dc516ee05dbe54f1322e7553 Mon Sep 17 00:00:00 2001 From: KeenanRileyFaulkner Date: Tue, 28 Nov 2023 16:52:54 -0700 Subject: [PATCH 1/2] added retry to vivado rule to retry when tcl register fails --- bfasst/ninja_tools/common/vivado_rules.ninja.mustache | 2 +- bfasst/ninja_utils/retry.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 bfasst/ninja_utils/retry.sh diff --git a/bfasst/ninja_tools/common/vivado_rules.ninja.mustache b/bfasst/ninja_tools/common/vivado_rules.ninja.mustache index 7170b7151..ef2ad0cf4 100644 --- a/bfasst/ninja_tools/common/vivado_rules.ninja.mustache +++ b/bfasst/ninja_tools/common/vivado_rules.ninja.mustache @@ -1,5 +1,5 @@ rule vivado - command = export tempjou=$$(mktemp); export templog=$$(mktemp); {{ vivado_path }} -mode batch -journal $$tempjou -log $$templog -source $in >&- && mv $$tempjou $journal && mv $$templog $log + command = export tempjou=$$(mktemp); export templog=$$(mktemp); bfasst/ninja_utils/retry.sh {{ vivado_path }} -mode batch -journal $$tempjou -log $$templog -source $in >&- && mv $$tempjou $journal && mv $$templog $log description = vivado $in {{#in_context}} diff --git a/bfasst/ninja_utils/retry.sh b/bfasst/ninja_utils/retry.sh new file mode 100644 index 000000000..c47060641 --- /dev/null +++ b/bfasst/ninja_utils/retry.sh @@ -0,0 +1 @@ +"$@"||"$@"||"$@" From 52e5cf426b9ff19b157c7418bd990d9596b3c47c Mon Sep 17 00:00:00 2001 From: KeenanRileyFaulkner Date: Tue, 28 Nov 2023 17:56:16 -0700 Subject: [PATCH 2/2] made retry.sh executable --- bfasst/ninja_utils/retry.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bfasst/ninja_utils/retry.sh diff --git a/bfasst/ninja_utils/retry.sh b/bfasst/ninja_utils/retry.sh old mode 100644 new mode 100755