Skip to content

Commit d7ff6d6

Browse files
committed
Fix CI
1 parent cb4890a commit d7ff6d6

File tree

1 file changed

+20
-25
lines changed

1 file changed

+20
-25
lines changed

.github/workflows/test.yaml

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest, macOS-latest, windows-latest]
17-
ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.5']
17+
ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.5', '9.4.4']
1818
cabal: ['3.6.2.0']
1919
include:
20-
- os: ubuntu-latest
21-
ghc: 'HEAD'
22-
cabal: 3.6.2.0
2320
- os: ubuntu-latest
2421
ghc: 'recommended'
2522
- os: ubuntu-latest
@@ -55,29 +52,23 @@ jobs:
5552
- uses: actions/checkout@v2
5653

5754
- name: Install dependencies (Ubuntu)
58-
if: runner.os == "Linux"
55+
if: runner.os == 'Linux'
5956
run: |
60-
apt-get -y update
61-
apt-get -y install libtinfo5 libtinfo6 libncurses5 libncurses6
57+
sudo apt-get -y update
58+
sudo apt-get -y install libtinfo5 libtinfo6 libncurses5 libncurses6
6259
6360
- name: Install ghc/cabal
6461
run: |
6562
set -eux
66-
if [ "${{ matrix.ghc }}" == 'HEAD' ] ; then
67-
ghcup install ghc -u 'https://gitlab.haskell.org/api/v4/projects/1/jobs/artifacts/master/raw/ghc-x86_64-linux-deb10-unreg-validate.tar.xz?job=x86_64-linux-deb10-unreg-validate' head
68-
ghcup set ghc head
69-
else
70-
ghcup install ghc ${{ matrix.ghc }}
71-
ghcup set ghc ${{ matrix.ghc }}
72-
fi
73-
ghcup install cabal ${{ matrix.cabal }}
63+
ghcup install ghc --set ${{ matrix.ghc }}
64+
ghcup install cabal --set ${{ matrix.cabal }}
7465
shell: bash
7566

7667
- name: Build
7768
run: |
7869
set -eux
79-
[ "${{ matrix.ghc }}" == 'HEAD' ] ||
80-
[ "${{ matrix.ghc }}" == 'recommended' ] ||
70+
[ -e ~/.ghcup/env ] && source ~/.ghcup/env
71+
[ "${{ matrix.ghc }}" == 'recommended' ] ||
8172
[ "${{ matrix.ghc }}" == 'latest' ] ||
8273
[ "$(ghc --numeric-version)" = "${{ matrix.ghc }}" ]
8374
cabal update
@@ -114,11 +105,13 @@ jobs:
114105
githubToken: ${{ github.token }}
115106
install: |
116107
apt-get update -y
117-
apt-get install -y ghc libghc-quickcheck2-dev cpphs git make
108+
apt-get install -y ghc cabal-install libghc-quickcheck2-dev cpphs git make
118109
run: |
119-
ghc --version
120-
ghc --make -o Main tests/filepath-tests/Test.hs -itests/ -itests/filepath-tests/ +RTS -s
121-
./Main +RTS -s
110+
cabal update
111+
cabal test
112+
cabal haddock
113+
cabal check
114+
cabal sdist
122115
123116
emulated-i386:
124117
runs-on: ubuntu-latest
@@ -128,12 +121,14 @@ jobs:
128121
- name: install
129122
run: |
130123
apt-get update -y
131-
apt-get install -y ghc libghc-quickcheck2-dev cpphs git make
124+
apt-get install -y ghc cabal-install libghc-quickcheck2-dev cpphs git make
132125
shell: bash
133126
- uses: actions/checkout@v1
134127
- name: test
135128
run: |
136-
ghc --version
137-
ghc --make -o Main tests/filepath-tests/Test.hs -itests/ -itests/filepath-tests/ +RTS -s
138-
./Main +RTS -s
129+
cabal update
130+
cabal test
131+
cabal haddock
132+
cabal check
133+
cabal sdist
139134
shell: bash

0 commit comments

Comments
 (0)