Skip to content

Commit f592d8d

Browse files
GitHub CI: Make retrying on runner failure the default (#2621)
We used to specify retrying for by far most of the jobs, but it was crucially missing on `nix-build`. So when a runner is shut down during this job, it will not be retried. To simplify matters, I just made retrying on runner failure the default. The only jobs that were not retried before this commit were: - nix-build - set_pending - set_success - set_failure I don't think it hurts to turn it on for those status jobs as well. Additionally, the `.hackage` inclusion snippet redundantly specified `{retry: {max: 2}}`, which I removed. Note that GitHub's merge algorithm for inclusion would fill in the `{retry: {when: ...}}` key from `.common`, it truly was a no-op in `.hackage`.
1 parent ef194fe commit f592d8d

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

.ci/gitlab/benchmark.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
RUN_CLASHDEV: "no"
1414
RUN_TESTSUITE: "no"
1515
RUN_BUILD_ALL: "no"
16-
retry:
17-
max: 2
18-
when:
19-
- runner_system_failure
20-
- stuck_or_timeout_failure
2116
cache:
2217
key: cabal-store-$CI_JOB_NAME-$CI_JOB_IMAGE
2318
when: always

.ci/gitlab/common.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
CACHE_FALLBACK_KEY: $CI_JOB_NAME-master-ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2023-08-22-2-3-non_protected
99
GIT_SUBMODULE_STRATEGY: recursive
1010
TERM: xterm-color
11-
retry:
12-
max: 2
13-
when:
14-
- runner_system_failure
15-
- stuck_or_timeout_failure
1611
cache:
1712
key: $CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_JOB_IMAGE-2
1813
when: always

.ci/gitlab/publish.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,3 @@ hackage-sdist:
2525
- .ci/publish_sdist.sh clash-lib
2626
- .ci/publish_sdist.sh clash-lib-hedgehog
2727
- .ci/publish_sdist.sh clash-ghc
28-
retry:
29-
max: 2

.gitlab-ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
# Make all tasks interruptible by default
21
default:
2+
# Make all tasks interruptible by default
33
interruptible: true
4+
retry:
5+
max: 2
6+
when:
7+
- runner_system_failure
8+
- stuck_or_timeout_failure
49

510
include:
611
- '/.ci/gitlab/common.yml'

0 commit comments

Comments
 (0)