Confused about the sub-modules

2016-12-20 Thread Erik de Castro Lopo
Hi all,

I'm a bit confused about how the GHC dev tree handles submodules like
libraries/Cabal, libraries/process, libraries/directory and
libraries/containers.

All of these libraries/submodules seem to have their own github projects
where people can submit PRs, but once the commits have been made there,
what is the process to get submodules updated in the GHC tree?

Any light people can shed on this process would be appreciated.

Erik
-- 
--
Erik de Castro Lopo
http://www.mega-nerd.com/
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


Re: Confused about the sub-modules

2016-12-20 Thread Edward Z. Yang
Once the commit is upstream, I just checkout a newer commit from
master and then commit it as a submodule update. Maybe it's
wrong but no one has ever told me otherwise.  Around release
time the release manager makes sure all the libraries correspond to
actual releases.

Edward

Excerpts from Erik de Castro Lopo's message of 2016-12-21 17:33:36 +1100:
> Hi all,
> 
> I'm a bit confused about how the GHC dev tree handles submodules like
> libraries/Cabal, libraries/process, libraries/directory and
> libraries/containers.
> 
> All of these libraries/submodules seem to have their own github projects
> where people can submit PRs, but once the commits have been made there,
> what is the process to get submodules updated in the GHC tree?
> 
> Any light people can shed on this process would be appreciated.
> 
> Erik
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


Re: Confused about the sub-modules

2016-12-20 Thread Alan & Kim Zimmerman
For the utils/haddock submodule there is a ghc-head branch, and the commit
should be on that before pushing to GHC master with a submodule update.

I do not know if that convention is followed on any of the other libraries.

Alan

On Wed, Dec 21, 2016 at 8:48 AM, Edward Z. Yang  wrote:

> Once the commit is upstream, I just checkout a newer commit from
> master and then commit it as a submodule update. Maybe it's
> wrong but no one has ever told me otherwise.  Around release
> time the release manager makes sure all the libraries correspond to
> actual releases.
>
> Edward
>
> Excerpts from Erik de Castro Lopo's message of 2016-12-21 17:33:36 +1100:
> > Hi all,
> >
> > I'm a bit confused about how the GHC dev tree handles submodules like
> > libraries/Cabal, libraries/process, libraries/directory and
> > libraries/containers.
> >
> > All of these libraries/submodules seem to have their own github projects
> > where people can submit PRs, but once the commits have been made there,
> > what is the process to get submodules updated in the GHC tree?
> >
> > Any light people can shed on this process would be appreciated.
> >
> > Erik
> ___
> ghc-devs mailing list
> ghc-devs@haskell.org
> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
>
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


Re: Confused about the sub-modules

2016-12-20 Thread Edward Z. Yang
Not any more. The commit just has to exist in the remote repo (that's
what the lint checks.)

Excerpts from Alan & Kim Zimmerman's message of 2016-12-21 09:20:15 +0200:
> For the utils/haddock submodule there is a ghc-head branch, and the commit
> should be on that before pushing to GHC master with a submodule update.
> 
> I do not know if that convention is followed on any of the other libraries.
> 
> Alan
> 
> On Wed, Dec 21, 2016 at 8:48 AM, Edward Z. Yang  wrote:
> 
> > Once the commit is upstream, I just checkout a newer commit from
> > master and then commit it as a submodule update. Maybe it's
> > wrong but no one has ever told me otherwise.  Around release
> > time the release manager makes sure all the libraries correspond to
> > actual releases.
> >
> > Edward
> >
> > Excerpts from Erik de Castro Lopo's message of 2016-12-21 17:33:36 +1100:
> > > Hi all,
> > >
> > > I'm a bit confused about how the GHC dev tree handles submodules like
> > > libraries/Cabal, libraries/process, libraries/directory and
> > > libraries/containers.
> > >
> > > All of these libraries/submodules seem to have their own github projects
> > > where people can submit PRs, but once the commits have been made there,
> > > what is the process to get submodules updated in the GHC tree?
> > >
> > > Any light people can shed on this process would be appreciated.
> > >
> > > Erik
> > ___
> > ghc-devs mailing list
> > ghc-devs@haskell.org
> > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
> >
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


RE: Confused about the sub-modules

2016-12-21 Thread Simon Peyton Jones via ghc-devs
Info here.  I hope it is up to date

https://ghc.haskell.org/trac/ghc/wiki/Repositories

If it's out of date, please fix!

Simon

