Topic: Move Widelands to GitHub

Very nice, thanks!

Unfortunately it didn't work yet, starting Widelands not working:

"Caught exception (of type '13ImageNotFound') in outermost handler! The exception said: [/build/widelands-F_NG84/widelands-20-ppa0-bzr9213/src/graphic/image_io.h:34] Image not found: images/logos/wl-ico-128.png

This should not happen. Please file a bug report on version bzr9213-202003151758(Release)."

Wanted to save the world, then I got widetracked

Top

Quote

GunChleoc wrote:

Thanks for reporting. Should be fixed now - new builds will be ready in 1-2 hours.

You're welcome

It works! Excellent!

Wanted to save the world, then I got widetracked

Top

Quote

I've been thinking a bit about our automated code quality checks on travis. When there are many PRs open it can take many many hours until one's latest commit finally starts running on travis, only to see it fail due to some annoying typo in an RST or something like that, and then it takes again many many hours until the typo-fixing commit starts being built, and so on.
So I have considered moving the tests of the first build stage to another github action. (Such an action could be made required for PRs like the travis build, so this would still be enforced for merging.) I have a functional branch here: https://github.com/Noordfrees/widelands/pull/4

Unfortunately this does not integrate with the formatting action. GitHub says

When you use the repository's GITHUB_TOKEN to perform tasks on behalf of the GitHub Actions app, events triggered by the GITHUB_TOKEN will not create a new workflow run. This prevents you from accidentally creating recursive workflow runs. For example, if a workflow run pushes code using the repository's GITHUB_TOKEN, a new workflow will not run even when the repository contains a workflow configured to run when push events occur. For more information, see "Authenticating with the GITHUB_TOKEN."

If you would like to trigger a workflow from a workflow run, you can trigger the event using a personal access token. You'll need to create a personal access token and store it as a secret in your repository.

https://help.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token

GitHub recommends creating a personal access token (PAT) as a secret for the action to use. For branches in the base repo (e.g. PRs from widelands:branchname to widelands:master) we could simply use bunnybot's PAT. But for branches in forks (username:branchname to widelands:master) this would make it necessary for all devs to create a PAT with write access and add it as a secret to their fork to allow our actions to use it, which probably not everybody would like.
(In the absence of such a token we could fallback to GITHUB_TOKEN of course so the formatting will work anyway, but then the checksuite wouldn't run on the formatting bot's commit.)

Opinions?

Top

Quote

I have still trouble with git. I can't keep my repo updated with the latest changes.

What i have is:

$> git remote -v
Nordfrees       https://github.com/Noordfrees/widelands.git (fetch)
Nordfrees       https://github.com/Noordfrees/widelands.git (push)
origin  https://github.com/frankystone/widelands.git (fetch)
origin  https://github.com/frankystone/widelands.git (push)
upstream        https://github.com/widelands/widelands.git (fetch)
upstream        https://github.com/widelands/widelands.git (push)

and

$> git branch -vv
* master              cbfb8f84e [origin/master] Fetched translations and updated catalogs.
  shipping-tweaks-b21 5d8cc1884 [Nordfrees/shipping-tweaks-b21] 2 files were automatically formatted.

now i want to get origin to be in sync with upstream. According to the wikipage it should be this way (at least how i understand it):

$> git pull upstream master
From https://github.com/widelands/widelands
 * branch                master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

as you can see this is failing. I have also tried git pull --rebase upstream master, but this results in a lot of merge conflicts.

Any ideas?

Top

Quote

Nordfriese wrote:

Normally that should work. If it doesn't, your master history seems to be messed up somehow.

I have set up my local repo many times in the past, but the result was always the same...

What I would try in this case is to delete the local master and fetch it newly: ~~~~ git checkout shipping-tweaks-b21 # get away from master git branch -D master # delete local master git fetch upstream git checkout upstream/master # set HEAD to remote master git checkout -b master # turn HEAD into a local branch again git push --force origin master # get your fork back in sync ~~~~

All fine up to the last command:

$> git push --force origin master
Username for 'https://github.com': 
Password for 'https://frankystone@github.com': 
Gesamt 0 (Delta 0), Wiederverwendet 0 (Delta 0), Pack wiederverwendet 0
To https://github.com/frankystone/widelands.git
 ! [remote rejected]       master -> master (shallow update not allowed)
error: Fehler beim Versenden einiger Referenzen nach 'https://github.com/frankystone/widelands.git'

i hate it... but maybe i am too stupid for git.

Top

Quote