Skip to content

Commit d6b241c

Browse files
authored
Merge branch 'master' into nf_retry_p1
2 parents 8d92921 + 41b1e1a commit d6b241c

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/ci_cd.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,8 @@ jobs:
584584
env:
585585
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
586586
- name: Tag
587+
# only bump v# (e.g., v3) tag if semantic release action publishes any new version
588+
if: ${{ steps.semantic.outputs.new_release_major_version != '' }}
587589
run: git tag -f v${MAJOR_VERSION} && git push -f origin v${MAJOR_VERSION}
588590
env:
589591
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

dist/index.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25040,17 +25040,18 @@ function runAction(inputs) {
2504025040
attempt = 1;
2504125041
_a.label = 2;
2504225042
case 2:
25043-
if (!(attempt <= inputs.max_attempts)) return [3 /*break*/, 13];
25043+
if (!(attempt <= inputs.max_attempts)) return [3 /*break*/, 14];
25044+
(0, core_1.info)("::group::Attempt ".concat(attempt));
2504425045
_a.label = 3;
2504525046
case 3:
25046-
_a.trys.push([3, 5, , 12]);
25047+
_a.trys.push([3, 5, 12, 13]);
2504725048
// just keep overwriting attempts output
2504825049
(0, core_1.setOutput)(OUTPUT_TOTAL_ATTEMPTS_KEY, attempt);
2504925050
return [4 /*yield*/, runCmd(attempt, inputs)];
2505025051
case 4:
2505125052
_a.sent();
2505225053
(0, core_1.info)("Command completed after ".concat(attempt, " attempt(s)."));
25053-
return [3 /*break*/, 13];
25054+
return [3 /*break*/, 14];
2505425055
case 5:
2505525056
error_2 = _a.sent();
2505625057
if (!(attempt === inputs.max_attempts)) return [3 /*break*/, 6];
@@ -25076,11 +25077,14 @@ function runAction(inputs) {
2507625077
(0, core_1.info)("Attempt ".concat(attempt, " failed. Reason: ").concat(error_2.message));
2507725078
}
2507825079
_a.label = 11;
25079-
case 11: return [3 /*break*/, 12];
25080+
case 11: return [3 /*break*/, 13];
2508025081
case 12:
25082+
(0, core_1.info)("::endgroup::");
25083+
return [7 /*endfinally*/];
25084+
case 13:
2508125085
attempt++;
2508225086
return [3 /*break*/, 2];
25083-
case 13: return [2 /*return*/];
25087+
case 14: return [2 /*return*/];
2508425088
}
2508525089
});
2508625090
});

0 commit comments

Comments
 (0)