From dba56a780a50beb44c727a717db644b3da27320b Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Wed, 24 Apr 2024 20:23:53 +0200 Subject: [PATCH] upgrade to latest GHC version --- .github/workflows/haskell.yml | 11 ++--- .github/workflows/hlint.yml | 2 +- .gitignore | 1 + language-docker.cabal | 15 +++---- package.yaml | 84 ----------------------------------- stack-gh-pages | 15 ------- stack.yaml | 7 --- stack.yaml.lock | 12 ----- 8 files changed, 11 insertions(+), 136 deletions(-) delete mode 100644 package.yaml delete mode 100644 stack-gh-pages delete mode 100644 stack.yaml delete mode 100644 stack.yaml.lock diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 70be604..3bc9458 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -23,26 +23,23 @@ jobs: fail-fast: false matrix: include: - - os: macos-latest - os: ubuntu-latest - - os: windows-latest steps: # setup: - name: Check out - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Haskell id: setup-haskell-cabal - uses: haskell/actions/setup@v1 + uses: haskell-actions/setup@v2 with: - ghc-version: '8.10' - enable-stack: true + ghc-version: '9.8' # actions - name: Test - run: stack test + run: cabal test --test-show-details=always diff --git a/.github/workflows/hlint.yml b/.github/workflows/hlint.yml index 70a3acd..f589939 100644 --- a/.github/workflows/hlint.yml +++ b/.github/workflows/hlint.yml @@ -20,7 +20,7 @@ jobs: HLINT_ACTION_LOG_LEVEL: debug steps: - name: Check out - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up HLint uses: rwe/actions-hlint-setup@v1 diff --git a/.gitignore b/.gitignore index 4435f32..ac77603 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.hi *.o .stack-work +dist-newstyle diff --git a/language-docker.cabal b/language-docker.cabal index ea8ac19..707f1f6 100644 --- a/language-docker.cabal +++ b/language-docker.cabal @@ -1,13 +1,7 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.36.0. --- --- see: https://github.com/sol/hpack --- --- hash: 528820a99687ed9372038487df42e487d63b867ed312d39e8e51b6d1bf4cf7d9 +cabal-version: 2.0 name: language-docker -version: 12.2.0 +version: 13.0.0 synopsis: Dockerfile parser, pretty-printer and embedded DSL description: All functions for parsing and pretty-printing Dockerfiles are exported through @Language.Docker@. For more fine-grained operations look for specific modules that implement a certain functionality. See the for the source-code and examples. @@ -83,7 +77,7 @@ library , split >=0.2 , text , time - default-language: Haskell2010 + default-language: GHC2021 test-suite hspec type: exitcode-stdio-1.0 @@ -125,4 +119,5 @@ test-suite hspec , split >=0.2 , text , time - default-language: Haskell2010 + default-language: GHC2021 + build-tool-depends: hspec-discover:hspec-discover == 2.* diff --git a/package.yaml b/package.yaml deleted file mode 100644 index b8e4216..0000000 --- a/package.yaml +++ /dev/null @@ -1,84 +0,0 @@ ---- -name: language-docker -version: '12.2.0' -synopsis: Dockerfile parser, pretty-printer and embedded DSL -description: 'All functions for parsing and pretty-printing Dockerfiles are - exported through @Language.Docker@. For more fine-grained operations look for - specific modules that implement a certain functionality. - - See the for - the source-code and examples.' -category: Development -author: - - Lukas Martinelli - - Pedro Tacla Yamada - - José Lorenzo Rodríguez -maintainer: - - lorenzo@seatgeek.com -copyright: - - Lukas Martinelli, Copyright (c) 2016 - - Pedro Tacla Yamada, Copyright (c) 2016 - - José Lorenzo Rodríguez, Copyright (c) 2017 -license: GPL-3 -github: hadolint/language-docker -extra-source-files: - - README.md - - test/fixtures/1.Dockerfile - - test/fixtures/2.Dockerfile - - test/fixtures/3.Dockerfile - - test/fixtures/4.Dockerfile - - test/fixtures/5.Dockerfile - - test/fixtures/6.Dockerfile - - test/fixtures/7.Dockerfile - - test/fixtures/8.Dockerfile - - test/fixtures/Dockerfile.bom.utf32be - - test/fixtures/Dockerfile.bom.utf32le - - test/fixtures/Dockerfile.bom.utf16be - - test/fixtures/Dockerfile.bom.utf16le - - test/fixtures/Dockerfile.bom.utf8 -default-extensions: - - OverloadedStrings - - ImplicitParams - - Rank2Types -ghc-options: - - -Wall - - -Wcompat - - -Wincomplete-record-updates - - -Wincomplete-uni-patterns - - -Wredundant-constraints - - -fno-warn-unused-do-bind - - -fno-warn-orphans - -dependencies: - - base >=4.8 && <5 - - bytestring >=0.10 - - containers - - data-default - - data-default-class - - &megaparsec megaparsec >= 9.0.0 - - prettyprinter - - split >=0.2 - - text - - time - -library: - source-dirs: src - exposed-modules: - - Language.Docker - - Language.Docker.Parser - - Language.Docker.PrettyPrint - - Language.Docker.Syntax - -tests: - hspec: - main: Spec.hs - source-dirs: test - default-extensions: - - OverloadedLists - dependencies: - - *megaparsec - - HUnit >=1.2 - - QuickCheck - - hspec - - hspec-megaparsec - - language-docker diff --git a/stack-gh-pages b/stack-gh-pages deleted file mode 100644 index 42e97e3..0000000 --- a/stack-gh-pages +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -e -git checkout master -pname=`cat package.yaml | grep "name:" | awk '{ print $2 }'` -echo ">>> Building Haddock for $pname" -time stack haddock --no-haddock-deps --fast -doc_root=`stack path --local-doc-root`/$pname* -du -h $doc_root -git branch -D gh-pages || echo "gh-pages branch didn't exist" -git checkout --orphan gh-pages -rm -rf * -cp -r $doc_root/* . -git add . -git commit -m "Automatic Haddock commit" -time git push -f -u origin gh-pages -git co master diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 index e553af9..0000000 --- a/stack.yaml +++ /dev/null @@ -1,7 +0,0 @@ -resolver: lts-18.28 -packages: -- '.' -flags: {} -extra-package-dbs: [] -ghc-options: - "$everything": -haddock diff --git a/stack.yaml.lock b/stack.yaml.lock deleted file mode 100644 index 7af0442..0000000 --- a/stack.yaml.lock +++ /dev/null @@ -1,12 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: [] -snapshots: -- completed: - size: 590100 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml - sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68 - original: lts-18.28