Skip to content

Commit

Permalink
Bump ghc & Debian version
Browse files Browse the repository at this point in the history
  • Loading branch information
baksetercx committed Oct 7, 2024
1 parent a977a26 commit a6fa451
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 19 deletions.
11 changes: 8 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM haskell:9.4.8-slim
FROM haskell:9.6-slim-bullseye

WORKDIR /opt/app

Expand All @@ -17,8 +17,13 @@ COPY LICENSE README.md ./

RUN cabal install --overwrite-policy=always

# CVE-2024-32002
# Fixes CVEs
RUN apt-get update && \
apt-get install -y --no-install-recommends git git-man
apt-get install --no-install-recommends -y \
e2fsprogs \
libcom-err2 \
libsqlite3-0 \
libss2 \
logsave

ENTRYPOINT ["gh-actions-docs"]
2 changes: 1 addition & 1 deletion gh-actions-docs.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ executable gh-actions-docs
-- other-extensions:

-- Other library packages from which modules are imported.
build-depends: base ^>=4.17.2.0
build-depends: base ^>=4.18.2.1
, yaml
, aeson
, split
Expand Down
31 changes: 16 additions & 15 deletions src/Actions.hs
Original file line number Diff line number Diff line change
Expand Up @@ -103,21 +103,6 @@ prettyPrintAction config (Action name' _ description' inputs' outputs') actionMe
(if noPermissions config then "" else prettyPrintPermissions actionMetadata) ++
(if noUsage config then "" else prettyPrintUsage name' inputs' actionMetadata)

prettyPrintOutputs :: Maybe Outputs -> String
prettyPrintOutputs (Just outputs') =
"### Outputs\n" ++
"|Name|Description|\n"
++ "|-|-|\n"
++ concatMap
( \(name', ActionOutput des) ->
"`" ++ name' ++ "`"
++ "|"
++ replaceNewlinesWithSpaces des
++ "|\n"
)
(toList outputs')
++ "\n"
prettyPrintOutputs _ = ""

prettyPrintInputs :: Maybe Inputs -> String
prettyPrintInputs (Just inputs') =
Expand Down Expand Up @@ -147,6 +132,22 @@ prettyPrintDeprecationMessage (Just deprecationMessage') =
++ "_ :warning:<br><br>"
prettyPrintDeprecationMessage Nothing = ""

prettyPrintOutputs :: Maybe Outputs -> String
prettyPrintOutputs (Just outputs') =
"### Outputs\n" ++
"|Name|Description|\n"
++ "|-|-|\n"
++ concatMap
( \(name', ActionOutput des) ->
"`" ++ name' ++ "`"
++ "|"
++ replaceNewlinesWithSpaces des
++ "|\n"
)
(toList outputs')
++ "\n"
prettyPrintOutputs _ = ""

prettyPrintPermissions :: ActionMetadata -> String
prettyPrintPermissions (ActionMetadata _ _ _ _ (Just permissions')) =
"### Permissions\n"
Expand Down

0 comments on commit a6fa451

Please sign in to comment.