Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare 1.6.0 release #2642

Merged
merged 45 commits into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
f06b819
Add list of merged prs
jneira Jan 25, 2022
b7da672
Remove branch trigger
jneira Jan 25, 2022
28ddcc7
Update release instructions
jneira Jan 25, 2022
740345c
Include 9.2.1 in the current release
jneira Jan 25, 2022
a9d6321
Bump up hls version
jneira Jan 25, 2022
8269cbd
remove duplicate mention
jneira Jan 25, 2022
21d138f
Remove references to branch name
jneira Jan 25, 2022
b2e0d50
Fix cabal.project gen
jneira Jan 26, 2022
8b22193
Correct fail-fast condition
jneira Jan 26, 2022
0cdfb43
Bump up minor version
jneira Jan 26, 2022
72ae425
Bump up major version
jneira Jan 26, 2022
c42807c
Bump up major version
jneira Jan 26, 2022
aa6a87f
Allow brittany only for 9.0.1
jneira Jan 26, 2022
00bf584
brittany not supported in hackage and 9.0.2
jneira Jan 26, 2022
9aa58d9
Not short hls for hackage
jneira Jan 26, 2022
0f4966e
Bump up versions everywhere
jneira Jan 26, 2022
32cafcd
Update hackage index
jneira Jan 26, 2022
758e43f
Add ghcide in rename plugin
jneira Jan 26, 2022
32480ce
Apply linter and add selection demo
jneira Jan 26, 2022
e631256
Add header linkable
jneira Jan 26, 2022
db41e4e
Add first version of release description
jneira Jan 26, 2022
f3c2754
Merge branch 'master' into prepare-1.6.0
jneira Jan 26, 2022
68e0977
Merge branch 'prepare-1.6.0' of https://github.com/jneira/haskell-lan…
jneira Jan 26, 2022
971e923
Add last prs
jneira Jan 26, 2022
14c895a
Mention wingman
jneira Jan 26, 2022
3cb5787
Grammar corrections
jneira Jan 26, 2022
43439c4
Correct mention
jneira Jan 26, 2022
539f00c
Warn about th in docs
jneira Jan 26, 2022
019639e
Merge branches 'prepare-1.6.0' and 'prepare-1.6.0' of https://github.…
jneira Jan 26, 2022
0f67aba
Remove reference to install doc
jneira Jan 26, 2022
7fbe53b
Rephrasing
jneira Jan 26, 2022
713c9eb
Better style
jneira Jan 27, 2022
a0a5808
Use could to stress it likely will not work
jneira Jan 27, 2022
a3d95ef
Merge branch 'prepare-1.6.0' of https://github.com/jneira/haskell-lan…
jneira Jan 27, 2022
63937af
REmove reliable from the warning
jneira Jan 27, 2022
024aad1
Reorder comments
jneira Jan 27, 2022
b1b287f
Rephrasing
jneira Jan 27, 2022
6f17174
Update docs/supported-versions.md
jneira Jan 27, 2022
a6df11d
Merge branch 'master' into prepare-1.6.0
jneira Jan 27, 2022
5d25bff
Merge branch 'prepare-1.6.0' of https://github.com/jneira/haskell-lan…
jneira Jan 27, 2022
f62cb17
Use last version of internal deps
jneira Jan 27, 2022
2cfa810
Restore original wording
jneira Jan 27, 2022
213f901
One more pr
jneira Jan 27, 2022
a0cd3ac
Merge branch 'master' into prepare-1.6.0
jneira Jan 28, 2022
e172ac5
One more pr
jneira Jan 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/actions/setup-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ inputs:
description: "To allow make unique the cache key"
required: false
default: ""
shorten-hls:
description: "Whether we have to shorten haskell language server to hls"
required: false
default: "true"

