Skip to content

Prepare 2.4.4 #1083

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

Merged
merged 38 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
09efac5
Merge Pre release 2.5 into master (#1030)
fendor Jan 16, 2024
c350978
Prepare pre-release 2.5.2 (#1032)
fendor Jan 16, 2024
f7a3c08
Bump prettier from 3.1.1 to 3.2.5 (#1041)
dependabot[bot] Feb 5, 2024
f13fdfa
Bump @types/node from 20.10.7 to 20.11.16 (#1039)
dependabot[bot] Feb 5, 2024
2ac3f65
Bump webpack from 5.89.0 to 5.90.1 (#1040)
dependabot[bot] Feb 5, 2024
1cd842e
Bump @types/node from 20.11.16 to 20.11.17 (#1045)
dependabot[bot] Feb 12, 2024
3f74e9e
Bump mocha from 10.2.0 to 10.3.0 (#1044)
dependabot[bot] Feb 12, 2024
5769ee2
Bump husky from 8.0.3 to 9.0.11 (#1049)
dependabot[bot] Feb 19, 2024
a2677f7
Tooling update (#1043)
bzm3r Feb 19, 2024
8654572
Bump webpack from 5.90.1 to 5.90.2 (#1048)
dependabot[bot] Feb 19, 2024
c2f6027
Bump ts-pattern from 5.0.6 to 5.0.8 (#1050)
dependabot[bot] Feb 19, 2024
1b6e156
Bump eslint from 8.56.0 to 8.57.0 (#1051)
dependabot[bot] Feb 26, 2024
fbe19f0
Bump webpack from 5.90.2 to 5.90.3 (#1052)
dependabot[bot] Feb 26, 2024
d7bd2eb
Bump @typescript-eslint/eslint-plugin from 6.21.0 to 7.0.0 (#1053)
dependabot[bot] Feb 26, 2024
f08f6c5
Bump @vscode/test-electron from 2.3.8 to 2.3.9 (#1054)
dependabot[bot] Mar 4, 2024
eefb38c
Bump @types/node from 20.11.17 to 20.11.24 (#1056)
dependabot[bot] Mar 4, 2024
8a20bb5
Bump typescript from 5.3.3 to 5.4.2 (#1059)
dependabot[bot] Mar 11, 2024
32eb091
Bump @types/node from 20.11.24 to 20.11.25 (#1058)
dependabot[bot] Mar 11, 2024
dd201a4
Add `haskell.plugin.fourmolu.config.path` option (#987)
georgefst Mar 11, 2024
66e71ed
Bump @types/node from 20.11.25 to 20.11.28 (#1061)
dependabot[bot] Mar 18, 2024
b3a551a
Bump eslint-webpack-plugin from 4.0.1 to 4.1.0 (#1062)
dependabot[bot] Mar 18, 2024
7d025cd
Bump webpack from 5.90.3 to 5.91.0 (#1066)
dependabot[bot] Mar 25, 2024
b0fef93
Bump @types/node from 20.11.28 to 20.11.30 (#1064)
dependabot[bot] Mar 25, 2024
7fc18f1
Bump typescript from 5.4.2 to 5.4.3 (#1065)
dependabot[bot] Mar 25, 2024
b0e3c46
Bump mocha from 10.3.0 to 10.4.0 (#1067)
dependabot[bot] Apr 1, 2024
f7d5001
Bump ts-pattern from 5.0.8 to 5.1.0 (#1068)
dependabot[bot] Apr 1, 2024
7b51915
Bump @types/node from 20.11.30 to 20.12.2 (#1069)
dependabot[bot] Apr 1, 2024
3b07f67
Bump ts-pattern from 5.1.0 to 5.1.1 (#1073)
dependabot[bot] Apr 8, 2024
7d81149
Bump @types/node from 20.12.2 to 20.12.5 (#1071)
dependabot[bot] Apr 8, 2024
34ad264
Bump glob from 10.3.10 to 10.3.12 (#1072)
dependabot[bot] Apr 8, 2024
a62fe89
Bump @types/vscode from 1.82.0 to 1.88.0 (#1070)
dependabot[bot] Apr 9, 2024
99fbd75
Add Session Loading style to list of known configs (#1077)
fendor May 9, 2024
00da470
Split out packaging action (#1080)
fendor May 9, 2024
9e0f76c
Bump typescript from 5.4.3 to 5.4.5 (#1075)
dependabot[bot] May 9, 2024
bf39cea
Bump @types/node from 20.12.5 to 20.12.8 (#1078)
dependabot[bot] May 9, 2024
a457684
Bump actions/upload-artifact from 3 to 4 (#1017)
dependabot[bot] May 9, 2024
5c837fa
Prepare pre-release 2.5.3 (#1081)
fendor May 10, 2024
2762b90
Merge remote-tracking branch 'upstream/master' into prepare-2.4.4
fendor May 10, 2024
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
26 changes: 13 additions & 13 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
"browser": true,
"es2021": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended"
],
"overrides": [],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"@typescript-eslint"
],
"plugins": ["@typescript-eslint"],
"rules": {
"semi": [
"error",
"always"
]
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"warn",
{
"varsIgnorePattern": "^_",
"argsIgnorePattern": "^_"
}
],
"@typescript-eslint/no-explicit-any": "off",
"semi": ["error", "always"]
}
}
}
35 changes: 35 additions & 0 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
on:
push:
branches:
- master
pull_request:
branches:
- '**'

jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v4
with:
## make sure this corresponds with the version in release.yml
node-version: latest


- run: yarn install --immutable --immutable-cache --check-cache

- name: Package extension
run: npx vsce package
- name: Upload extension vsix to workflow artifacts
uses: actions/upload-artifact@v4
with:
name: haskell-${{ github.sha }}.vsix
path: haskell-*.vsix
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

## Make sure the artifact is added to the release.
- name: Upload extension vsix to workflow artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: haskell-${{ github.event.release.tag_name }}.vsix
path: ${{ steps.packageExtension.outputs.vsixPath }}
Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
ghc: [8.10.7, 9.0.2, 9.2.8, 9.4.7, 9.6.2]
os: [macos-12, ubuntu-latest, windows-latest]
ghc: [8.10.7, 9.4.8, 9.6.4, 9.8.2]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand All @@ -28,6 +28,11 @@ jobs:
- run: yarn install --immutable --immutable-cache --check-cache
- run: yarn run webpack

# Setup toolchains, install ghcup, install ghc, etc...
- name: Setup Haskell
uses: haskell-actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
- name: Toolchain settings
run: |
ghcup upgrade -i -f
Expand All @@ -37,9 +42,12 @@ jobs:
ghcup install stack latest
ghcup install cabal latest

ghcup install ghc ${{matrix.ghc}}
ghcup set ghc ${{matrix.ghc}}
ghcup install ghc ${{ matrix.ghc }}
ghcup set ghc ${{ matrix.ghc }}

# This is a prefetched, fallback HLS version.
# We want to make sure, we still support old GHC versions
# and graciously fallback to an HLS version that supports the old GHC version, such as 8.10.7
ghcup install hls 2.2.0.0
ghcup install hls latest
shell: bash
Expand Down Expand Up @@ -76,13 +84,3 @@ jobs:
rm -rf test-workspace
rm -rf out
shell: bash

- name: Package tested extension
if: runner.os == 'Linux'
run: npx vsce package
- name: Upload extension vsix to workflow artifacts
if: runner.os == 'Linux'
uses: actions/upload-artifact@v3
with:
name: haskell-${{ github.sha }}.vsix
path: haskell-*.vsix
7 changes: 5 additions & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"recommendations": ["ms-vscode.vscode-typescript-tslint-plugin"]
}
"recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode"
]
}
23 changes: 23 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
# Changelog for vscode-haskell

## 2.5.3

- Includes changes of the 2.4.4 release

## 2.5.2

- Includes changes of the 2.4.3 release

## 2.5.1

- Includes changes of the 2.4.2 release

## 2.5.0

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

## 2.4.4

- Split out packaging action
([#1080](https://github.com/haskell/vscode-haskell/pull/1080)) by @fendor
- Add Session Loading style to list of known configs
([#1077](https://github.com/haskell/vscode-haskell/pull/1077)) by @fendor
- Tooling update
([#1043](https://github.com/haskell/vscode-haskell/pull/1043)) by @bzm3r
- Add `haskell.plugin.fourmolu.config.path` option
([#987](https://github.com/haskell/vscode-haskell/pull/987)) by @georgefst

## 2.4.3

- Address invalid byte sequence error #1022
Expand Down
4 changes: 2 additions & 2 deletions GenChangelogs.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import System.Process

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

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

args <- getArgs
Expand Down
Loading
Loading