Merge branch 'master' into alternate-number-format

Author: drsooch

.github/workflows/build.yml

@@ -7,6 +7,9 @@ defaults:
 on:
   release:
     types: [created]
+  push:
+    branches:
+      - '*-check-build'
 
 jobs:
   build:
@@ -30,8 +33,8 @@ jobs:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: '3.4'
 
-    - if: ${{ matrix.ghc == '9.0.1' }}
-      name: Use modified cabal.project for ghc9
+    - name: Use modified cabal.project for ghc9
+      if: ${{ matrix.ghc == '9.0.1' }}
       run: cp cabal-ghc901.project cabal.project
 
     - name: Shorten binary names
@@ -77,13 +80,13 @@ jobs:
           echo "package floskell" >> cabal.project
           echo "  ghc-options: -O0" >> cabal.project
 
-    - name: Build Server
+    - name: Build server
       # Try building it twice in case of flakey builds on Windows
       run: |
         cabal build exe:hls -O2 $LINUX_CABAL_ARGS || \
         cabal build exe:hls -O2 $LINUX_CABAL_ARGS -j1
 
-    - name: Compress Server Binary
+    - name: Compress server binary
       id: compress_server_binary
       run: |
         HLS_BUILD=$(find dist-newstyle \( -name 'hls' -o -name 'hls.exe' \) -type f)
@@ -101,7 +104,8 @@ jobs:
           echo ::set-output name=extension::gz
         fi
 
-    - name: Upload Server Binary
+    - name: Upload server to release
+      if: ${{ !contains(github.ref_name, 'check') }}
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -111,16 +115,17 @@ jobs:
         asset_name: haskell-language-server-${{ runner.OS }}-${{ env.GHC_VERSION }}${{env.EXE_EXT}}.${{ steps.compress_server_binary.outputs.extension }}
         asset_content_type: ${{ steps.compress_server_binary.outputs.content_type }}
 
-    - uses: actions/upload-artifact@v2
+    - name: Upload server to workflow artifacts
+      uses: actions/upload-artifact@v2
       with:
         name: haskell-language-server-${{ runner.OS }}-${{ matrix.ghc }}${{env.EXE_EXT}}.${{ steps.compress_server_binary.outputs.extension }}
         path: ${{ steps.compress_server_binary.outputs.path }}
 
-    - name: Build Wrapper
+    - name: Build wrapper
       if: matrix.ghc == '8.10.7'
       run: cabal build exe:hls-wrapper -O2 $LINUX_CABAL_ARGS
 
-    - name: Compress Wrapper Binary
+    - name: Compress wrapper binary
       if: matrix.ghc == '8.10.7'
       id: compress_wrapper_binary
       run: |
@@ -139,8 +144,8 @@ jobs:
           echo ::set-output name=extension::gz
         fi
 
-    - name: Upload Wrapper
-      if: matrix.ghc == '8.10.7'
+    - name: Upload wrapper to the release
+      if: ${{ matrix.ghc == '8.10.7' && !contains(github.ref_name, 'check') }}
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -150,31 +155,34 @@ jobs:
         asset_name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }}
         asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}}
 
-    - uses: actions/upload-artifact@v2
+    - name: Upload wrapper to workflow artifacts
+      uses: actions/upload-artifact@v2
       if: matrix.ghc == '8.10.7'
       with:
         name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }}
         path: ${{ steps.compress_wrapper_binary.outputs.path }}
-  
-  # generates a custom tarball with sources, used by `ghcup compile hls` 
+
+  # generates a custom tarball with sources, used by `ghcup compile hls`
   src-tar:
     needs: build
     runs-on: ubuntu-18.04
-    
+
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      
-      - name: "Create source tarball"
+
+      - name: Create source tarball
         run: |
           mkdir src-dist
           git archive --prefix=haskell-language-server-${{ github.event.release.tag_name }}/ \
                       --format=tar.gz \
                       -o src-dist/haskell-language-server.tar.gz \
                       HEAD
-      
-      - uses: actions/upload-release-asset@v1.0.2
+
+      - name: Upload source tarball to the release
+        if: ${{ !contains(github.ref_name, 'check') }}
+        uses: actions/upload-release-asset@v1.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -183,11 +191,12 @@ jobs:
           asset_name: haskell-language-server-${{ github.event.release.tag_name }}-src.tar.gz
           asset_content_type: application/gzip
 
