|
1 | 1 | env:
|
2 |
| - cache_generation: 2021-06-22 |
| 2 | + cache_generation: 2023-06-12 |
| 3 | + ghc_version: 9.0.2 |
3 | 4 |
|
4 | 5 | # NOTE: Please keep .mergify.yml in sync when adding or removing any jobs.
|
5 | 6 | name: main
|
@@ -37,11 +38,11 @@ jobs:
|
37 | 38 | - name: "Cache"
|
38 | 39 | uses: actions/cache@v3
|
39 | 40 | with:
|
40 |
| - key: ${{ matrix.os.runner }}-${{ hashFiles('stack.yaml') }}-${{ env.cache_generation }} |
| 41 | + key: ${{ matrix.os.runner }}-${{ env.ghc_version }}-${{ hashFiles('**/cabal.project', '**/cabal.project.freeze', '**/*.cabal') }}-${{ env.cache_generation }} |
41 | 42 | restore-keys: |
|
42 |
| - ${{ matrix.os.runner }}- |
| 43 | + ${{ matrix.os.runner }}-${{ env.ghc_version }}- |
43 | 44 | path: |
|
44 |
| - ${{ steps.setup-haskell-cabal.outputs.stack-root }} |
| 45 | + ${{ steps.setup-haskell-cabal.outputs.cabal-store }} |
45 | 46 | - name: Install libsodium
|
46 | 47 | shell: bash
|
47 | 48 | run: |
|
|
68 | 69 | continue
|
69 | 70 | fi
|
70 | 71 |
|
71 |
| - # We use --test --no-run-tests to avoid re-building all the local packages in the |
72 |
| - # subsequent test step. |
73 |
| - # See https://github.com/commercialhaskell/stack/issues/4977. |
74 |
| - stack build --test --no-run-tests --copy-bins --local-bin-path ./bin "${package}" |
| 72 | + cabal install --enable-test --install-method=copy --installdir=./bin "${package}" |
75 | 73 | done
|
76 | 74 | - name: "Run tests"
|
77 | 75 | shell: bash
|
|
93 | 91 | continue
|
94 | 92 | fi
|
95 | 93 |
|
96 |
| - stack test "${package}" |
| 94 | + cabal test "${package}" |
97 | 95 | done
|
98 | 96 | - name: "Prepare packaging"
|
99 | 97 | shell: bash
|
@@ -122,7 +120,7 @@ jobs:
|
122 | 120 |
|
123 | 121 | function package() (
|
124 | 122 | local package="${1}"
|
125 |
| - local version="$(stack query locals "${package}" version)" |
| 123 | + local version="$(jq -r ".\"install-plan\"[] | select(.\"pkg-name\" == \"${package}\") | .\"pkg-version\"" < dist-newstyle/cache/plan.json | head -n 1)" |
126 | 124 | shift
|
127 | 125 | local assets=("${@}")
|
128 | 126 | local package_file="${package}-${version}-${architecture}-${{runner.os}}.${{ matrix.os.file-extension }}"
|
|
0 commit comments