Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into prepare-2.4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
fendor committed May 10, 2024
2 parents 036bcf8 + 5c837fa commit 2762b90
Show file tree
Hide file tree
Showing 12 changed files with 745 additions and 440 deletions.
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

0 comments on commit 2762b90

Please sign in to comment.