Can't push to haddock

Simon Peyton Jones simonpj at microsoft.com
Mon Dec 18 09:01:57 UTC 2017


The general scheme seems to be anything under the haskell organization is primarily on github and mirrored to haskell.org<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fhaskell.org&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=6dowdiw2FqVDBthKrqbcKBPmXtS%2FIFnClFKw3WFksFw%3D&reserved=0>. (this of course includes Hadrian which is in another org). The things under the ghc org are haskell.org<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fhaskell.org&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=6dowdiw2FqVDBthKrqbcKBPmXtS%2FIFnClFKw3WFksFw%3D&reserved=0> focused and mirrored to github.
My question is: why mirror?  At the moment, I think

  *   we always pull from git.haskell.org
  *   but for other-org packages we push to github
  *   …and mirror on git.haskell.org.

But why don’t we just pull from github rather than mirroring on git.haskell.org?

Simon


From: Phyx [mailto:lonetiger at gmail.com]
Sent: 16 December 2017 15:26
To: Simon Peyton Jones <simonpj at microsoft.com>
Cc: ghc-devs at haskell.org
Subject: Re: Can't push to haddock


On Fri, Dec 8, 2017, 10:13 Simon Peyton Jones via ghc-devs <ghc-devs at haskell.org<mailto:ghc-devs at haskell.org>> wrote:
|  Yes, the mirroring has a little bit of latency (assuming the mirroring
|  trigger event notification from github to git.haskell.org<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit.haskell.org&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=CDZBMVDW%2BkQbgTLOygGCoAxPdrU1op33PuYfJzhNfR0%3D&reserved=0> didn't get
|  lost). How much time did you wait between pushing to github and
|  ghc.git?

I didn't allow any time -- I didn't know that time was needed. Perhaps we should add a note to
https://ghc.haskell.org/trac/ghc/wiki/Repositories
to explain?  Under "Updating sub-repos" perhaps.

I wonder if it'd be worth us articulating the reason why some submodules live in github, but some live in git.haskell.org<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit.haskell.org&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=CDZBMVDW%2BkQbgTLOygGCoAxPdrU1op33PuYfJzhNfR0%3D&reserved=0> -- with only mirroring github.  I'm sure there's a rationale but I don't get it yet.

Simon


The general scheme seems to be anything under the haskell organization is primarily on github and mirrored to haskell.org<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fhaskell.org&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=6dowdiw2FqVDBthKrqbcKBPmXtS%2FIFnClFKw3WFksFw%3D&reserved=0>. (this of course includes Hadrian which is in another org). The things under the ghc org are haskell.org<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fhaskell.org&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=6dowdiw2FqVDBthKrqbcKBPmXtS%2FIFnClFKw3WFksFw%3D&reserved=0> focused and mirrored to github.



