Replace Mercurial code with Git code #19
Conversation
|
I have added a few commits authored by glx22. It's about a few bugfixes in the Makefile. Also, GitHub Actions support will be added. Note that the PR as a whole is NOT mergable yet, the merge of #14 is still a precondition for this. |
|
Alright, I have updated and rebased this PR to include the changes of previous PRs. However, I noticed a problem: OpenSFX no longer shows up in the menu when I copied the files to |
|
Alright, I figured out the cause of the problem. The |
Co-authored by: glx22 <glx@openttd.org> Co-authored by: Owen Rudge <owen@owenrudge.net>
|
So, this took a bit longer than expected... needed to implement a few fixes:
I've cleaned up the commit history a bit, and personally I'm now happy with what's here. Would like a second opinion from another developer if one is available though. |
|
Basically the release workflow was just a copy/paste from opengfx, with only dependencies corrected. So it was expected to not work ;) |
|
Thank you for reviewing and working this. I don't know how I could continue my further here. Do you want to take over from now? |
|
@glx22 It was pretty close, to be fair. :) Would you mind reviewing the PR, or at least my changes to it? |
.github/workflows/publish.yml
Outdated
| # Move bundles in their own folder | ||
| mkdir bundles | ||
| mv opensfx-${{ steps.vars.outputs.version }}-source.tar.xz bundles/ | ||
| mv opensfx-${{ steps.vars.outputs.version }}.zip bundles/opensfx-${{ steps.vars.outputs.version }}-all.zip |
There was a problem hiding this comment.
Maybe it would be better to fix Makefile to add "-all"
I guess it should be Makefile:352
.github/workflows/publish.yml
Outdated
| with: | ||
| token: ${{ secrets.DEPLOYMENT_TOKEN }} | ||
| repository: OpenTTD/workflows | ||
| event-type: update_cdn |
There was a problem hiding this comment.
Issue spotted in OpenGFX, and as I copied the workflow :)
| event-type: update_cdn | |
| event-type: update-cdn |
.github/workflows/publish.yml
Outdated
| # Move bundles in their own folder | ||
| mkdir bundles | ||
| mv opensfx-${{ steps.vars.outputs.version }}-source.tar.xz bundles/ | ||
| mv opensfx-${{ steps.vars.outputs.version }}-all.zip bundles/opensfx-${{ steps.vars.outputs.version }}-all.zip |
There was a problem hiding this comment.
| mv opensfx-${{ steps.vars.outputs.version }}-all.zip bundles/opensfx-${{ steps.vars.outputs.version }}-all.zip | |
| mv opensfx-${{ steps.vars.outputs.version }}-all.zip bundles/ |
There was a problem hiding this comment.
Ah yes, that would be more straightforward!
PREVIEW PR! DO NOT MERGE BEFORE #13 AND #14!
This fixes #10. I have checked the Makefiles and scripts and replaced all legacy uses of
hgcommands (that no longer work) with equivalengitcommands. I also replaced.hgignorewith.gitignore.This PR is only a preview, I will probably need to do some minor changes after #13 and #14 got merged. The scripting changes will likely stay the same, however.