New Workflow
This discussion is connected to the gimp-web-list.gnome.org mailing list which is provided by the GIMP developers and not related to gimpusers.com.
This is a read-only list on gimpusers.com so this discussion thread is read-only, too.
| New Workflow | Pat David | 16 Jul 21:32 |
| New Workflow | Michael Schumacher | 17 Jul 01:33 |
| New Workflow | scl | 17 Jul 03:01 |
| New Workflow | Michael Schumacher | 17 Jul 06:32 |
| New Workflow | Pat David | 17 Jul 14:21 |
New Workflow
Hi all!
So, should we be pushing changes to wgo into "Testing" now (I believe that should be correct)? Also, do the changes pushed into testing get pushed into master at some point? How is this triggered at the moment?
I'm getting ready to start updating a few more tutorials, but want to make sure I'm pushing the changes to the right place...
pat david http://blog.patdavid.net
New Workflow
On 16.07.2014 23:32, Pat David wrote:
Hi all!
So, should we be pushing changes to wgo into "Testing" now (I believe that should be correct)? Also, do the changes pushed into testing get pushed into master at some point? How is this triggered at the moment?
I'm getting ready to start updating a few more tutorials, but want to make sure I'm pushing the changes to the right place...
The point of the testing branch - built automatically to http://testing.gimp.org every five minutes - is to be able to view changes online and fast and not touch the production environment, that is http://www.gimp.org
There aren't many rules and processes around this (more and more people almost seem to insist that we add rules and processes around each and every aspect of the GIMP project).
So this is really just to address the challenges of "I want to see my change without having a full gimp-web build setup locally" and "what happens if I change this, will it break www.gimp.org?".
As such. moving any change from the testing branch to the master branch - built to http://www.gimp.org every 15 minutes - is just a merge from the testing to the master branch.
See http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merging for the principle for merging branches in Git.
We haven't got any procedures in place to decide whether some content should be in www.gimp.org or not.
Regards, Michael GPG: 96A8 B38A 728A 577D 724D 60E5 F855 53EC B36D 4CDD
New Workflow
Hi,
On 17.7.2014 at 3:33 AM Michael Schumacher wrote:
The point of the testing branch - built automatically to http://testing.gimp.org every five minutes - is to be able to view changes online and fast and not touch the production environment, that is http://www.gimp.org
[..]
So this is really just to address the challenges of "I want to see my change without having a full gimp-web build setup locally" and "what happens if I change this, will it break www.gimp.org?".
A good idea.
As such. moving any change from the testing branch to the master branch - built to http://www.gimp.org every 15 minutes - is just a merge from the testing to the master branch.
However, something is failing here. Three days ago I pushed a correction to the testing branch. They and Pats commit 10 hours ago are not in the master branch yet.
Kind regards,
Sven
New Workflow
On July 17, 2014 5:01:21 AM CEST, scl wrote:
However, something is failing here. Three days ago I pushed a correction
to the testing branch. They and Pats commit 10 hours ago are not in the master branch yet.
There is no recent merge in the gimp-web master branch log, so I guess either neither of you did a merge, or you didn't push the resulting changes.
Ed has done this a few times in May, and IIRC it has worked back then. If it doesn't, the problem may be in GNOME Git itself.
Regards, Michael
New Workflow
Ah, that's the trick. Just need to merge to master from testing. (Which I will now go and learn more about before I break something). I was just wanting to make sure someone was able to check what I was doing before merging my changes to master. If you trust me to do it, I have no problem doing it myself (or of trying my best to stay on top of other new submissions as they come, and merging them if they look fine).
I'm off to test this by merging my small test change. If it works, I'll merge sven's change as well.
Thanks, Michael! :)
On Thu, Jul 17, 2014 at 1:32 AM, Michael Schumacher wrote:
On July 17, 2014 5:01:21 AM CEST, scl wrote:
However, something is failing here. Three days ago I pushed a correction
to the testing branch. They and Pats commit 10 hours ago are not in the master branch yet.There is no recent merge in the gimp-web master branch log, so I guess either neither of you did a merge, or you didn't push the resulting changes.
Ed has done this a few times in May, and IIRC it has worked back then. If it doesn't, the problem may be in GNOME Git itself. --
Regards,
Michael
_______________________________________________ gimp-web-list mailing list
gimp-web-list@gnome.org
https://mail.gnome.org/mailman/listinfo/gimp-web-list
pat david http://blog.patdavid.net
