Topic: Move Widelands to GitHub

Forums » Widelands Development » Coding & Scripting » Move Widelands to GitHub
hessenfarmer
Avatar
Joined: 2014-12-11, 23:16 UTC+1.0
Posts: 2844
Ranking
One Elder of Players
Location: Bavaria
Posted at: 2019-12-06, 16:40 UTC+1.0

Ok I'll make the references. How do we propose them for closing, review the proposal and close?

Top Quote
stonerl
Avatar
Joined: 2018-07-30, 00:03 UTC+2.0
Posts: 327
Ranking
Tribe Member
 Posted at: 2019-12-06, 16:50 UTC+1.0

hessenfarmer wrote:

Ok I'll make the references. How do we propose them for closing, review the proposal and close?

Maybe add them to the issue triage project if they aren't already.

Top Quote
hessenfarmer
Avatar
Joined: 2014-12-11, 23:16 UTC+1.0
Posts: 2844
Ranking
One Elder of Players
Location: Bavaria
Posted at: 2019-12-06, 16:52 UTC+1.0

What about opening a seperate issue to hunt these issues down in the discussion we could add the number of the issue to be closed together with a mention to the preferred second reviewer which should lead to a mail to the person.

Top Quote
stonerl
Avatar
Joined: 2018-07-30, 00:03 UTC+2.0
Posts: 327
Ranking
Tribe Member
 Posted at: 2019-12-06, 16:57 UTC+1.0

Sounds good. Open a separate Issue and list them like this:

[] #1234
[] #1235

They will then appear in a checklist. Ans we can add a heck to issues already closed.

Top Quote
hessenfarmer
Avatar
Joined: 2014-12-11, 23:16 UTC+1.0
Posts: 2844
Ranking
One Elder of Players
Location: Bavaria
Posted at: 2019-12-07, 14:59 UTC+1.0

Ok I started the "collect" issue yesterday. However while scrolling through the issues I discovered a big difference to what we had on launchpad, which makes bugtracking different. and we should discuss how to handle this in github.
in Launchpad we had different stai for issues from new over triaged to in progress, fix comitted and closed.
on Git we have only open and closed
so we can't apply our old strategy to set fix commited if fixed in trunk and fix released when a new release has been pushed out
Furthermore I discovered that somebody had used the "good first issue" tag on some old issues which have already been fixed partly or even in total and we kept the bug open for some reason (f.e. the fix was not satisfying in every aspect)
According to the tooltips this tag is meant different on github. It means this issue isn't complicated to solve a beginner could start with this, so our tagging is confusing.
So we need a consistent bug management strategy how to tag and how and when to close issues.
we have to take into account githubs principles in this area for this.

Top Quote
GunChleoc
Avatar
Topic Opener
Joined: 2013-10-07, 15:56 UTC+2.0
Posts: 3317
Ranking
One Elder of Players
Location: RenderedRect
Posted at: 2020-01-03, 14:24 UTC+1.0

I assigned "Good First Issue" to bugs that had "lowhangingfruit" on Launchpad, but I didn't review their contents.

For issues that get closed without changing anything, we can assign the "wontfix" label.

I think for new issues, we should stick them into the "Issue Triage" project https://github.com/widelands/widelands/projects/2 - I already used that one heavily during the issue migration.

For reviewing older issues that can be closed, let's use "Hunting down old issues" https://github.com/widelands/widelands/issues/3607

Also, when merging a pull request, we need to make sure that we assign the current milestone.

When trying to find the commit that fixed something, I find git log > log.txt helpful, which then gives me a searchable text tile.

Busy indexing nil values

Top Quote
GunChleoc
Avatar
Topic Opener
Joined: 2013-10-07, 15:56 UTC+2.0
Posts: 3317
Ranking
One Elder of Players
Location: RenderedRect
Posted at: 2020-02-07, 09:44 UTC+1.0

We are going to merge a branch soon that will automatically format all code in pull requests and on master. https://github.com/widelands/widelands/pull/3664

Make sure to remove .git/hooks/pre-commit from your local repository when we merge it, because it will stop working.

Busy indexing nil values

Top Quote
Nordfriese
Avatar
Joined: 2017-01-17, 18:07 UTC+1.0
Posts: 2170
OS: Debian Testing
Version: Latest master
Ranking
One Elder of Players
Location: 0x55555d3a34c0
Posted at: 2020-02-12, 13:37 UTC+1.0

PR formatting is working, but formatting master fails:

[master 734af13b] 'data/txts/translators_data.lua' was automatically formatted.
 1 file changed, 1 insertion(+), 1 deletion(-)
remote: error: GH006: Protected branch update failed for refs/heads/master.        
remote: error: You're not authorized to push to this branch. Visit https://help.github.com/articles/about-protected-branches/ for more information.        
To https://github.com/widelands/widelands
 ! [remote rejected]   master -> master (protected branch hook declined)
error: failed to push some refs to 'https://github.com/widelands/widelands'
##[error]Process completed with exit code 1.

(https://github.com/widelands/widelands/runs/440776537)

Apparently the master branch protection prevents the github-actions from pushing the formatting change without opening an explicit PR with travis checks and all.
Could one of the admins check whether the protection rules allow making an exception allowing github-actions to push directly to master? This is another setting that can be viewed and changed only by admins.

Edited: 2020-02-12, 13:40 UTC+1.0
Top Quote
Nordfriese
Avatar
Joined: 2017-01-17, 18:07 UTC+1.0
Posts: 2170
OS: Debian Testing
Version: Latest master
Ranking
One Elder of Players
Location: 0x55555d3a34c0
Posted at: 2020-03-13, 07:17 UTC+1.0

The launchpad mirror action is merged face-smile.png

The autogenerated website documentation and encyclopedia as well as the daily PPA should get updated again now.

Edited: 2020-03-13, 07:35 UTC+1.0
Top Quote
GunChleoc
Avatar
Topic Opener
Joined: 2013-10-07, 15:56 UTC+2.0
Posts: 3317
Ranking
One Elder of Players
Location: RenderedRect
Posted at: 2020-03-13, 19:33 UTC+1.0

Not quite - we still need to fix the Debian packaging which got messed up by the xdg changes https://github.com/widelands/widelands/issues/3770

Thanks for getting the mirror going though!

Edited: 2020-03-13, 19:34 UTC+1.0

Busy indexing nil values

Top Quote