From 6dbb03b01ed6f369e35ae870849e13a34558a552 Mon Sep 17 00:00:00 2001 From: Vladislav Sabanov Date: Sun, 13 Aug 2023 13:52:07 -0300 Subject: [PATCH] Update configs --- .github/workflows/haskell-ci.yml | 18 ++++++++++-------- hie.yaml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 hie.yaml diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index f9a8f8d..4c042dc 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.16 +# version: 0.17.20230811 # -# REGENDATA ("0.16",["github","cabal.project"]) +# REGENDATA ("0.17.20230811",["github","cabal.project"]) # name: Haskell-CI on: @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.2.7 + - compiler: ghc-9.2.8 compilerKind: ghc - compilerVersion: 9.2.7 + compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 @@ -50,7 +50,7 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) @@ -65,10 +65,12 @@ jobs: echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" HCDIR=/opt/$HCKIND/$HCVER - HC=$HOME/.ghcup/bin/$HCKIND-$HCVER + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV" - echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" diff --git a/hie.yaml b/hie.yaml new file mode 100644 index 0000000..6514da4 --- /dev/null +++ b/hie.yaml @@ -0,0 +1,31 @@ +cradle: + stack: + - path: "./src" + component: "hibet:lib" + + - path: "./app/Main.hs" + component: "hibet:exe:hibet" + + - path: "./test/pretty" + component: "hibet:test:hibet-pretty" + + - path: "./test/labels" + component: "hibet:test:hibet-labels" + + - path: "./test/env" + component: "hibet:test:hibet-env" + + - path: "./test/parse" + component: "hibet:test:hibet-parse" + + - path: "./benchmark/Main.hs" + component: "hibet:bench:hibet-benchmark" + + - path: "./benchmark/Paths_hibet.hs" + component: "hibet:bench:hibet-benchmark" + + - path: "./benchmark/Lines.hs" + component: "hibet:bench:hibet-benchmark" + + - path: "./benchmark/Common.hs" + component: "hibet:bench:hibet-benchmark"