Loading...
 

Git Roundtable Meeting 2019 08

Volunteering Facilitator: Bernard Sfez / Tiki Specialist

When

Meeting time and date:
Thursday, August 1st, 2019 at 14:00:00 UTC time
(click to check time zone in your location)

The time is now:


Time in your timezone (when this page was last reloaded): Friday 23 August 2019 20:11:54 CEST

The time and date was set by the participants vote below:

Date and Time Votes

Next Roundtable Meeting Time Votes

Thu 25 Jul 2019 14:00 GMT-0000Thu 01 Aug 2019 14:00 GMT-0000Thu 08 Aug 2019 14:00 GMT-0000

Where

https://live.tiki.org (back, and in HTML5 mode!)

What

See Roundtable Meetings for a detailed description.

Topic

  1. Git another step forward
    1. Documentation
      https://dev.tiki.org/Git
      https://dev.tiki.org/Git-and-SVN-combined-workflow
    2. Questions to be answered
      1. Should trunk and the main version branches (18.x, 19.x, 20.x, ...) be "unprotected" so that commits from known developers (those who passed the commit access ceremony) can be pushed there without pull/merge request at all?
      2. Should developers merge in Tiki branches / Only in their fork and wait for approval / Mix solution ?
      3. Should all developers be equal ? (trusted vs untrusted)
      4. Should all contributions be equal ? (non-risky vs risky / new feature)
      5. What about email notifications for work on Git branches?
    3. Sub-question
      1. Do we keep IRC or we move to XMPP (integration in Tiki)

Recording

  • Watch and listen to the recording of the meeting here.

Follow-Up

  • ...

put your follow up action(s) when you're done into the list above

Chat log

