Skip to content

Commit f90a97d

Browse files
committed
CI: each job can only use 4 cores
This should allow us to massively increase the number of jobs we can run in parallel. It also means we don't need to run sbt with so much ram so we can remove the max heap size setting in projects/script/sbt.
1 parent 11f53c7 commit f90a97d

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.github/workflows/ci.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
runs-on: [self-hosted, Linux]
1515
container:
1616
image: lampepfl/dotty:2020-11-19
17+
options: --cpus=4
1718
volumes:
1819
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
1920
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -53,6 +54,7 @@ jobs:
5354
runs-on: [self-hosted, Linux]
5455
container:
5556
image: lampepfl/dotty:2020-11-19
57+
options: --cpus=4
5658
volumes:
5759
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
5860
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -137,6 +139,7 @@ jobs:
137139
runs-on: [self-hosted, Linux]
138140
container:
139141
image: lampepfl/dotty:2020-11-19
142+
options: --cpus=4
140143
volumes:
141144
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
142145
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -172,6 +175,7 @@ jobs:
172175
runs-on: [self-hosted, Linux]
173176
container:
174177
image: lampepfl/dotty:2020-11-19
178+
options: --cpus=4
175179
volumes:
176180
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
177181
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -207,6 +211,7 @@ jobs:
207211
runs-on: [self-hosted, Linux]
208212
container:
209213
image: lampepfl/dotty:2020-11-19
214+
options: --cpus=4
210215
volumes:
211216
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
212217
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -242,6 +247,7 @@ jobs:
242247
runs-on: [self-hosted, Linux]
243248
container:
244249
image: lampepfl/dotty:2020-11-19
250+
options: --cpus=4
245251
volumes:
246252
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
247253
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -284,6 +290,7 @@ jobs:
284290
runs-on: [self-hosted, Linux]
285291
container:
286292
image: lampepfl/dotty:2020-11-19
293+
options: --cpus=4
287294
volumes:
288295
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
289296
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -318,6 +325,7 @@ jobs:
318325
runs-on: [self-hosted, Linux]
319326
container:
320327
image: lampepfl/dotty:2020-11-19
328+
options: --cpus=4
321329
volumes:
322330
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
323331
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -359,6 +367,7 @@ jobs:
359367
runs-on: [self-hosted, Linux]
360368
container:
361369
image: lampepfl/dotty:2020-11-19
370+
options: --cpus=4
362371
volumes:
363372
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
364373
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -441,6 +450,7 @@ jobs:
441450
runs-on: [self-hosted, Linux]
442451
container:
443452
image: lampepfl/dotty:2020-11-19
453+
options: --cpus=4
444454
volumes:
445455
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
446456
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache

project/scripts/sbt

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ set -e
77
CMD="${1:?Missing sbt command}"
88

99
# run sbt with the supplied arg
10-
sbt -J-Xmx4096m \
11-
-J-XX:ReservedCodeCacheSize=512m \
10+
sbt -J-XX:ReservedCodeCacheSize=512m \
1211
-DSBT_PGP_USE_GPG=false \
1312
-no-colors \
1413
"$CMD"

0 commit comments

Comments
 (0)