Skip to content

Commit e3be926

Browse files
authored
Merge pull request #1083 from fendor/prepare-2.4.4
Prepare 2.4.4
2 parents 036bcf8 + 2762b90 commit e3be926

12 files changed

+745
-440
lines changed

.eslintrc.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
"browser": true,
44
"es2021": true
55
},
6-
"extends": [
7-
"eslint:recommended",
8-
"plugin:@typescript-eslint/recommended"
9-
],
10-
"overrides": [],
6+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
117
"parser": "@typescript-eslint/parser",
128
"parserOptions": {
139
"ecmaVersion": "latest",
1410
"sourceType": "module"
1511
},
16-
"plugins": [
17-
"@typescript-eslint"
18-
],
12+
"plugins": ["@typescript-eslint"],
1913
"rules": {
20-
"semi": [
21-
"error",
22-
"always"
23-
]
14+
"no-unused-vars": "off",
15+
"@typescript-eslint/no-unused-vars": [
16+
"warn",
17+
{
18+
"varsIgnorePattern": "^_",
19+
"argsIgnorePattern": "^_"
20+
}
21+
],
22+
"@typescript-eslint/no-explicit-any": "off",
23+
"semi": ["error", "always"]
2424
}
25-
}
25+
}

.github/workflows/package.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
pull_request:
6+
branches:
7+
- '**'
8+
9+
jobs:
10+
build:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
os: [ubuntu-latest]
15+
runs-on: ${{ matrix.os }}
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
20+
- name: Install Node.js
21+
uses: actions/setup-node@v4
22+
with:
23+
## make sure this corresponds with the version in release.yml
24+
node-version: latest
25+
26+
27+
- run: yarn install --immutable --immutable-cache --check-cache
28+
29+
- name: Package extension
30+
run: npx vsce package
31+
- name: Upload extension vsix to workflow artifacts
32+
uses: actions/upload-artifact@v4
33+
with:
34+
name: haskell-${{ github.sha }}.vsix
35+
path: haskell-*.vsix

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
## Make sure the artifact is added to the release.
2727
- name: Upload extension vsix to workflow artifacts
28-
uses: actions/upload-artifact@v3
28+
uses: actions/upload-artifact@v4
2929
with:
3030
name: haskell-${{ github.event.release.tag_name }}.vsix
3131
path: ${{ steps.packageExtension.outputs.vsixPath }}

.github/workflows/test.yml

+12-14
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [macos-latest, ubuntu-latest, windows-latest]
15-
ghc: [8.10.7, 9.0.2, 9.2.8, 9.4.7, 9.6.2]
14+
os: [macos-12, ubuntu-latest, windows-latest]
15+
ghc: [8.10.7, 9.4.8, 9.6.4, 9.8.2]
1616
runs-on: ${{ matrix.os }}
1717
steps:
1818
- name: Checkout
@@ -28,6 +28,11 @@ jobs:
2828
- run: yarn install --immutable --immutable-cache --check-cache
2929
- run: yarn run webpack
3030

31+
# Setup toolchains, install ghcup, install ghc, etc...
32+
- name: Setup Haskell
33+
uses: haskell-actions/setup@v2
34+
with:
35+
ghc-version: ${{ matrix.ghc }}
3136
- name: Toolchain settings
3237
run: |
3338
ghcup upgrade -i -f
@@ -37,9 +42,12 @@ jobs:
3742
ghcup install stack latest
3843
ghcup install cabal latest
3944
40-
ghcup install ghc ${{matrix.ghc}}
41-
ghcup set ghc ${{matrix.ghc}}
45+
ghcup install ghc ${{ matrix.ghc }}
46+
ghcup set ghc ${{ matrix.ghc }}
4247
48+
# This is a prefetched, fallback HLS version.
49+
# We want to make sure, we still support old GHC versions
50+
# and graciously fallback to an HLS version that supports the old GHC version, such as 8.10.7
4351
ghcup install hls 2.2.0.0
4452
ghcup install hls latest
4553
shell: bash
@@ -76,13 +84,3 @@ jobs:
7684
rm -rf test-workspace
7785
rm -rf out
7886
shell: bash
79-
80-
- name: Package tested extension
81-
if: runner.os == 'Linux'
82-
run: npx vsce package
83-
- name: Upload extension vsix to workflow artifacts
84-
if: runner.os == 'Linux'
85-
uses: actions/upload-artifact@v3
86-
with:
87-
name: haskell-${{ github.sha }}.vsix
88-
path: haskell-*.vsix

.vscode/extensions.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"recommendations": ["ms-vscode.vscode-typescript-tslint-plugin"]
3-
}
2+
"recommendations": [
3+
"dbaeumer.vscode-eslint",
4+
"esbenp.prettier-vscode"
5+
]
6+
}

Changelog.md

+23
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,33 @@
11
# Changelog for vscode-haskell
22

3+
## 2.5.3
4+
5+
- Includes changes of the 2.4.4 release
6+
7+
## 2.5.2
8+
9+
- Includes changes of the 2.4.3 release
10+
11+
## 2.5.1
12+
13+
- Includes changes of the 2.4.2 release
14+
315
## 2.5.0
416

517
- Add tracking of cabal files
618
([#618](https://github.com/haskell/vscode-haskell/pull/618)) by @fendor
719

20+
## 2.4.4
21+
22+
- Split out packaging action
23+
([#1080](https://github.com/haskell/vscode-haskell/pull/1080)) by @fendor
24+
- Add Session Loading style to list of known configs
25+
([#1077](https://github.com/haskell/vscode-haskell/pull/1077)) by @fendor
26+
- Tooling update
27+
([#1043](https://github.com/haskell/vscode-haskell/pull/1043)) by @bzm3r
28+
- Add `haskell.plugin.fourmolu.config.path` option
29+
([#987](https://github.com/haskell/vscode-haskell/pull/987)) by @georgefst
30+
831
## 2.4.3
932

1033
- Address invalid byte sequence error #1022

GenChangelogs.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import System.Process
1919

2020
main = do
2121
callCommand "git fetch --tags"
22-
tags <- filter (isPrefixOf "1.") . lines <$>
22+
tag <- last . lines <$>
2323
readProcess "git" ["tag", "--list", "--sort=v:refname"] ""
2424

25-
lastDateStr <- last . lines <$> readProcess "git" ["show", "-s", "--format=%cI", "-1", last tags] ""
25+
lastDateStr <- last . lines <$> readProcess "git" ["show", "-s", "--format=%cI", "-1", tag] ""
2626
lastDate <- zonedTimeToUTC <$> iso8601ParseM lastDateStr
2727

2828
args <- getArgs

0 commit comments

Comments
 (0)