-      - uses: actions/upload-artifact@v2
+      - name: Upload source tarball to workflow artifacts
+        uses: actions/upload-artifact@v2
         with:
           name: haskell-language-server-${{ github.event.release.tag_name }}-src.tar.gz
           path: src-dist/haskell-language-server.tar.gz
-      
+
   # this generates .gz tarfiles containing binaries for all GHC versions and OS's
   # used by `ghcup install hls`
   tar:
@@ -199,7 +208,8 @@ jobs:
     steps:
       - uses: actions/download-artifact@v2
 
-      - run: |
+      - name: Generate tarball with all binaries
+        run: |
           # move the binaries for the specific platform into bin/
           mkdir bin
           mv haskell-language-server-${{ matrix.os }}-*/* bin
@@ -214,7 +224,9 @@ jobs:
           fi
           tar -czpf haskell-language-server.tar.gz *
 
-      - uses: actions/upload-release-asset@v1.0.2
+      - name: Upload binaries tarball to the release
+        if: ${{ !contains(github.ref_name, 'check') }}
+        uses: actions/upload-release-asset@v1.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -223,7 +235,8 @@ jobs:
           asset_name: haskell-language-server-${{ matrix.os }}-${{ github.event.release.tag_name }}.tar.gz
           asset_content_type: application/gzip
 
-      - uses: actions/upload-artifact@v2
+      - name: Upload binaries tarball to workflow artifacts
+        uses: actions/upload-artifact@v2
         with:
           name: haskell-language-server-${{ matrix.os }}-${{ github.event.release.tag_name }}.tar.gz
           path: bin/haskell-language-server.tar.gz
@@ -234,13 +247,15 @@ jobs:
     steps:
       - uses: actions/download-artifact@v2
 
-      - run: |
-          # generate sha256 sums for all current artifacts
+      - name: Generate sha256 sums for all workflow artifacts
+        run: |
           sha256sum --tag haskell-language-server*/* >> SHA256SUMS
           # we clean up tags to match the release file names
           sed -i 's/\/.*)/)/g' SHA256SUMS
 
-      - uses: actions/upload-release-asset@v1.0.2
+      - name: Upload sha256sums to the release
+        if: ${{ !contains(github.ref_name, 'check') }}
+        uses: actions/upload-release-asset@v1.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -249,7 +264,8 @@ jobs:
           asset_name: SHA256SUMS
           asset_content_type: plain/text
 
-      - uses: actions/upload-artifact@v2
+      - name: Upload sha256sums to workflow artifacts
+        uses: actions/upload-artifact@v2
         with:
           name: SHA256SUMS
           path: SHA256SUMS

.github/workflows/hackage.yml

@@ -133,11 +133,18 @@ jobs:
           # For floskell and stylish-haskell
           echo " floskell:base, floskell:ghc-prim, stylish-haskell:Cabal,stylish-haskell:ghc-lib-parser," >> cabal.project
 
-      - name: "Build all package components in isolation"
+      - name: "Build main package components in isolation"
         if: steps.get-hackage-version.outputs.exists != 'true'
         run: |
           cd $(ls -d ./incoming/${{ matrix.package }}-*)
-          cabal build --enable-tests --enable-benchmarks
+          cabal build
+
+      - name: "Build package tests and benchmarks in isolation"
+        if: steps.get-hackage-version.outputs.exists != 'true'
+        run: |
+          cd $(ls -d ./incoming/${{ matrix.package }}-*)
+          # cabal-3.4.0.0 run out of backjumps with tests and benchs enabled
+          cabal build --enable-tests --enable-benchmarks --max-backjumps 8000
 
       - name: "Generate haddock for hackage"
         if: steps.get-hackage-version.outputs.exists != 'true'

.github/workflows/nix.yml

@@ -46,7 +46,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
-    - uses: cachix/install-nix-action@v15
+    - uses: cachix/install-nix-action@v16
       with:
         install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
         install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
@@ -81,7 +81,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
-    - uses: cachix/install-nix-action@v15
+    - uses: cachix/install-nix-action@v16
       with:
         install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
         install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'