runs:
using: "composite"
steps:
Expand Down Expand Up @@ -47,7 +52,7 @@ runs:
# File has some protections preventing regular `rm`.
# (most probably sticky bit is set on $HOME)
# `&&` insures `rm -f` return is positive.
# Many platforms aslo have `alias cp='cp -i'`.
# Many platforms also have `alias cp='cp -i'`.
GHCVER2=${GHCVER//./}
ALT_PROJECT_FILE_MINOR=cabal-ghc${GHCVER2}.project
ALT_PROJECT_FILE_MAJOR=cabal-ghc${GHCVER2:0:2}.project
Expand All @@ -65,10 +70,11 @@ runs:
shell: bash

# Shorten binary names as a workaround for filepath length limits in Windows,
jneira marked this conversation as resolved.
Show resolved Hide resolved
# but since tests are hardcoded on this workaround -
# all platforms (in 2021-12-07) need it.
# All workflows which distinquishes cache on `cabal.project` needs this.
- name: Workaround shorten binary names
# but since tests are hardcoded on this workaround all platforms need it.
# All workflows which distinguishes cache on `cabal.project` needs this.
# Except hackage one, which needs the original name
- if: inputs.shorten-hls == 'true'
name: Workaround shorten binary names
run: |
sed -i.bak -e 's/haskell-language-server/hls/g' \
-e 's/haskell_language_server/hls/g' \
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ on:
default: 'false'
release:
types: [created]
push:
branches:
- '*-check-build'

jobs:
build:
Expand Down Expand Up @@ -90,7 +87,7 @@ jobs:
fi

- name: Upload server to release
if: ${{ !contains(github.ref_name, 'check') && github.event.release.upload_url != ''}}
if: ${{ github.event.release.upload_url != ''}}
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -130,7 +127,7 @@ jobs:
fi

- name: Upload wrapper to the release
if: ${{ matrix.ghc == '8.10.7' && !contains(github.ref_name, 'check') && github.event.release.upload_url != '' }}
if: ${{ matrix.ghc == '8.10.7' && github.event.release.upload_url != '' }}
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -173,7 +170,7 @@ jobs:
HEAD

- name: Upload source tarball to the release
if: ${{ !contains(github.ref_name, 'check') && github.event.release.upload_url != '' }}
if: ${{ github.event.release.upload_url != '' }}
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -220,7 +217,7 @@ jobs:
tar -czpf haskell-language-server.tar.gz *

- name: Upload binaries tarball to the release
if: ${{ !contains(github.ref_name, 'check') && github.event.release.upload_url != '' }}
if: ${{ github.event.release.upload_url != '' }}
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -258,7 +255,7 @@ jobs:
sed -i 's/\/.*)/)/g' SHA256SUMS

- name: Upload sha256sums to the release
if: ${{ !contains(github.ref_name, 'check') && github.event.release.upload_url != '' }}
if: ${{ github.event.release.upload_url != '' }}
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/hackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
check-and-upload-tarballs:
runs-on: ubuntu-latest
strategy:
fail-fast: ${{ !contains(github.ref_name, 'check') && github.event.inputs.upload-candidates != 'true' }}
fail-fast: ${{ github.event.inputs.upload-candidates == 'true' }}
jneira marked this conversation as resolved.
Show resolved Hide resolved
matrix:
package: ["hie-compat", "hls-graph", "shake-bench",
"hls-plugin-api", "ghcide", "hls-test-utils",
Expand All @@ -42,8 +42,6 @@ jobs:
exclude:
- ghc: "9.0.2"
package: "hls-stylish-haskell-plugin"
- ghc: "9.0.2"
package: "hls-tactics-plugin"

steps:

Expand All @@ -53,6 +51,7 @@ jobs:
with:
ghc: ${{ matrix.ghc }}
os: ${{ runner.os }}
shorten-hls: 'false'

- name: "Run cabal check"
run: |
Expand Down Expand Up @@ -109,6 +108,7 @@ jobs:
run: |
cd $(ls -d ./incoming/${{ matrix.package }}-*)
# For brittany
echo "allow-newer:" >> cabal.project
jneira marked this conversation as resolved.
Show resolved Hide resolved
echo " butcher:base, multistate:base, data-tree-print:base," >> cabal.project
# For stylish-haskell
echo " stylish-haskell:Cabal,stylish-haskell:ghc-lib-parser,stylish-haskell:aeson" >> cabal.project
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
path: ${{ steps.generate-dist-tarball.outputs.path }}

upload-candidate:
if: ${{ !contains(github.ref_name, 'check') || github.event.inputs.name == 'true' }}
if: github.event.inputs.upload-candidates == 'true'
needs: check-and-upload-tarballs
runs-on: ubuntu-latest
steps:
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ jobs:
run: cabal build || cabal build || cabal build

- name: Set test options
# run the tests without parallelism, otherwise tasty will attempt to run
# all functional test cases simultaneously which causes way too many hls
# instances to be spun up for the poor github actions runner to handle
run: |
echo "TEST_OPTS=-j1 --rerun-update --rerun-filter failures,exceptions" >> $GITHUB_ENV

Expand All @@ -142,20 +145,13 @@ jobs:
env:
HLS_TEST_EXE: hls
HLS_WRAPPER_TEST_EXE: hls-wrapper
# run the tests without parallelism, otherwise tasty will attempt to run
# all functional test cases simultaneously which causes way too many hls
# instances to be spun up for the poor github actions runner to handle
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"

- if: matrix.test
name: Test wrapper-test suite
env:
HLS_TEST_EXE: hls
HLS_WRAPPER_TEST_EXE: hls-wrapper
# run the tests without parallelism, otherwise tasty will attempt to run
# all functional test cases simultaneously which causes way too many hls
# instances to be spun up for the poor github actions runner to handle

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"

- if: matrix.test && matrix.ghc != '9.2.1'
Expand Down
Loading