Skip to content

Commit ce41b64

Browse files
jneirajhrcekpepeiborraeddiemundoAilrun
authored
Prepare 1.6.0 release (#2642)
* Add list of merged prs * Remove branch trigger * Update release instructions * Include 9.2.1 in the current release * Bump up hls version * remove duplicate mention * Remove references to branch name * Fix cabal.project gen * Correct fail-fast condition * Bump up minor version * Bump up major version * Bump up major version * Allow brittany only for 9.0.1 * brittany not supported in hackage and 9.0.2 * Not short hls for hackage * Bump up versions everywhere * Update hackage index * Add ghcide in rename plugin * Apply linter and add selection demo * Add header linkable * Add first version of release description * Add last prs * Mention wingman * Grammar corrections Co-authored-by: Jan Hrcek <[email protected]> * Correct mention Co-authored-by: Pepe Iborra <[email protected]> * Warn about th in docs * Remove reference to install doc * Rephrasing Co-authored-by: J. S. <[email protected]> * Better style Co-authored-by: Junyoung "Clare" Jang <[email protected]> * Use could to stress it likely will not work * REmove reliable from the warning * Reorder comments * Rephrasing Co-authored-by: Michael Peyton Jones <[email protected]> * Update docs/supported-versions.md Co-authored-by: Michael Peyton Jones <[email protected]> * Use last version of internal deps * Restore original wording * One more pr * One more pr Co-authored-by: Jan Hrcek <[email protected]> Co-authored-by: Pepe Iborra <[email protected]> Co-authored-by: J. S. <[email protected]> Co-authored-by: Junyoung "Clare" Jang <[email protected]> Co-authored-by: Michael Peyton Jones <[email protected]>
1 parent c2f6c19 commit ce41b64

File tree

41 files changed

+480
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+480
-146
lines changed

Diff for: .github/actions/setup-build/action.yml

+11-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ inputs:
1515
description: "To allow make unique the cache key"
1616
required: false
1717
default: ""
18+
shorten-hls:
19+
description: "Whether we have to shorten haskell language server to hls"
20+
required: false
21+
default: "true"
22+
1823
runs:
1924
using: "composite"
2025
steps:
@@ -47,7 +52,7 @@ runs:
4752
# File has some protections preventing regular `rm`.
4853
# (most probably sticky bit is set on $HOME)
4954
# `&&` insures `rm -f` return is positive.
50-
# Many platforms aslo have `alias cp='cp -i'`.
55+
# Many platforms also have `alias cp='cp -i'`.
5156
GHCVER2=${GHCVER//./}
5257
ALT_PROJECT_FILE_MINOR=cabal-ghc${GHCVER2}.project
5358
ALT_PROJECT_FILE_MAJOR=cabal-ghc${GHCVER2:0:2}.project
@@ -65,10 +70,11 @@ runs:
6570
shell: bash
6671

6772
# Shorten binary names as a workaround for filepath length limits in Windows,
68-
# but since tests are hardcoded on this workaround -
69-
# all platforms (in 2021-12-07) need it.
70-
# All workflows which distinquishes cache on `cabal.project` needs this.
71-
- name: Workaround shorten binary names
73+
# but since tests are hardcoded on this workaround all platforms need it.
74+
# All workflows which distinguishes cache on `cabal.project` needs this.
75+
# Except hackage one, which needs the original name
76+
- if: inputs.shorten-hls == 'true'
77+
name: Workaround shorten binary names
7278
run: |
7379
sed -i.bak -e 's/haskell-language-server/hls/g' \
7480
-e 's/haskell_language_server/hls/g' \

Diff for: .github/workflows/build.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
default: 'false'
1010
release:
1111
types: [created]
12-
push:
13-
branches:
14-
- '*-check-build'
1512

1613
jobs:
1714
build:
@@ -90,7 +87,7 @@ jobs:
9087
fi
9188
9289
- name: Upload server to release
93-
if: ${{ !contains(github.ref_name, 'check') && github.event.release.upload_url != ''}}
90+
if: ${{ github.event.release.upload_url != ''}}
9491
uses: actions/[email protected]
9592
env:
9693
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -130,7 +127,7 @@ jobs:
130127
fi
131128
132129
- name: Upload wrapper to the release
133-
if: ${{ matrix.ghc == '8.10.7' && !contains(github.ref_name, 'check') && github.event.release.upload_url != '' }}
130+
if: ${{ matrix.ghc == '8.10.7' && github.event.release.upload_url != '' }}
134131
uses: actions/[email protected]
135132
env:
136133
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -173,7 +170,7 @@ jobs:
173170
HEAD
174171
175172
- name: Upload source tarball to the release
176-
if: ${{ !contains(github.ref_name, 'check') && github.event.release.upload_url != '' }}
173+
if: ${{ github.event.release.upload_url != '' }}
177174
uses: actions/[email protected]
178175
env:
179176
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -220,7 +217,7 @@ jobs:
220217
tar -czpf haskell-language-server.tar.gz *
221218
222219
- name: Upload binaries tarball to the release
223-
if: ${{ !contains(github.ref_name, 'check') && github.event.release.upload_url != '' }}
220+
if: ${{ github.event.release.upload_url != '' }}
224221
uses: actions/[email protected]
225222
env:
226223
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -258,7 +255,7 @@ jobs:
258255
sed -i 's/\/.*)/)/g' SHA256SUMS
259256
260257
- name: Upload sha256sums to the release
261-
if: ${{ !contains(github.ref_name, 'check') && github.event.release.upload_url != '' }}
258+
if: ${{ github.event.release.upload_url != '' }}
262259
uses: actions/[email protected]
263260
env:
264261
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Diff for: .github/workflows/hackage.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
check-and-upload-tarballs:
2121
runs-on: ubuntu-latest
2222
strategy:
23-
fail-fast: ${{ !contains(github.ref_name, 'check') && github.event.inputs.upload-candidates != 'true' }}
23+
fail-fast: ${{ github.event.inputs.upload-candidates == 'true' }}
2424
matrix:
2525
package: ["hie-compat", "hls-graph", "shake-bench",
2626
"hls-plugin-api", "ghcide", "hls-test-utils",
@@ -42,8 +42,6 @@ jobs:
4242
exclude:
4343
- ghc: "9.0.2"
4444
package: "hls-stylish-haskell-plugin"
45-
- ghc: "9.0.2"
46-
package: "hls-tactics-plugin"
4745

4846
steps:
4947

@@ -53,6 +51,7 @@ jobs:
5351
with:
5452
ghc: ${{ matrix.ghc }}
5553
os: ${{ runner.os }}
54+
shorten-hls: 'false'
5655

5756
- name: "Run cabal check"
5857
run: |
@@ -109,6 +108,7 @@ jobs:
109108
run: |
110109
cd $(ls -d ./incoming/${{ matrix.package }}-*)
111110
# For brittany
111+
echo "allow-newer:" >> cabal.project
112112
echo " butcher:base, multistate:base, data-tree-print:base," >> cabal.project
113113
# For stylish-haskell
114114
echo " stylish-haskell:Cabal,stylish-haskell:ghc-lib-parser,stylish-haskell:aeson" >> cabal.project
@@ -139,7 +139,7 @@ jobs:
139139
path: ${{ steps.generate-dist-tarball.outputs.path }}
140140

141141
upload-candidate:
142-
if: ${{ !contains(github.ref_name, 'check') || github.event.inputs.name == 'true' }}
142+
if: github.event.inputs.upload-candidates == 'true'
143143
needs: check-and-upload-tarballs
144144
runs-on: ubuntu-latest
145145
steps:

Diff for: .github/workflows/test.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ jobs:
117117
run: cabal build || cabal build || cabal build
118118

119119
- name: Set test options
120+
# run the tests without parallelism, otherwise tasty will attempt to run
121+
# all functional test cases simultaneously which causes way too many hls
122+
# instances to be spun up for the poor github actions runner to handle
120123
run: |
121124
echo "TEST_OPTS=-j1 --rerun-update --rerun-filter failures,exceptions" >> $GITHUB_ENV
122125
@@ -142,20 +145,13 @@ jobs:
142145
env:
143146
HLS_TEST_EXE: hls
144147
HLS_WRAPPER_TEST_EXE: hls-wrapper
145-
# run the tests without parallelism, otherwise tasty will attempt to run
146-
# all functional test cases simultaneously which causes way too many hls
147-
# instances to be spun up for the poor github actions runner to handle
148148
run: cabal test func-test --test-options="$TEST_OPTS" || cabal test func-test --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test func-test --test-options="$TEST_OPTS"
149149

150150
- if: matrix.test
151151
name: Test wrapper-test suite
152152
env:
153153
HLS_TEST_EXE: hls
154154
HLS_WRAPPER_TEST_EXE: hls-wrapper
155-
# run the tests without parallelism, otherwise tasty will attempt to run
156-
# all functional test cases simultaneously which causes way too many hls
157-
# instances to be spun up for the poor github actions runner to handle
158-
159155
run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper"
160156

161157
- if: matrix.test && matrix.ghc != '9.2.1'

0 commit comments

Comments
 (0)