Skip to content

Commit 2318c61

Browse files
committed
Run linux bindist job on self-hosted runner
Restores the behaviour from before the CI rework
1 parent 70c4661 commit 2318c61

File tree

2 files changed

+46
-13
lines changed

2 files changed

+46
-13
lines changed

.github/generate-ci/gen_ci.hs

+10-1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,15 @@ runner AArch64 Darwin = ["self-hosted", "macOS", "ARM64"]
188188
runner Amd64 Windows = ["windows-latest"]
189189
runner AArch64 Windows = error "aarch64 windows not supported"
190190

191+
-- | Runner selection for bindist jobs
192+
bindistRunner :: Arch -> Opsys -> [Value]
193+
bindistRunner Amd64 (Linux _) = ["self-hosted", "linux-space", "maerwald"]
194+
bindistRunner AArch64 (Linux _) = ["self-hosted", "Linux", "ARM64", "maerwald"]
195+
bindistRunner Amd64 Darwin = ["macOS-13"]
196+
bindistRunner AArch64 Darwin = ["self-hosted", "macOS", "ARM64"]
197+
bindistRunner Amd64 Windows = ["windows-latest"]
198+
bindistRunner AArch64 Windows = error "aarch64 windows not supported"
199+
191200
-------------------------------------------------------------------------------
192201
-- Action generatation
193202
-------------------------------------------------------------------------------
@@ -417,7 +426,7 @@ buildJob arch os v =
417426
mkBindistJob :: Arch -> Opsys -> [GHC] -> Job
418427
mkBindistJob arch os vs =
419428
K.fromString (bindistJobName arch os) .= object
420-
[ "runs-on" .= runner arch os
429+
[ "runs-on" .= bindistRunner arch os
421430
, "name" .= (bindistJobName arch os ++ " (Prepare bindist)")
422431
, "needs" .= [buildJobName arch os ver | ver <- vs]
423432
, "env" .= thisEnv

.github/workflows/release.yaml

+36-12
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,9 @@ jobs:
174174
- build-x86_64-linux-centos7-9101
175175
- build-x86_64-linux-centos7-9122
176176
runs-on:
177-
- ubuntu-latest
177+
- self-hosted
178+
- linux-space
179+
- maerwald
178180
steps:
179181
- name: Checkout
180182
uses: actions/checkout@v4
@@ -236,7 +238,9 @@ jobs:
236238
- build-x86_64-linux-deb10-9101
237239
- build-x86_64-linux-deb10-9122
238240
runs-on:
239-
- ubuntu-latest
241+
- self-hosted
242+
- linux-space
243+
- maerwald
240244
steps:
241245
- name: Checkout
242246
uses: actions/checkout@v4
@@ -298,7 +302,9 @@ jobs:
298302
- build-x86_64-linux-deb11-9101
299303
- build-x86_64-linux-deb11-9122
300304
runs-on:
301-
- ubuntu-latest
305+
- self-hosted
306+
- linux-space
307+
- maerwald
302308
steps:
303309
- name: Checkout
304310
uses: actions/checkout@v4
@@ -360,7 +366,9 @@ jobs:
360366
- build-x86_64-linux-deb9-9101
361367
- build-x86_64-linux-deb9-9122
362368
runs-on:
363-
- ubuntu-latest
369+
- self-hosted
370+
- linux-space
371+
- maerwald
364372
steps:
365373
- name: Checkout
366374
uses: actions/checkout@v4
@@ -422,7 +430,9 @@ jobs:
422430
- build-x86_64-linux-fedora27-9101
423431
- build-x86_64-linux-fedora27-9122
424432
runs-on:
425-
- ubuntu-latest
433+
- self-hosted
434+
- linux-space
435+
- maerwald
426436
steps:
427437
- name: Checkout
428438
uses: actions/checkout@v4
@@ -484,7 +494,9 @@ jobs:
484494
- build-x86_64-linux-fedora33-9101
485495
- build-x86_64-linux-fedora33-9122
486496
runs-on:
487-
- ubuntu-latest
497+
- self-hosted
498+
- linux-space
499+
- maerwald
488500
steps:
489501
- name: Checkout
490502
uses: actions/checkout@v4
@@ -546,7 +558,9 @@ jobs:
546558
- build-x86_64-linux-mint193-9101
547559
- build-x86_64-linux-mint193-9122
548560
runs-on:
549-
- ubuntu-latest
561+
- self-hosted
562+
- linux-space
563+
- maerwald
550564
steps:
551565
- name: Checkout
552566
uses: actions/checkout@v4
@@ -608,7 +622,9 @@ jobs:
608622
- build-x86_64-linux-mint202-9101
609623
- build-x86_64-linux-mint202-9122
610624
runs-on:
611-
- ubuntu-latest
625+
- self-hosted
626+
- linux-space
627+
- maerwald
612628
steps:
613629
- name: Checkout
614630
uses: actions/checkout@v4
@@ -670,7 +686,9 @@ jobs:
670686
- build-x86_64-linux-ubuntu1804-9101
671687
- build-x86_64-linux-ubuntu1804-9122
672688
runs-on:
673-
- ubuntu-latest
689+
- self-hosted
690+
- linux-space
691+
- maerwald
674692
steps:
675693
- name: Checkout
676694
uses: actions/checkout@v4
@@ -732,7 +750,9 @@ jobs:
732750
- build-x86_64-linux-ubuntu2004-9101
733751
- build-x86_64-linux-ubuntu2004-9122
734752
runs-on:
735-
- ubuntu-latest
753+
- self-hosted
754+
- linux-space
755+
- maerwald
736756
steps:
737757
- name: Checkout
738758
uses: actions/checkout@v4
@@ -794,7 +814,9 @@ jobs:
794814
- build-x86_64-linux-ubuntu2204-9101
795815
- build-x86_64-linux-ubuntu2204-9122
796816
runs-on:
797-
- ubuntu-latest
817+
- self-hosted
818+
- linux-space
819+
- maerwald
798820
steps:
799821
- name: Checkout
800822
uses: actions/checkout@v4
@@ -856,7 +878,9 @@ jobs:
856878
- build-x86_64-linux-unknown-9101
857879
- build-x86_64-linux-unknown-9122
858880
runs-on:
859-
- ubuntu-latest
881+
- self-hosted
882+
- linux-space
883+
- maerwald
860884
steps:
861885
- name: Checkout
862886
uses: actions/checkout@v4

0 commit comments

Comments
 (0)