Skip to content
Snippets Groups Projects
This project is mirrored from https://github.com/haskell/Cabal.git. Pull mirroring updated .
  1. May 14, 2024
  2. May 13, 2024
    • Phil de Joux's avatar
      Check with both pinned & latest hackage · 76f23ffb
      Phil de Joux authored
      (cherry picked from commit d6e067e8)
      76f23ffb
    • Phil de Joux's avatar
      Don't override project with command line · b2a46f9e
      Phil de Joux authored
      The release project disables tests and benchmarks.
      
      (cherry picked from commit 135611e4)
      b2a46f9e
    • Phil de Joux's avatar
      Add a --dry-run build check of cabal.project.release · 340e35b6
      Phil de Joux authored
      - Cache of ~/.cabal/store not needed for --dry-run
      - Remove workaround for the new job only
      
      (cherry picked from commit cdc8bdef)
      340e35b6
    • mergify[bot]'s avatar
      Merge pull request #10003 from haskell/mergify/bp/3.12/pr-9518 · ece298a6
      mergify[bot] authored
      Testsuite: pass -i argument to runghc invocations (backport #9518)
      Unverified
      ece298a6
    • sheaf's avatar
      Testsuite: pass -i argument to runghc invocations · 145644cf
      sheaf authored
      This commit modifies the generation of runghc commands to pass an
      additional -i argument to account for the change in working directory.
      
      This ensures that, in the testsuite, runghc is able to see other modules.
      For example, an invocation of runghc to run a Custom Setup script will
      now properly see the modules imported, e.g. if one has a directory
      structure like
      
        test.cabal
        Setup.hs
        SetupDep.hs
      
      and Setup.hs imports SetupDep.hs.
      
      (cherry picked from commit b2b9c2f6)
      145644cf
    • mergify[bot]'s avatar
      Merge pull request #10000 from haskell/mergify/bp/3.12/pr-9750 · 8a9c46ed
      mergify[bot] authored
      Remove stale see 'withSourceCopyDir' (backport #9750)
      Unverified
      8a9c46ed
    • Phil de Joux's avatar
      Remove stale see 'withSourceCopyDir' · 22feacc7
      Phil de Joux authored
      (cherry picked from commit 54b26f49)
      22feacc7
    • mergify[bot]'s avatar
      Use package groups (backport #9565) (#10006) · edc131ff
      mergify[bot] authored
      
      * Import packages from project-cabal/pkgs
      
      - Move constraints to project-cabal/constraints.config
      - Remove duplicate package groups
      - Groups coverage, doctest and validate are the same as the default group
      - Remove duplicate validate-libonly package group
      - Both validate and validate-libonly are the same
      - Move Cabal & Cabal-syntax to pkgs/cabal.config
      - Add install package group
      - Add benchmarks package group
      - Add tests package group
      - Both default and libonly groups were the same set of packages that I renamed to tests
      - Put install group before tests and benchmarks
      - Don't repeat packages
      - Add TODO and REVIEW comments on allow-newer exceptions
      - Move latest.ghc configuration
      - Put program-options first & separate imports
      - Remove optional-packages
      - Don't reiterate default value for tests and benchmarks
      - Don't reiterate default value for optimization
      - Add ghc-options.config
      - Rename to ghc-latest.config
      - Use -Werror in ghc-options.config
      - Don't include ghc-options.config for doctest project
      - Add project-config/pkgs.config
      - Add project-config/pkgs.config importing all package groups
      - Move Cabal-described to the cabal package group
      - Remove cabal.project.buildinfo
      - Have cabal.project.doctest import cabal.project
      - Split integration tests into their own package group.
      - Add back trailing newlines at EOF in projects
      - Integration-tests.config needed for libonly
      - Add a README for projects.
      
      (cherry picked from commit 0876e187)
      
      # Conflicts:
      #	cabal.project.release
      
      * Build all local packages with -Werror
      
      - Satisfy -Wmissing-signatures in test-runtime-deps
      - Satisfy -Wx-partial in HackageBenchmark
      - Satisfy -Wunused-imports in QuickCheck.Instances.Cabal
      - Use partial pattern for filtering in list comprehension
      - Don't error on deprecated import
      
      (cherry picked from commit 8453ee0b)
      
      * Add an intercepting cabal-testsuite/cabal.project
      
      - Reduce duplication in test flag setup
      - Avoid "New config" picking cabal's own project
      
      Before this change, this was the test failure:
      
      Unit Tests
        UnitTests.Distribution.Client.Configure
          Configure tests
            New config:                     FAIL
              Exception: project-cabal/pkgs/cabal.config: withBinaryFile: does not exist (No such file or directory)
              Use -p '/New config/' to rerun this test only.
            Replacement + new config:       OK
            Old + new config:               OK
            Old + new config, no appending: OK
            Old + new config, backup check: OK
            Local program options:          OK
      
      1 out of 6 tests failed (0.02s)
      
      (cherry picked from commit d3362759)
      
      * Remove dangling doctest TODO left over from #9572
      
      (cherry picked from commit 619befd0)
      
      * Remove allow-newer exception for cryptohash-sha256:base
      
      (cherry picked from commit ed5d4044)
      
      * Remove projects; weeder, doctest & libonly
      
      * Remove cabal.project.libonly
      
      It was only referenced once in a stale Makefile comment about doctests.
      
      * Remove weeder
      
      - remove weeder's configuration
      - remove its recipe from Makefile
      - remove its project
      
      * Delete cabal.project.doctest
      
      - Adding --ghc-options="-Wwarn" is sufficient to avoid the numerous <interactive> failures seen otherwise
      - write-ghc-environment-files has a default of never
      
      (cherry picked from commit 72be26bd)
      
      * Update cabal.project.release
      
      ---------
      
      Co-authored-by: default avatarPhil de Joux <philderbeast@gmail.com>
      Co-authored-by: default avatarHécate <Kleidukos@users.noreply.github.com>
      Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
      Unverified
      edc131ff
    • mergify[bot]'s avatar
      Text file, newlines at end of files (backport #9804) (#10007) · ea05e10e
      mergify[bot] authored
      
      * Add back whitespace workflow
      
      (cherry picked from commit 265f1493)
      
      * Whitespace conventions in contributing
      
      (cherry picked from commit 7c9346bf)
      
      * Fix whitespace in workflows
      
      (cherry picked from commit c31ca12e)
      
      # Conflicts:
      #	.github/workflows/validate.yml
      
      * Fix whitespace in docs
      
      (cherry picked from commit 2ea012eb)
      
      * Fix whitespace in *.hs sources
      
      (cherry picked from commit e420bf25)
      
      * Add missing line at EOF for cabal-testsuite/**/*.hs
      
      - Fix whitespace in cabal-testsuite + other tests
      
      (cherry picked from commit e386a13c)
      
      * Fix whitespace in fourmolu configuration
      
      (cherry picked from commit b790751c)
      
      * Configure fix-whitespace to include *.project
      
      Needed for POSIX compliance for text files
      
      (cherry picked from commit ed4c36a2)
      
      * Fix whitespace in *.project
      
      (cherry picked from commit 38eb1e82)
      
      * Ignore generated doc/buildinfo-fields-reference.rst
      
      (cherry picked from commit b414fafc)
      
      * Reduce double space between prose words
      
      Co-authored-by: Brandon S. Allbery's avatarbrandon s allbery kf8nh <allbery.b@gmail.com>
      (cherry picked from commit 834e1ed6)
      
      * Use fix-whitespace-action
      
      (cherry picked from commit eb87ffdf)
      
      * Fix merge conflict
      
      ---------
      
      Co-authored-by: default avatarPhil de Joux <philderbeast@gmail.com>
      Co-authored-by: default avatarHécate <Kleidukos@users.noreply.github.com>
      Unverified
      ea05e10e
    • mergify[bot]'s avatar
      Merge pull request #9999 from haskell/mergify/bp/3.12/pr-9671 · d7ce36f0
      mergify[bot] authored
      Use in-tree Cabal library for `cabal-install` tests with custom setup. (backport #9671)
      Unverified
      d7ce36f0
    • Matthew Pickering's avatar
      Allow using different Cabal library versions for `cabal-install` tests with custom setup. · efc8eb1c
      Matthew Pickering authored
      The idea here is to pass a `--package-db` flag to `cabal-install` which
      contains just `Cabal` and `Cabal-syntax` of the specific version. This
      allows `cabal-install` tests to use the in-tree `Cabal` version,
      something which you can easily run into and get very confused about when
      writing tests.
      
      There are a few options which can be passed to `cabal-tests` executable
      to control which Cabal library you will test against.
      
      1. --boot-cabal-lib specifies to use the Cabal library bundled with the
         test compiler, this is the default and existing behaviour of the
         testsuite.
      2. --intree-cabal-lib=<root_dir> specifies to use Cabal and Cabal-syntax
         from a specific directory, and `--test-tmp` indicates where to put
         the package database they are built with.
      3. --specific-cabal-lib=<VERSION> specifies to use a specific Cabal
         version from hackage (ie 3.10.2.0) and installs the package database
         into --test-tmp=<DIR>
      
      The end result is that changes in the Cabal library can be tested with
      cabal-install tests in the testsuite.
      
      There have been a number of confusing issues with people writing tests
      for changes in the Cabal library which never ran because of
      cabal-install tests always used the boot Cabal library (see #9425
      for one).
      
      Fixes #9681
      
      (cherry picked from commit 716b109c)
      efc8eb1c
  3. May 10, 2024
  4. May 06, 2024
  5. May 05, 2024
  6. May 01, 2024
  7. Apr 30, 2024
  8. Apr 29, 2024
    • mergify[bot]'s avatar
      CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) (#9956) · d871c1e1
      mergify[bot] authored
      
      * CI: force MacOS jobs to use Intel runners (`macos-13`)
      
      GitHub just switched macos-latest to the ARM chips (now alisasing
      `macos-14`), and it brings a bunch of problems.
      
      - First of all, GHC's 8.8 and 8.6 don't exist there.
      - ghcup and llvm are unavailable
      
      For the time being, lets stay on the previous version of the runner.
      
      (cherry picked from commit d36e0d09)
      
      # Conflicts:
      #	.github/workflows/validate.yml
      
      * CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-action/setup instead
      
      (cherry picked from commit 082d9520)
      
      * fixup! more compat with new macos runners
      
      (cherry picked from commit 326a1f60)
      
      * !fixup resolve conflicts
      
      * copy an import list from #9551
      
      because `System.Process.Internals` just (like, within the past
      hour or so) started exporting a name we are using.
      
      ---------
      
      Co-authored-by: default avatarArtem Pelenitsyn <a.pelenitsyn@gmail.com>
      Co-authored-by: Brandon S. Allbery's avatarbrandon s allbery kf8nh <allbery.b@gmail.com>
      Unverified
      d871c1e1
  9. Apr 26, 2024
  10. Apr 25, 2024
  11. Apr 24, 2024
Loading