@@ -86,17 +86,18 @@ jobs:
8686     - name : Select optimal cabal version 
8787      run : | 
8888        case "$OS" in 
89-           Windows_NT)   echo "CABAL_VERSION=3.4.0.1-rc3 "  >> $GITHUB_ENV;; 
89+           Windows_NT)   echo "CABAL_VERSION=3.4.0.0-rc5 "  >> $GITHUB_ENV;; 
9090          *)            echo "CABAL_VERSION=3.4.0.0-rc4"  >> $GITHUB_ENV;; 
9191        esac 
9292
93-      - uses : haskell/actions/setup@v1 
93+      - name : Install Haskell 
94+       uses : haskell/actions/setup@v1 
9495      id : setup-haskell 
9596      with :
9697        ghc-version : ${{ matrix.ghc }} 
9798        cabal-version : ${{ env.CABAL_VERSION }} 
9899
99-     - name : Haskell versions 
100+     - name : Show  Haskell tool  versions
100101      run : | 
101102        ghc --version 
102103        cabal --version 
@@ -108,20 +109,19 @@ jobs:
108109        echo "TMPDIR=$RUNNER_TEMP"  >> $GITHUB_ENV 
109110        echo "TMP=$RUNNER_TEMP"     >> $GITHUB_ENV 
110111
111-      #  Cache cabal-store
112-     - name : cache cabal store 
112+      - name : Cache cabal store 
113113      uses : actions/cache@v2 
114114      with :
115115        path : ${{ steps.setup-haskell.outputs.cabal-store }} 
116116        key : cabal-store-${{ env.CACHE_VERSION }}-${{ matrix.ghc }}-${{ matrix.os }} 
117117
118-     - name : update  Hackage index
118+     - name : Update  Hackage index
119119      run : cabal v2-update 
120120
121121    - name : Cabal Configure 
122122      run : cabal --builddir="$CABAL_BUILDDIR" configure --enable-tests 
123123
124-     - name : Use cabal.project.local.windows 
124+     - name : Use cabal.project.local.ci. windows 
125125      run : | 
126126        cat ./cabal.project.local.ci.windows >> ./cabal.project.local 
127127
@@ -136,7 +136,6 @@ jobs:
136136      run : | 
137137        cabal --builddir="$CABAL_BUILDDIR" install happy --install-method=copy 
138138
139-      #  Build dependencies
140139     - name : Build dependencies 
141140      run : cabal --builddir="$CABAL_BUILDDIR" build --only-dependencies all 
142141
@@ -148,99 +147,17 @@ jobs:
148147          cat "$x" 
149148        done 
150149
151-      # 
152-     #  Build & Test network packages
153-     # 
150+      - name : Build projects [build] 
151+       run : cabal --builddir="$CABAL_BUILDDIR" build all 
154152
155-     - name : Win32-network [build] 
156-       if : matrix.os == 'windows-latest' 
157-       run : cabal --builddir="$CABAL_BUILDDIR" build Win32-network 
158- 
159-     #  ntp-client
160-     - name : ntp-client [build] 
161-       if : matrix.subset == 'consensus' 
162-       run : cabal --builddir="$CABAL_BUILDDIR" build ntp-client 
163- 
164-     - name : io-sim-classes [build] 
165-       if : matrix.subset == 'consensus' 
166-       run : cabal --builddir="$CABAL_BUILDDIR" build io-sim-classes 
167- 
168-     - name : io-sim [build] 
169-       if : matrix.subset == 'consensus' 
170-       run : cabal --builddir="$CABAL_BUILDDIR" build io-sim 
171- 
172-     - name : typed-protocols [build] 
173-       if : matrix.subset == 'consensus' 
174-       run : cabal --builddir="$CABAL_BUILDDIR" build typed-protocols 
175- 
176-     - name : typed-protocols-examples [build] 
177-       if : matrix.subset == 'consensus' 
178-       run : cabal --builddir="$CABAL_BUILDDIR" build typed-protocols-examples 
179- 
180-     - name : network-mux [build] 
181-       if : matrix.subset == 'consensus' 
182-       run : cabal --builddir="$CABAL_BUILDDIR" build network-mux 
183- 
184-     - name : ouroboros-network-framework [build] 
185-       if : matrix.subset == 'consensus' 
186-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-network-framework 
187- 
188-     - name : ouroboros-network [build] 
189-       if : matrix.subset == 'consensus' 
190-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-network 
191- 
192-     - name : ouroboros-consensus [build] 
193-       if : matrix.subset == 'consensus' 
194-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus 
195- 
196-     - name : ouroboros-consensus-mock [build] 
197-       if : matrix.subset == 'consensus' 
198-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-mock 
199- 
200-     - name : ouroboros-consensus-test [build] 
201-       if : matrix.subset == 'consensus' 
202-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-test 
203- 
204-     - name : ouroboros-consensus-mock-test [build] 
205-       if : matrix.subset == 'consensus' 
206-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-mock-test 
207- 
208-     - name : ouroboros-consensus-byron [build] 
209-       if : matrix.subset == 'consensus' 
210-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-byron 
211- 
212-     - name : ouroboros-consensus-byronspec [build] 
213-       if : matrix.subset == 'consensus' 
214-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-byronspec 
215- 
216-     - name : ouroboros-consensus-byron-test [build] 
217-       if : matrix.subset == 'consensus' 
218-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-byron-test 
219- 
220-     - name : ouroboros-consensus-shelley [build] 
221-       if : matrix.subset == 'consensus' 
222-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-shelley 
223- 
224-     - name : ouroboros-consensus-shelley-test [build] 
225-       if : matrix.subset == 'consensus' 
226-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-shelley-test 
227- 
228-     - name : ouroboros-consensus-cardano [build] 
229-       if : matrix.subset == 'consensus' 
230-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-cardano 
231- 
232-     - name : ouroboros-consensus-cardano-test [build] 
233-       if : matrix.subset == 'consensus' 
234-       run : cabal --builddir="$CABAL_BUILDDIR" build ouroboros-consensus-cardano-test 
235- 
236-     # 
237-     #  Test network packages
238-     # 
153+     #  Test Win32 specific packages
239154
240155    - name : Win32-network [test] 
241156      if : matrix.os == 'windows-latest' 
242157      run : cabal --builddir="$CABAL_BUILDDIR" run Win32-network:test 
243158
159+     #  Test network packages
160+ 
244161    - name : ntp-client [test] 
245162      if : matrix.subset == 'network' 
246163      run : cabal --builddir="$CABAL_BUILDDIR" run ntp-client:test 
@@ -267,8 +184,10 @@ jobs:
267184      run : cabal --builddir="$CABAL_BUILDDIR" run ouroboros-network-framework:test -- -p '$0 != "typed-protocols.Socket.socket send receive IPv4"'  
268185
269186    - name : ouroboros-network [test] 
187+       if : matrix.subset == 'network' 
270188      run : cabal --builddir="$CABAL_BUILDDIR" run ouroboros-network:test 
271189
190+     #  Test consensus packages
272191
273192    #  - name: ouroboros-consensus [test]
274193    #    if: matrix.subset == 'consensus'
0 commit comments