-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #143 from guibou/bump_ghc912_fix_ghc910
Bump ghc912 fix ghc910
- Loading branch information
Showing
65 changed files
with
580 additions
and
625 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,19 @@ | ||
| name: (fast) CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ main ] | ||
| branches: [main] | ||
| pull_request: | ||
| branches: [ main ] | ||
|
|
||
| branches: [main] | ||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: cachix/install-nix-action@v21 | ||
| - uses: cachix/cachix-action@v12 | ||
| with: | ||
| name: guibou | ||
| authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' | ||
|
|
||
| # Builds | ||
| - name: Build current GHC | ||
| run: nix build .#pyf | ||
| - uses: actions/checkout@v2 | ||
| - uses: cachix/install-nix-action@v21 | ||
| - uses: cachix/cachix-action@v12 | ||
| with: | ||
| name: guibou | ||
| authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' | ||
| # Builds | ||
| - name: Build current GHC | ||
| run: nix build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,42 @@ | ||
| name: Complete CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ main ] | ||
| branches: [main] | ||
| pull_request: | ||
| branches: [ main ] | ||
|
|
||
| branches: [main] | ||
| jobs: | ||
| nix_matrix: | ||
| strategy: | ||
| matrix: | ||
| # 88 is not in nixpkgs anymore | ||
| # 910 does not build yet for unknown reason | ||
| # We are not using nix build .#pyf_all because of github disk limitations | ||
| ghc: [86, 90, 92, 94, 96, 98] | ||
| ghc: [90, 92, 94, 96, 98, 910, 912] | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: cachix/install-nix-action@v21 | ||
| - uses: cachix/cachix-action@v12 | ||
| with: | ||
| name: guibou | ||
| authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' | ||
|
|
||
| # Builds cabal (nix) | ||
| - name: Build with GHC ${{ matrix.ghc }} | ||
| run: nix build .#pyf_${{ matrix.ghc }} | ||
|
|
||
| - uses: actions/checkout@v2 | ||
| - uses: cachix/install-nix-action@v21 | ||
| - uses: cachix/cachix-action@v12 | ||
| with: | ||
| name: guibou | ||
| authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' | ||
| # Builds cabal (nix) | ||
| - name: Build with GHC ${{ matrix.ghc }} | ||
| run: nix build .#pyf_${{ matrix.ghc }} | ||
| stack_build: | ||
| strategy: | ||
| matrix: | ||
| resolver: [ lts-14.27 # 8.6 | ||
| , lts-16.31 # 8.8 | ||
| , lts-17.1 # 8.10 | ||
| , lts-19.1 # 9.0 | ||
| , lts-20.26 # 9.2 | ||
| , lts-21.17 # 9.4 | ||
| , lts-22.22 # 9.6 | ||
| , nightly-2024-05-15 # 9.8 nightly | ||
| ] | ||
|
|
||
| resolver: [lts-14.27, # 8.6 | ||
| lts-16.31, # 8.8 | ||
| lts-17.1, # 8.10 | ||
| lts-19.1, # 9.0 | ||
| lts-20.26, # 9.2 | ||
| lts-21.17, # 9.4 | ||
| lts-22.22, # 9.6 | ||
| lts-23.2, # 9.8 | ||
| nightly-2025-01-03, # 9.10 nightly | ||
| ] | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Setup Stack | ||
| run: sudo apt-get install haskell-stack | ||
| - name: Stack resolver ${{ matrix.resolver }} | ||
| run: stack --resolver ${{ matrix.resolver }} test | ||
| - uses: actions/checkout@v2 | ||
| - name: Setup Stack | ||
| run: sudo apt-get install haskell-stack | ||
| - name: Stack resolver ${{ matrix.resolver }} | ||
| run: stack --resolver ${{ matrix.resolver }} test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,107 @@ | ||
| cabal-version: 2.4 | ||
| name: PyF | ||
| version: 0.11.3.0 | ||
| synopsis: Quasiquotations for a python like interpolated string formatter | ||
| description: Quasiquotations for a python like interpolated string formatter. | ||
| license: BSD-3-Clause | ||
| license-file: LICENSE | ||
| author: Guillaume Bouchard | ||
| maintainer: [email protected] | ||
| category: Text | ||
| build-type: Simple | ||
| extra-source-files: ChangeLog.md Readme.md test/golden/*.golden test/golden96/*.golden | ||
|
|
||
| Flag python_test | ||
| Description: Enable extensive python testing | ||
| Manual: True | ||
| Default: False | ||
| cabal-version: 2.4 | ||
| name: PyF | ||
| version: 0.11.3.0 | ||
| synopsis: | ||
| Quasiquotations for a python like interpolated string formatter | ||
|
|
||
| description: | ||
| Quasiquotations for a python like interpolated string formatter. | ||
|
|
||
| license: BSD-3-Clause | ||
| license-file: LICENSE | ||
| author: Guillaume Bouchard | ||
| maintainer: [email protected] | ||
| category: Text | ||
| build-type: Simple | ||
| extra-source-files: | ||
| ChangeLog.md | ||
| Readme.md | ||
| test/golden/*.golden | ||
| test/golden96/*.golden | ||
|
|
||
| library | ||
| exposed-modules: | ||
| PyF | ||
| PyF.Class | ||
| PyF.Internal.PythonSyntax | ||
| PyF.Internal.Meta | ||
| PyF.Internal.QQ | ||
| PyF.Formatters | ||
| PyF.Internal.ParserEx | ||
| PyF.Internal.Parser | ||
|
|
||
| build-depends: base >= 4.12 && < 4.22 | ||
| , bytestring >= 0.10.8 && < 0.13 | ||
| , template-haskell >= 2.14.0 && < 2.24 | ||
| , text >= 1.2.3 && < 2.2 | ||
| , time >= 1.8.0 && < 1.14 | ||
| , parsec >= 3.1.13 && < 3.2 | ||
| , mtl >= 2.2.2 && < 2.4 | ||
| , ghc >= 8.6.1 | ||
| if impl(ghc < 9.2.1) | ||
| build-depends: | ||
| ghc-boot >= 8.6.1 && < 9.7 | ||
| hs-source-dirs: src | ||
| ghc-options: -Wall -Wunused-packages -Wincomplete-uni-patterns | ||
| default-language: Haskell2010 | ||
| PyF | ||
| PyF.Class | ||
| PyF.Formatters | ||
| PyF.Internal.Meta | ||
| PyF.Internal.Parser | ||
| PyF.Internal.ParserEx | ||
| PyF.Internal.PythonSyntax | ||
| PyF.Internal.QQ | ||
|
|
||
| build-depends: | ||
| , base >=4.12 && <4.22 | ||
| , bytestring >=0.10.8 && <0.13 | ||
| , ghc >=8.6.1 | ||
| , mtl >=2.2.2 && <2.4 | ||
| , parsec >=3.1.13 && <3.2 | ||
| , template-haskell >=2.14.0 && <2.24 | ||
| , text >=1.2.3 && <2.2 | ||
| , time >=1.8.0 && <1.15 | ||
|
|
||
| if impl(ghc <9.2.1) | ||
| build-depends: ghc-boot >=8.6.1 && <9.7 | ||
|
|
||
| hs-source-dirs: src | ||
| ghc-options: -Wall -Wunused-packages -Wincomplete-uni-patterns | ||
| default-language: Haskell2010 | ||
| default-extensions: QuasiQuotes | ||
|
|
||
| test-suite pyf-test | ||
| type: exitcode-stdio-1.0 | ||
| hs-source-dirs: test | ||
| main-is: Spec.hs | ||
| other-modules: SpecUtils SpecCustomDelimiters | ||
| build-depends: base, PyF, hspec, template-haskell, text, bytestring, time | ||
| ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -Wunused-packages | ||
| default-language: Haskell2010 | ||
| if flag(python_test) | ||
| cpp-options: -DPYTHON_TEST | ||
| build-depends: process | ||
| type: exitcode-stdio-1.0 | ||
| hs-source-dirs: test | ||
| main-is: Spec.hs | ||
| other-modules: SpecCustomDelimiters | ||
| build-depends: | ||
| , base | ||
| , bytestring | ||
| , hspec | ||
| , PyF | ||
| , template-haskell | ||
| , text | ||
| , time | ||
|
|
||
| ghc-options: | ||
| -Wall -threaded -rtsopts -with-rtsopts=-N -Wunused-packages | ||
|
|
||
| default-language: Haskell2010 | ||
|
|
||
| test-suite pyf-overloaded | ||
| type: exitcode-stdio-1.0 | ||
| hs-source-dirs: test | ||
| main-is: SpecOverloaded.hs | ||
| build-depends: base, PyF, hspec, text, bytestring | ||
| ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -Wunused-packages | ||
| default-language: Haskell2010 | ||
| type: exitcode-stdio-1.0 | ||
| hs-source-dirs: test | ||
| main-is: SpecOverloaded.hs | ||
| build-depends: | ||
| , base | ||
| , bytestring | ||
| , hspec | ||
| , PyF | ||
| , text | ||
|
|
||
| ghc-options: | ||
| -Wall -threaded -rtsopts -with-rtsopts=-N -Wunused-packages | ||
|
|
||
| default-language: Haskell2010 | ||
|
|
||
| test-suite pyf-failure | ||
| type: exitcode-stdio-1.0 | ||
| hs-source-dirs: test | ||
| main-is: SpecFail.hs | ||
| build-depends: base, hspec, text, process, hspec, temporary, filepath, deepseq, HUnit, PyF | ||
| ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -Wunused-packages | ||
| default-language: Haskell2010 | ||
| type: exitcode-stdio-1.0 | ||
| hs-source-dirs: test | ||
| main-is: SpecFail.hs | ||
| build-depends: | ||
| , base | ||
| , deepseq | ||
| , filepath | ||
| , hspec | ||
| , HUnit | ||
| , process | ||
| , PyF | ||
| , temporary | ||
| , text | ||
|
|
||
| ghc-options: | ||
| -Wall -threaded -rtsopts -with-rtsopts=-N -Wunused-packages | ||
|
|
||
| default-language: Haskell2010 | ||
|
|
||
| source-repository head | ||
| type: git | ||
|
|
||
Oops, something went wrong.