|  -Original Message-
|  From: ghc-devs [mailto:ghc-devs-boun...@haskell.org] On Behalf Of Edward Z.
|  Yang
|  Sent: 21 December 2016 06:49
|  To: Erik de Castro Lopo 
|  Cc: ghc-devs 
|  Subject: Re: Confused about the sub-modules
|  
|  Once the commit is upstream, I just checkout a newer commit from master and
|  then commit it as a submodule update. Maybe it's wrong but no one has ever
|  told me otherwise.  Around release time the release manager makes sure all
|  the libraries correspond to actual releases.
|  
|  Edward
|  
|  Excerpts from Erik de Castro Lopo's message of 2016-12-21 17:33:36 +1100:
|  > Hi all,
|  >
|  > I'm a bit confused about how the GHC dev tree handles submodules like
|  > libraries/Cabal, libraries/process, libraries/directory and
|  > libraries/containers.
|  >
|  > All of these libraries/submodules seem to have their own github
|  > projects where people can submit PRs, but once the commits have been
|  > made there, what is the process to get submodules updated in the GHC tree?
|  >
|  > Any light people can shed on this process would be appreciated.
|  >
|  > Erik
|  ___
|  ghc-devs mailing list
|  ghc-devs@haskell.org
|  https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.haskell
|  .org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc-
|  devs&data=02%7C01%7Csimonpj%40microsoft.com%7C60ddf19e8b144b4508c608d4296d71
|  ea%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636178997417986784&sdata=D3t
|  262ge8xaOYdKm%2Byqx7oCIaHs6mTtY0g17zGU54Pw%3D&reserved=0
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


Re: Confused about the sub-modules

2016-12-21 Thread Erik de Castro Lopo
Edward Z. Yang wrote:

> Not any more. The commit just has to exist in the remote repo (that's
> what the lint checks.)

So this is where I am running into trouble. Everything for process 
and directory is fine, but for Cabal and containers, the git repo
on git.haskell.org is missing the commits I need.

(No need to CC me, I'm subscribed to ghc-devs).

Erik
-- 
--
Erik de Castro Lopo
http://www.mega-nerd.com/
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


Re: Confused about the sub-modules

2016-12-21 Thread Ben Gamari
Erik de Castro Lopo  writes:

> Edward Z. Yang wrote:
>
>> Not any more. The commit just has to exist in the remote repo (that's
>> what the lint checks.)
>
> So this is where I am running into trouble. Everything for process 
> and directory is fine, but for Cabal and containers, the git repo
> on git.haskell.org is missing the commits I need.
>
Hmm, what in particular is missing? Cabal seems up-to-date (both
git.haskell.org:packages/Cabal and github.com/haskell/Cabal master
branches point to 09865f60caa55a7b02880f2a779c9dd8e1be5ac0). As does
containers (both point to 71c64747120c3cd1b91f06731167009b0e5b2454).

In general all of this should be reasonably automatic. However, when
upstreams push non-fast-forward updates to their branches a bit of
manual intervention is necessary; if in doubt just ask as you've done
here.

Cheers,

- Ben


signature.asc
Description: PGP signature
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


Re: Confused about the sub-modules

2016-12-21 Thread Edward Z. Yang
I *just* pushed a Cabal submodule update, so Erik probably hadn't
gotten it.

Excerpts from Ben Gamari's message of 2016-12-21 14:14:37 -0500:
> Erik de Castro Lopo  writes:
> 
> > Edward Z. Yang wrote:
> >
> >> Not any more. The commit just has to exist in the remote repo (that's
> >> what the lint checks.)
> >
> > So this is where I am running into trouble. Everything for process 
> > and directory is fine, but for Cabal and containers, the git repo
> > on git.haskell.org is missing the commits I need.
> >
> Hmm, what in particular is missing? Cabal seems up-to-date (both
> git.haskell.org:packages/Cabal and github.com/haskell/Cabal master
> branches point to 09865f60caa55a7b02880f2a779c9dd8e1be5ac0). As does
> containers (both point to 71c64747120c3cd1b91f06731167009b0e5b2454).
> 
> In general all of this should be reasonably automatic. However, when
> upstreams push non-fast-forward updates to their branches a bit of
> manual intervention is necessary; if in doubt just ask as you've done
> here.
> 
> Cheers,
> 
> - Ben
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


Mailing list CCs (Was: Confused about the sub-modules)

2016-12-21 Thread Joachim Breitner
Hi Erik,

Am Mittwoch, den 21.12.2016, 20:13 +1100 schrieb Erik de Castro Lopo:
> (No need to CC me, I'm subscribed to ghc-devs).

I see where you are coming from, I also joined the Haskell community
after having been socialized on Debian mailing lists. Slightly
unfortunately, unsolicited CCs are the common social norm here, and we
immigrants will have to adjust. It’s ok. :-)

Greetings,
Joachim

-- 
Joachim Breitner
  m...@joachim-breitner.de
  http://www.joachim-breitner.de/


signature.asc
Description: This is a digitally signed message part
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs