Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6432 - Split RepoType into type with known VCS and other #6612

Merged

Conversation

v0d1ch
Copy link
Contributor

@v0d1ch v0d1ch commented Mar 24, 2020

fixes #6432

Previously we had:

data RepoType = Darcs | Git | SVN | CVS
              | Mercurial | GnuArch | Bazaar | Monotone
              | OtherRepoType String

And these changes split the RepoType into two like this:

data KnownRepoType = Darcs | Git | SVN | CVS
                   | Mercurial | GnuArch | Bazaar | Monotone

data RepoType = KnownRepoType KnownRepoType
              | OtherRepoType String

@v0d1ch v0d1ch force-pushed the 6432-implement-Representable-container branch from 5e0dc32 to 4e73c02 Compare March 24, 2020 16:23
@phadej
Copy link
Collaborator

phadej commented Mar 24, 2020

You should

# enable building dev build cabal-install
make cabal-install-dev

# hack and
cabal build all

# Revert cabal-install-dev changes
make cabal-install-prod
git commit --amend

Copy link
Collaborator

@phadej phadej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Made few comments.

@v0d1ch v0d1ch force-pushed the 6432-implement-Representable-container branch from 4e73c02 to b1f116e Compare March 24, 2020 22:09
@v0d1ch
Copy link
Contributor Author

v0d1ch commented Mar 24, 2020

@phadej Thanks for the review! I made needed changes. Btw is there a way for me to assign myself to the issues I want to work on?

@v0d1ch
Copy link
Contributor Author

v0d1ch commented Mar 25, 2020

@phadej I see The operation was canceled in failing tests and it seems that test suite was finished with success?

 Validate lib-tests5h 45m 1s
##[error]The operation was canceled.
Run sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s lib-tests
=== Cabal: tests =============================================== 22:24:54 ===
>>> /__w/cabal/cabal/dist-newstyle-validate-ghc-8.8.3/build/x86_64-linux/ghc-8.8.3/Cabal-3.3.0.0/t/unit-tests/build/unit-tests/unit-tests -j2 --hide-successes --with-ghc=ghc-8.8.3 
File modification time resolution calibration completed, maximum delay
observed: 16.528 ms. Will be using delay of 33.056 for test runs.
("[1 of 1] Compiling Main             ( /tmp/20405-2.hs, /tmp/20405-2.o )\nLinking /tmp/20405-3.exe ...\n","",ExitSuccess)

Cabal/Distribution/Types/SourceRepo.hs Outdated Show resolved Hide resolved
Cabal/Distribution/Types/SourceRepo.hs Outdated Show resolved Hide resolved
@v0d1ch v0d1ch force-pushed the 6432-implement-Representable-container branch from b1f116e to 0301b49 Compare March 25, 2020 20:26
@v0d1ch v0d1ch force-pushed the 6432-implement-Representable-container branch from 0301b49 to 391f984 Compare March 25, 2020 21:01
@phadej phadej merged commit 8874aba into haskell:master Mar 27, 2020
@phadej
Copy link
Collaborator

phadej commented Mar 27, 2020

Thanks!

@phadej phadej mentioned this pull request Apr 1, 2020
@phadej phadej mentioned this pull request Jul 10, 2020
@phadej phadej added this to the 3.4.0.0-rc1 milestone Jul 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

There are fixed size of known VCS, implement Representable container.
2 participants