Skip to content

Commit 696c839

Browse files
authored
Merge pull request #223 from sorki/srk/haskell-ci
Rework CI
2 parents f0dfc6d + 75704cd commit 696c839

File tree

19 files changed

+152
-365
lines changed

19 files changed

+152
-365
lines changed

.github/workflows/Cabal-Linux-Remote.yml

Lines changed: 0 additions & 80 deletions
This file was deleted.

.github/workflows/Core-Cabal-Linux.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

.github/workflows/Core-Cabal-macOS.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

.github/workflows/On-Release-Cabal-Linux.yml

Lines changed: 0 additions & 75 deletions
This file was deleted.

.github/workflows/Optional-Nix-dev-env-main.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.github/workflows/ci.dhall

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
let haskellCi =
2+
https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
3+
4+
let defSteps = haskellCi.defaultCabalSteps
5+
6+
in haskellCi.generalCi
7+
( haskellCi.withNix
8+
( defSteps
9+
with extraSteps.pre
10+
=
11+
defSteps.extraSteps.pre
12+
# [ haskellCi.installCachixStep "hnix-store"
13+
, haskellCi.BuildStep.NameIf
14+
{ name =
15+
"Install libsodium"
16+
, run = "sudo apt install libsodium-dev"
17+
, `if` = "matrix.os == 'ubuntu-latest'"
18+
}
19+
]
20+
)
21+
)
22+
haskellCi.DhallMatrix::{
23+
, ghc =
24+
[ haskellCi.GHC.GHC963, haskellCi.GHC.GHC947, haskellCi.GHC.GHC902 ]
25+
, os = [ haskellCi.OS.Ubuntu, haskellCi.OS.MacOS ]
26+
}
27+
: haskellCi.CI.Type

.github/workflows/ci.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
# Script by @fisx
3+
4+
set -eo pipefail
5+
cd "$( dirname "${BASH_SOURCE[0]}" )"
6+
7+
which dhall-to-yaml || cabal install dhall-yaml
8+
echo "regenerating ci.yaml"
9+
dhall-to-yaml-ng --generated-comment --file ci.dhall > ci.yaml

0 commit comments

Comments
 (0)