Merge pull request #468 from haskell/mpj/housekeeping

CI housekeeping

.github/workflows/haskell.yml

@@ -1,6 +1,11 @@
 name: Haskell CI
 
-on: [push, pull_request]
+on: 
+  push:
+    branches:
+      - master
+  pull_request:
+
 jobs:
   build:
 
@@ -9,27 +14,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['9.2.4', '9.0.2', '8.10.7', '8.8.4', '8.6.5']
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-        ospath: [true, false]
-        exclude:
-          # newer 'entropy' doesn't work with old 'unix', and it doesn't have a correct version bound.
-          - ospath: true
-            ghc: 8.6.5
-          # "cabal build" always timeout
-          - ospath: true
-            ghc: 8.8.4
-            os: windows-latest
+        ghc: ['9.4.3', '9.2.5', '9.0.2', '8.10.7']
+        # Unlikely that we'll succeed on windows and fail on macos,
+        # including it is just burning CI time. But windows could have
+        # path or IO issues, so worth including
+        os: [ubuntu-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: haskell/actions/setup@v1
+    - uses: actions/checkout@v3
+    - uses: haskell/actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: '3.6'
 
     - name: Cabal cache
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       env:
         cache-name: cache-cabal
       with:
@@ -38,32 +36,12 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-build-${{ env.cache-name }}-
 
-    - name: Stack cache
-      uses: actions/cache@v1
-      env:
-        cache-name: cache-stack
-      with:
-        path: ~/.stack
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/stack.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-
     - name: Cabal update
       run: cabal update
-    - name: Cabal configure
-      shell: bash
-      run: |
-        if [ ${{ matrix.ospath }} = "true" ]; then
-          cabal configure --flags="force-ospath"
-        fi
     - name: Build using cabal
       run: cabal build all
     - name: Test
       run: cabal test all
-    # stack build uses stack.yaml which actually uses ghc-8.10.7
-    - if: matrix.ghc == '8.10.7' && runner.os == 'Linux'
-      name: Build using stack
-      run: stack build
 
   haskell_post_job:
     runs-on: ubuntu-latest

.github/workflows/nix.yaml

@@ -1,6 +1,10 @@
 name: Nix
 
-on: [push, pull_request]
+on: 
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   nix:
@@ -12,10 +16,10 @@ jobs:
         os: [ubuntu-latest, macOS-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v16
+      - uses: cachix/install-nix-action@v18
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix-shell --run "cabal update && cabal build all"

cabal.project

@@ -6,7 +6,7 @@ packages:
 package lsp
   flags: +demo
 
-index-state: 2022-08-25T22:25:05Z
+index-state: 2023-01-01T00:00:00Z
 
 tests: True
 benchmarks: True