luciash d' being 🧙‍♂️ (luci):We cnnot make everyone maintainer
luciash d' being 🧙‍♂️ (luci):because they could remove other people?
luciash d' being 🧙‍♂️ (luci):Make everyone Developer you meant?
Bernard Sfez / Tiki Specialist (Bsfez):I'm not sure... It has to be verified (roles)
Bernard Sfez / Tiki Specialist (Bsfez):Hello Mose :)
Guest: mose:shhht, I'm sneaking and lurking
luciash d' being 🧙‍♂️ (luci):heya mose
Bernard Sfez / Tiki Specialist (Bsfez):That's true but then you are sure fixes are in the version
Bernard Sfez / Tiki Specialist (Bsfez):last
Guest: Xorti:Yes, you're right
Guest: Xorti:And that happens also in SVN at the moment. So we are complicating that!
luciash d' being 🧙‍♂️ (luci):yep, Subgit
Bernard Sfez / Tiki Specialist (Bsfez):yes ;)
Guest: Xorti:That is stoped now!
luciash d' being 🧙‍♂️ (luci):?
Guest: Xorti:Some one needs to fix it
luciash d' being 🧙‍♂️ (luci):ah
luciash d' being 🧙‍♂️ (luci):the checksum mismatch issue
Fabio Montefuscolo (montefuscolo):yes, I can't import svn commit because of this checksum
Guest: Xorti:fabio, check the email I sent to the community
Bernard Sfez / Tiki Specialist (Bsfez):https://git-scm.com/docs/git-svn
Bernard Sfez / Tiki Specialist (Bsfez):https://subgit.com/
luciash d' being 🧙‍♂️ (luci):not for us Bernard
luciash d' being 🧙‍♂️ (luci):we have an exception afaicr
luciash d' being 🧙‍♂️ (luci):or is Marc paying for it?
Bernard Sfez / Tiki Specialist (Bsfez):https://subgit.com/open-source
Guest: mose:marc loves paying for stuff
Roberto Kirschbaum (robertokir):I guess so!
Roberto Kirschbaum (robertokir):Yes Fabio that happened once
Bernard Sfez / Tiki Specialist (Bsfez):Luci went into hyperspace ? :)
Guest: Xorti:please proceed! :0
Guest: Xorti::)
Bernard Sfez / Tiki Specialist (Bsfez):https://github.com/tikiorg/tiki
Bernard Sfez / Tiki Specialist (Bsfez):That's good :)
Guest: mose:wasn't github thrown to hell?
Bernard Sfez / Tiki Specialist (Bsfez):to microsoft you mean ? :D
Guest: mose:exactly, many people moved in the last year
Guest: mose:if you make gitlab the master, I will run my tikis on master branch and produce PRs
Guest: mose:(or MR as they call it on gitlab)
Guest: Xorti:https://github.com/gitlabhq/gitlabhq
Guest: Xorti:there! :)
Guest: Xorti:Gitlab will be the master repository and GitHub and SVN (SourceForge) would be mirrors
Bernard Sfez / Tiki Specialist (Bsfez):not me :)
luciash d' being 🧙‍♂️ (luci):sorry, my laptop overheated. are you dicussing gitlab vs github now?
Guest: Xorti:I guess Developers
Guest: Xorti:no, luci. Just keep a mirror in github to be able to use with other SaaS platforms that do not integrate with GitLab and also to get more buzz
Guest: Xorti:We do need to update them!
Guest: mose:can't you update the release scripts?
luciash d' being 🧙‍♂️ (luci):i see, yup, why not... +1 for gitlab as main repo
Roberto Kirschbaum (robertokir):That sounds Great Xorti!
luciash d' being 🧙‍♂️ (luci):but i will adopt to whatever you decide guys ;)
Bernard Sfez / Tiki Specialist (Bsfez):same :)
Guest: mose:I will adopt gitlab becauyse that's what you will decide
Gary Cunningham-Lee (chibaguy):I've been happy with svn (comfortable with the workflow) but I have no problem switching to git when svn becomes read-only.
Bernard Sfez / Tiki Specialist (Bsfez):https://docs.gitlab.com/omnibus/build/
Guest: Xorti:We just need to migrate current scripts into useful pipelines
Guest: Xorti:that will be triggered when a branch or tags is created (that is also configurable)
Gary Cunningham-Lee (chibaguy):I have aftermarket theme files at Gitlab in a private repository so have a little experience so far with basics.
Roberto Kirschbaum (robertokir):I'm presently cloning Tiki into phpStorm, let's see how far I get!
Guest: Xorti:After 2y I'm still afraid to do svn commits :)
Gary Cunningham-Lee (chibaguy)::-)
Bernard Sfez / Tiki Specialist (Bsfez):oh and decide and publish a clear path for commit ! Like we have where to commit.
Bernard Sfez / Tiki Specialist (Bsfez):that is frightening ! "You are late" !
luciash d' being 🧙‍♂️ (luci):who is late?
Bernard Sfez / Tiki Specialist (Bsfez):you commit :)
Bernard Sfez / Tiki Specialist (Bsfez):your
Bernard Sfez / Tiki Specialist (Bsfez):this one Luci
luciash d' being 🧙‍♂️ (luci):you mean behind?
Bernard Sfez / Tiki Specialist (Bsfez):yes yes :)
luciash d' being 🧙‍♂️ (luci):just do rebase with the upstream
Bernard Sfez / Tiki Specialist (Bsfez):https://about.gitlab.com/2015/12/22/gitlab-8-3-released/
Bernard Sfez / Tiki Specialist (Bsfez):it failed so...
Bernard Sfez / Tiki Specialist (Bsfez):oh it worked this time
luciash d' being 🧙‍♂️ (luci):How to rebase: https://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository/7244456#7244456
luciash d' being 🧙‍♂️ (luci):Be: but you say it worked for you another way, all right then :)
Bernard Sfez / Tiki Specialist (Bsfez):On gitlab (my sharedscreen) you have a rebase button, it failed the other day
luciash d' being 🧙‍♂️ (luci):ah, ok
Bernard Sfez / Tiki Specialist (Bsfez):now I'm waiting for the pipeline to complete
luciash d' being 🧙‍♂️ (luci):button way :)
Bernard Sfez / Tiki Specialist (Bsfez):well we use gitlab :)
Jonny Bradley (jonnybradley):https://dev.tiki.org/Git-Usage
luciash d' being 🧙‍♂️ (luci):gitlab is not only the UI at gitlab.com
Guest: Xorti:https://about.gitlab.com/solutions/open-source/program/
Guest: Xorti:How to apply OSS
Guest: Xorti:ok!
Guest: Xorti:(BRB)
Bernard Sfez / Tiki Specialist (Bsfez):this is the doc :D
luciash d' being 🧙‍♂️ (luci):btw, problem with shallow clone is that you cannot switch to another branch later easily (that is where jean-marc struggled the other day complaining his checkout command to switch branch as suggested in the Git workflow page returns error)
Gary Cunningham-Lee (chibaguy):I've got to go now - I'll check the recording later. Thanks, all.
Bernard Sfez / Tiki Specialist (Bsfez):bye Gary
luciash d' being 🧙‍♂️ (luci):just noticed in the recording of the last meeting
luciash d' being 🧙‍♂️ (luci):bb gary
Bernard Sfez / Tiki Specialist (Bsfez):I have a question about working practically on different branches
Bernard Sfez / Tiki Specialist (Bsfez):technical
Bernard Sfez / Tiki Specialist (Bsfez):Fabio you'll 10mn after that ? (everyone is welcomed)
Jonny Bradley (jonnybradley):https://tiki.org/Roundtable-Meeting-2019-08
luciash d' being 🧙‍♂️ (luci):adding 14 UTC will mess the convene a bit I suppose
Bernard Sfez / Tiki Specialist (Bsfez):lol
luciash d' being 🧙‍♂️ (luci):(we will fix later manually)
luciash d' being 🧙‍♂️ (luci):(again)
luciash d' being 🧙‍♂️ (luci)::)
Roberto Kirschbaum (robertokir):I have to go too, bye guys!
luciash d' being 🧙‍♂️ (luci)::D
Guest: mose:(gotta go, but you will hear from me more soon I think)
luciash d' being 🧙‍♂️ (luci):cool, c ya mose
luciash d' being 🧙‍♂️ (luci):still cooling
luciash d' being 🧙‍♂️ (luci)::D
luciash d' being 🧙‍♂️ (luci):I am on desktop now
luciash d' being 🧙‍♂️ (luci):thanks all

Pages related to this one

One page links to Git Roundtable Meeting 2019 08

Why Register?

Register at tiki.org and you'll be able to use the account at any *.tiki.org site, thanks to the InterTiki feature. A valid email address is required to receive site notifications and occasional newsletters. You can opt out of these items at any time.