Skip to content

Commit c6c35f9

Browse files
committed
fix: revert d53c237
This seems to not be working as expected because `main` is also getting cancelled.
1 parent ad5da9e commit c6c35f9

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,6 @@ on:
2727
env:
2828
DOTTY_CI_RUN: true
2929

30-
concurrency:
31-
# Taken from scalameta/metals
32-
# On main, we don't want any jobs cancelled so the sha is used to name the group
33-
# On PR branches, we cancel the job if new commits are pushed
34-
# You can also bypass that making sure [no cancel] is in your pull request body
35-
group: ${{
36-
((github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags'))
37-
&& format('contributor-pr-base-{0}', github.sha)
38-
|| format('contributor-pr-{0}', github.ref))
39-
&& !contains(github.event.pull_request.body, '[no cancel]')
40-
}}
41-
cancel-in-progress: true
42-
4330
# In this file, we set `--cpu-shares 4096` on every job. This might seem useless
4431
# since it means that every container has the same weight which should be
4532
# equivalent to doing nothing, but it turns out that OpenJDK computes

docs/_docs/contributing/sending-in-a-pr.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,6 @@ parts of the CI that usually ony runs on nightly builds.
130130
| `[test_windows_full]` | Execute unit tests on Windows |
131131
| `[test_non_bootstrapped]` | Execute unit tests using non-bootstrapped compiler |
132132

133-
134-
#### Making sure every commit triggers a new run
135-
136-
By default the Dotty CI will cancel your previous runs if you push a new commit.
137-
This helps make sure the CI keeps moving without getting stuck running a ton of
138-
jobs if you push multiple times in a row. _However_, there are times you may
139-
want to run every commit. To do this, make sure your PR body contains `[no
140-
cancel]`. This will ensure that there are no cancellations of your previous
141-
runs.
142-
143133
### 7: Create your PR!
144134

145135
When the feature or fix is completed you should open a [Pull

0 commit comments

Comments
 (0)