|  -----Original Message-----
|  From: Herbert Valerio Riedel [mailto:hvriedel at gmail.com<mailto:hvriedel at gmail.com>]
|  Sent: 07 December 2017 17:57
|  To: Simon Peyton Jones <simonpj at microsoft.com<mailto:simonpj at microsoft.com>>
|  Subject: Re: Can't push to haddock
|
|  Hi Simon,
|
|  Yes, the mirroring has a little bit of latency (assuming the mirroring
|  trigger event notification from github to git.haskell.org<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit.haskell.org&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=CDZBMVDW%2BkQbgTLOygGCoAxPdrU1op33PuYfJzhNfR0%3D&reserved=0> didn't get
|  lost). How much time did you wait between pushing to github and
|  ghc.git?
|
|  On Thu, Dec 7, 2017 at 6:53 PM, Simon Peyton Jones via ghc-devs <ghc-
|  devs at haskell.org<mailto:devs at haskell.org>> wrote:
|  > But when I try to push the GHC patch, I get this message
|  >
|  > Ah… it worked after a while. Maybe a mirroring thing?
|  >
|  > But in pushing to GHC I saw:
|  >
|  > git push
|  >
|  > Counting objects: 45, done.
|  >
|  > Delta compression using up to 32 threads.
|  >
|  > Compressing objects: 100% (45/45), done.
|  >
|  > Writing objects: 100% (45/45), 27.56 KiB | 0 bytes/s, done.
|  >
|  > Total 45 (delta 43), reused 0 (delta 0)
|  >
|  > remote: performing commit message validations...
|  >
|  > remote: Commit message validation passed!
|  >
|  > remote: performing submodule-ref update validations...
|  >
|  > remote: Submodule update(s) detected in
|  > fa29df02a1b0b926afb2525a258172dcbf0ea460:
|  >
|  > remote:  utils/haddock => 24841386cff6fdccc11accf9daa815c2c7444d65
|  >
|  > remote:  utils/hsc2hs => 9483ad10064fbbb97ab525280623826b1ef63959
|  >
|  > remote:  OK
|  >
|  > remote: performing whitespace validations...
|  >
|  > remote: whitespace validation passed!
|  >
|  > remote: mirroring ssh://git@git.haskell.org/ghc<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit%40git.haskell.org%2Fghc&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=rjFZ%2BsHUb3i8P1jKUkgK0DxHN53KzbLkmT0thQlkTmY%3D&reserved=0> to
|  > ssh://git@github.com/ghc/ghc<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit%40github.com%2Fghc%2Fghc&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=mGJmSnFpHxnbEB4Q6BlEt9zDtr2gFAyQ%2BgtG%2FO5xGS0%3D&reserved=0> ...
|  >
|  > remote: To ssh://git@github.com/ghc/ghc<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit%40github.com%2Fghc%2Fghc&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=mGJmSnFpHxnbEB4Q6BlEt9zDtr2gFAyQ%2BgtG%2FO5xGS0%3D&reserved=0>
|  >
|  > remote:    5f332e1..fa29df0  master -> master
|  >
|  > remote: running notifier
|  >
|  > To ssh://git@git.haskell.org/ghc.git<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit%40git.haskell.org%2Fghc.git&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=qIlQCfkjQqd6uu1sAXuvb44%2FFBsDhCAlSbcr0rkJGDU%3D&reserved=0>
|  >
|  >    5f332e1..fa29df0  HEAD -> master
|  >
|  > simonpj at cam-05-unx:~/code/HEAD$
|  >
|  > I did not intend to monkey around with hsc2hs. I can’t think how
|  that
|  > happened, or whether it matter.
|  >
|  > With many apologies, would a wiser person that me like to see if
|  I’ve
|  > accidentally messed up hsc2hs.
|  >
|  > Thanks
|  >
|  > Simon
|  >
|  >
|  >
|  > From: ghc-devs [mailto:ghc-devs-bounces at haskell.org<mailto:ghc-devs-bounces at haskell.org>] On Behalf Of
|  > Simon Peyton Jones via ghc-devs
|  > Sent: 07 December 2017 17:32
|  > To: ghc-devs at haskell.org<mailto:ghc-devs at haskell.org>
|  > Subject: Can't push to haddock
|  >
|  >
|  >
|  > I’m trying to push a patch that needs a supporting change to
|  haddock.
|  >
|  > I’ve pushed the haddock change to the ghc-head branch of
|  > ssh://git@github.com/haskell/haddock.git<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit%40github.com%2Fhaskell%2Fhaddock.git&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=pFZD8Ju1mZhyxDnLAGCKPY4nHFss0bcXXB3p25z57cI%3D&reserved=0>, which is (according to
|  > ‘packages’) the relevant haddock upstream repo.
|  >
|  > But when I try to push the GHC patch, I get this message
|  >
|  > bash$ git push
|  >
|  > Counting objects: 45, done.
|  >
|  > Delta compression using up to 32 threads.
|  >
|  > Compressing objects: 100% (45/45), done.
|  >
|  > Writing objects: 100% (45/45), 27.56 KiB | 0 bytes/s, done.
|  >
|  > Total 45 (delta 43), reused 0 (delta 0)
|  >
|  > remote: performing commit message validations...
|  >
|  > remote: Commit message validation passed!
|  >
|  > remote: performing submodule-ref update validations...
|  >
|  > remote: Submodule update(s) detected in
|  > fa29df02a1b0b926afb2525a258172dcbf0ea460:
|  >
|  > remote:  utils/haddock => 24841386cff6fdccc11accf9daa815c2c7444d65
|  >
|  > remote: *FAIL* commit not found in submodule repo ('../haddock.git')
|  >
|  > remote:        or not reachable from persistent branches
|  >
|  > remote: hooklet hooks/update.secondary.d/check-submodule-refs failed
|  >
|  > remote: hooks/update.secondary died
|  >
|  > remote: error: hook declined to update refs/heads/master
|  >
|  > To ssh://git@git.haskell.org/ghc.git<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit%40git.haskell.org%2Fghc.git&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=qIlQCfkjQqd6uu1sAXuvb44%2FFBsDhCAlSbcr0rkJGDU%3D&reserved=0>
|  >
|  > ! [remote rejected] HEAD -> master (hook declined)
|  >
|  > error: failed to push some refs to
|  'ssh://git@git.haskell.org/ghc.git<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fgit%40git.haskell.org%2Fghc.git&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=qIlQCfkjQqd6uu1sAXuvb44%2FFBsDhCAlSbcr0rkJGDU%3D&reserved=0>'
|  >
|  > simonpj at cam-05-unx:~/code/HEAD$
|  >
|  >
|  >
|  > What’s up?  I  have pushed the haddock commit!
|  >
|  > THanks
|  >
|  > Simon
|  >
|  >
|  >
|  >
|  > _______________________________________________
|  > ghc-devs mailing list
|  > ghc-devs at haskell.org<mailto:ghc-devs at haskell.org>
|  >
|  https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.h
|  > askell.org<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Faskell.org&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=HkLkWG11Aw%2B07eqd55JgoOwuONiyKOJuxhjcCBOCrWQ%3D&reserved=0>%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc-
|  devs&data=02%7C01%7Csimonpj%40microsoft.com<https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2F40microsoft.com&data=02%7C01%7Csimonpj%40microsoft.com%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=S2mYWI2BbpBToDEV6glHHLGI%2BnDP3LrJ8r3bRkRzHgg%3D&reserved=0>%7C684b5c6cdac34213317708d5
|  3d9be387%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C6364826622509770
|  90&sdata=kMhG2iTALLRxhwyDw%2BzTN8VvMMn%2FqfvnSn9cPm0AK4Q%3D&reserved=0
|  >
_______________________________________________
ghc-devs mailing list
ghc-devs at haskell.org<mailto:ghc-devs at haskell.org>
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs<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%7C7e4d421589bd45f35d1308d544994ec4%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636490347611203474&sdata=i%2FezScDtUO0Fuu%2BBMtfkFB14sc%2F9fXKYXue9s8E9jr4%3D&reserved=0>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-devs/attachments/20171218/bef4122d/attachment-0001.html>


More information about the ghc-devs mailing list