Merge branch 'master' into harder_hlint_fixes

Author: peterwicksstringfield

.circleci/config.yml

@@ -96,11 +96,6 @@ jobs:
       - STACK_FILE: "stack-8.8.4.yaml"
     <<: *defaults
 
-  ghc-8.10.1:
-    environment:
-      - STACK_FILE: "stack-8.10.1.yaml"
-    <<: *defaults
-
   ghc-8.10.2:
     environment:
       - STACK_FILE: "stack-8.10.2.yaml"
@@ -111,6 +106,11 @@ jobs:
       - STACK_FILE: "stack-8.10.3.yaml"
     <<: *defaults
 
+  ghc-8.10.4:
+    environment:
+      - STACK_FILE: "stack-8.10.4.yaml"
+    <<: *defaults
+
   ghc-default:
     environment:
       - STACK_FILE: "stack.yaml"
@@ -126,7 +126,7 @@ workflows:
       - ghc-8.8.2
       - ghc-8.8.3
       - ghc-8.8.4
-      - ghc-8.10.1
       - ghc-8.10.2
       - ghc-8.10.3
+      - ghc-8.10.4
       - ghc-default

.github/mergify.yml

@@ -5,19 +5,20 @@ pull_request_rules:
       method: squash
   name: Automatically merge pull requests
   conditions:
-  - status-success=bench (8.10.2, ubuntu-latest)
-  - status-success=bench (8.8.4, ubuntu-latest)
-  - status-success=bench (8.6.5, ubuntu-latest)
+  - status-success=bench-example (8.10.4, ubuntu-latest, Cabal-3.0.0.0)
+  - status-success=bench-example (8.10.4, ubuntu-latest, lsp-types-1.0.0.1)
+  # disabled (too slow, ~4h) until hie-bios >0.7.2 is released
+  # - status-success=bench-example (8.10.4, ubuntu-latest, bench_example_HLS)
 
   - status-success=nix (default, ubuntu-latest)
   - status-success=nix (default, macOS-latest)
 
+  - status-success=test (8.10.4, ubuntu-latest)
+  - status-success=test (8.10.4, macOS-latest)
   - status-success=test (8.10.3, ubuntu-latest)
   - status-success=test (8.10.3, macOS-latest)
   - status-success=test (8.10.2, ubuntu-latest)
   - status-success=test (8.10.2, macOS-latest)
-  - status-success=test (8.10.1, ubuntu-latest)
-  - status-success=test (8.10.1, macOS-latest)
   - status-success=test (8.8.4, ubuntu-latest)
   - status-success=test (8.8.4, macOS-latest)
   - status-success=test (8.8.3, ubuntu-latest)
@@ -28,15 +29,15 @@ pull_request_rules:
   - status-success=test (8.6.5, macOS-latest)
   - status-success=test (8.6.4, ubuntu-latest)
   - status-success=test (8.6.4, macOS-latest)
-  - status-success=test (windows-latest, 8.10.3, true)
+  - status-success=test (windows-latest, 8.10.4, true)
+  - status-success=test (windows-latest, 8.10.3)
   - status-success=test (windows-latest, 8.6.5, true)
   - status-success=test (windows-latest, 8.10.2.2)
-  - status-success=test (windows-latest, 8.10.1)
   # - status-success=test (windows-latest, 8.6.4)
 
+  - 'status-success=ci/circleci: ghc-8.10.4'
   - 'status-success=ci/circleci: ghc-8.10.3'
   - 'status-success=ci/circleci: ghc-8.10.2'
-  - 'status-success=ci/circleci: ghc-8.10.1'
   - 'status-success=ci/circleci: ghc-8.8.4'
   - 'status-success=ci/circleci: ghc-8.8.3'
   - 'status-success=ci/circleci: ghc-8.8.2'

.github/workflows/bench.yml

@@ -2,16 +2,19 @@ name: Benchmark
 
 on: [pull_request]
 jobs:
-  bench:
+  bench-init:
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.2', '8.8.4', '8.6.5']
+        ghc: ['8.10.4']
         os: [ubuntu-latest]
 
     steps:
+    # Cancel queued workflows from earlier commits in this branch
+    - uses: fkirc/skip-duplicate-actions@master
+
     - uses: actions/checkout@v2
     - run: git fetch origin master # check the master branch for benchmarking
     - uses: haskell/actions/setup@v1
@@ -38,25 +41,92 @@ jobs:
 
     - name: Build
       shell: bash
-      # Retry it three times to workaround compiler segfaults in windows
-      run: cabal build ghcide:benchHist || cabal build ghcide:benchHist || cabal build ghcide:benchHist
+      run: cabal build ghcide:benchHist
+
+    - name: Bench init
+      shell: bash
+      run: cabal bench ghcide:benchHist  -j --benchmark-options="all-binaries"
+
+    # tar is required to preserve file permissions
+    # compression speeds up upload/download nicely
+    - name: tar workspace
+      shell: bash
+      run: tar -czf workspace.tar.gz * .git
+
+    - name: tar cabal
+      run: |
+        cd ~/.cabal
+        tar -czf cabal.tar.gz *
+
+    - name: Upload workspace
+      uses: actions/upload-artifact@v2
+      with:
+        name: workspace
+        retention-days: 1
+        path: workspace.tar.gz
+
+    - name: Upload .cabal
+      uses: actions/upload-artifact@v2
+      with:
+        name: cabal-home
+        retention-days: 1
+        path: ~/.cabal/cabal.tar.gz
+
+  bench-example:
+    needs: [bench-init]
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ghc: ['8.10.4']
+        os: [ubuntu-latest]
+        example: ['Cabal-3.0.0.0', 'lsp-types-1.0.0.1', 'bench_example_HLS']
+
+    steps:
+    # Cancel queued workflows from earlier commits in this branch
+    - uses: fkirc/skip-duplicate-actions@master
+
+    - uses: haskell/actions/setup@v1
+      with:
+        ghc-version: ${{ matrix.ghc }}
+        cabal-version: '3.2'
+        enable-stack: false
+
+    - name: Download cabal home
+      uses: actions/download-artifact@v2
+      with:
+        name: cabal-home
+        path: .
+
+    - name: Download workspace
+      uses: actions/download-artifact@v2
+      with:
+        name: workspace
+        path: .
+
+    - name: untar
+      run: |
+        tar xzf workspace.tar.gz
+        tar xzf cabal.tar.gz --directory ~/.cabal
 
     - name: Bench
       shell: bash
-      # run the tests without parallelism, otherwise tasty will attempt to run
-      # all test cases simultaneously which causes way too many hls
-      # instances to be spun up for the poor github actions runner to handle
-      run: cabal bench ghcide:benchHist
+      run: cabal bench ghcide:benchHist  -j --benchmark-options="${{ matrix.example }}"
 
     - name: Display results
       shell: bash
       run: |
-        column -s, -t < ghcide/bench-results/results.csv | tee ghcide/bench-results/results.txt
+        column -s, -t < ghcide/bench-results/unprofiled/${{ matrix.example }}/results.csv | tee ghcide/bench-results/unprofiled/${{ matrix.example }}/results.txt
 
     - name: Archive benchmarking artifacts
       uses: actions/upload-artifact@v2
       with:
         name: bench-results-${{ runner.os }}-${{ matrix.ghc }}
         path: |
            ghcide/bench-results/results.*
+           ghcide/bench-results/**/*.csv
            ghcide/bench-results/**/*.svg
+           ghcide/bench-results/**/*.eventlog
+           ghcide/bench-results/**/*.eventlog.html
+           ghcide/bench-results/**/*.hp

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.3', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
+        ghc: ['8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
         os: [ubuntu-latest, macOS-latest, windows-latest]
         exclude:
           - os: windows-latest
@@ -113,11 +113,11 @@ jobs:
         path: ${{ steps.compress_server_binary.outputs.path }}
 
     - name: Build Wrapper
-      if: matrix.ghc == '8.10.1'
+      if: matrix.ghc == '8.10.4'
       run: cabal build exe:hls-wrapper -O2 $LINUX_CABAL_ARGS
 
     - name: Compress Wrapper Binary
-      if: matrix.ghc == '8.10.1'
+      if: matrix.ghc == '8.10.4'
       id: compress_wrapper_binary
       run: |
         HLS_WRAPPER_BUILD=$(find dist-newstyle \( -name 'hls-wrapper' -o -name 'hls-wrapper.exe' \) -type f)
@@ -136,7 +136,7 @@ jobs:
         fi
 
     - name: Upload Wrapper
-      if: matrix.ghc == '8.10.1'
+      if: matrix.ghc == '8.10.4'
       uses: actions/[email protected]
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -147,7 +147,7 @@ jobs:
         asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}}
 
     - uses: actions/upload-artifact@v2
-      if: matrix.ghc == '8.10.1'
+      if: matrix.ghc == '8.10.4'
       with:
         name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }}
         path: ${{ steps.compress_wrapper_binary.outputs.path }}

.github/workflows/test.yml

@@ -11,20 +11,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: ["8.10.3", "8.10.2", "8.10.1", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
+        ghc: ["8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
         os: [ubuntu-latest, macOS-latest]
         include:
-          # one ghc-lib build
-          # should be renabled: #784
-          # - os: ubuntu-latest
-          #   ghc: '8.10.1'
-          #   ghc-lib: true
           # only test supported ghc major versions
           - os: ubuntu-latest
-            ghc: '8.10.3'
+            ghc: '8.10.4'
             test: true
           - os: windows-latest
-            ghc: '8.10.3'
+            ghc: '8.10.4'
             test: true
           - os: ubuntu-latest
             ghc: '8.8.4'
@@ -39,7 +34,7 @@ jobs:
           - os: windows-latest
             ghc: '8.10.2.2'
           - os: windows-latest
-            ghc: '8.10.1'
+            ghc: '8.10.3'
           # This build get stuck frequently
           # - os: windows-latest
           #   ghc: '8.6.4'