-
Notifications
You must be signed in to change notification settings - Fork 9
/
github.yml.patch
46 lines (46 loc) · 2.03 KB
/
github.yml.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index 1b7c983..16fe263 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -201,6 +201,24 @@ jobs:
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
echo "packages: $GITHUB_WORKSPACE/source/gl" >> cabal.project
cat cabal.project
+ - name: dump install plan
+ run: |
+ $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
+ cabal-plan
+ - name: restore cache
+ uses: actions/cache/restore@v3
+ with:
+ key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
+ path: ~/.cabal/store
+ restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
+ - name: run glgen
+ run: |
+ # Make sure to run glgen before sdist, as glgen is responsible for
+ # generating several of the modules declared in gl.cabal.
+ # Moreover, glgen needs to run in the `source` directory, where the
+ # gl repo lives.
+ cd source || false
+ $CABAL v2-run $ARG_COMPILER $ARG_TESTS $ARG_BENCH -j2 glgen
- name: sdist
run: |
mkdir -p sdist
@@ -229,16 +247,6 @@ jobs:
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(gl|glgen)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- - name: dump install plan
- run: |
- $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
- cabal-plan
- - name: restore cache
- uses: actions/cache/restore@v3
- with:
- key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
- path: ~/.cabal/store
- restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
- name: install dependencies
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all