Skip to content

Commit 3e2feb2

Browse files
authored
Prepare release for v1.2.0.
This will also update HLint to v3.8.
1 parent 9507475 commit 3e2feb2

File tree

11 files changed

+22
-18
lines changed

11 files changed

+22
-18
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM haskell:9.6.3-buster AS build
3+
FROM haskell:9.8.2-buster AS build
44
RUN git clone https://github.com/haskell-actions/hlint-scan.git /src/hlint-scan
55
WORKDIR /src/hlint-scan
66
RUN stack install hlint hlint-scan:exe:hlint-scan && \

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ for which code scanning will trigger a failed check.
3131

3232
[status check]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks
3333

34-
[adjust the alert severity]: https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#defining-the-alert-severities-that-give-a-check-failure-for-a-pull-request
34+
[adjust the alert severity]: https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#defining-the-alert-severities-that-cause-a-check-failure-for-a-pull-request
3535

3636
### Inputs
3737

@@ -105,16 +105,12 @@ and Google specifically disclaims all warranties as to its quality,
105105
merchantability, or fitness for a particular purpose.
106106

107107

108-
[Category]: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning#configuring-a-category-for-the-analysis
108+
[Category]: https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#configuring-a-category-for-the-analysis
109109

110-
[GitHub code scanning]: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning
110+
[GitHub code scanning]: https://docs.github.com/en/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning
111111

112112
[HLint]: https://github.com/ndmitchell/hlint
113113

114114
[HLint configuration file]: https://github.com/ndmitchell/hlint#customizing-the-hints
115115

116-
[haskell/actions/hlint-setup]: https://github.com/haskell/actions/tree/main/hlint-setup
117-
118-
[haskell/actions/hlint-run]: https://github.com/haskell/actions/tree/main/hlint-run
119-
120-
[write permission for `security-events`]: https://docs.github.com/en/rest/code-scanning#upload-an-analysis-as-sarif-data
116+
[write permission for `security-events`]: https://docs.github.com/en/rest/code-scanning/code-scanning?apiVersion=2022-11-28#upload-an-analysis-as-sarif-data

action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ outputs:
4141

4242
runs:
4343
using: docker
44-
image: docker://ghcr.io/haskell-actions/hlint-scan:v1.1.0
44+
image: docker://ghcr.io/haskell-actions/hlint-scan:v1.2.0
4545
args:
4646
- binary=${{ inputs.binary }}
4747
- path=${{ inputs.path }}

docs/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ the [Haskell Package Versioning Policy].
1010

1111
## Unreleased
1212

13+
## 1.2.0 - 2024-10-31
14+
15+
* Update to HLint v3.8.
16+
* Update to LTS Haskell Stack `nightly-2024-10-21`.
17+
1318
## 1.1.0 - 2023-12-08
1419

1520
* Update to LTS Haskell Stack and released version of HLint.

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ for this purpose.
3333

3434
### Coding standards
3535

36-
[Hlint](https://github.com/ndmitchell/hlint) should report no issues,
36+
[HLint](https://github.com/ndmitchell/hlint) should report no issues,
3737
and formatting should be according to [Ormolu](https://github.com/tweag/ormolu).
3838

3939
Changes to code should include corresponding tests, which should ideally be property-based.

docs/SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
| Version | Supported |
66
| ------- | ------------------ |
7+
| 1.2.0 | :white_check_mark: |
78
| 1.1.0 | :white_check_mark: |
8-
| 1.0.0 | :white_check_mark: |
9-
| < 1.0 | :x: |
9+
| < 1.1.0 | :x: |
1010

1111
## Reporting a Vulnerability
1212

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
name: hlint-scan
16-
version: 1.1.0
16+
version: 1.2.0
1717
github: "haskell-actions/hlint-scan"
1818
license: Apache-2.0
1919
author: "Yoo Chung"

src/Fingerprint.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ module Fingerprint (fill) where
2828

2929
import Data.Aeson
3030
import Data.Aeson.KeyMap hiding (map)
31+
import Data.Base64.Types (extractBase64)
3132
import Data.List (sort)
3233
import Data.Text (Text)
3334
import Data.Text qualified as Text
@@ -125,7 +126,7 @@ toPartialFingerprint v =
125126

126127
-- | Encode a list of optional text strings with Base64.
127128
encodeTextList :: [Maybe Text] -> Text
128-
encodeTextList = encodeBase64 . Text.concat . map encodeItem
129+
encodeTextList = extractBase64 . encodeBase64 . Text.concat . map encodeItem
129130
where
130131
encodeItem Nothing = ":"
131132
encodeItem (Just s) = s <> ":"

src/Upload.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ module Upload (toCall, toSettings, toOutputs) where
3131
import Codec.Compression.GZip
3232
import Data.Aeson
3333
import Data.Aeson.KeyMap qualified as KeyMap
34+
import Data.Base64.Types (extractBase64)
3435
import Data.ByteString.Lazy (ByteString)
3536
import Data.ByteString.Lazy.Base64
3637
import Data.String (fromString)
@@ -75,7 +76,7 @@ toCall env sarifLog
7576
commitSha' = lookup "GITHUB_SHA" env
7677
ref' = lookup "GITHUB_REF" env
7778
workspace' = lookup "GITHUB_WORKSPACE" env
78-
encodedSarif = encodeBase64 $ compress sarifLog
79+
encodedSarif = extractBase64 . encodeBase64 $ compress sarifLog
7980

8081
-- | Settings for calling the GitHub REST API.
8182
toSettings :: Maybe String -> GitHubSettings

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# https://docs.haskellstack.org/en/stable/yaml_configuration/
1818

1919
# Resolver to choose a 'specific' stackage snapshot or a compiler version.
20-
resolver: lts-22.5
20+
resolver: nightly-2024-10-21
2121

2222
# User packages to be built.
2323
packages:

0 commit comments

Comments
 (0)