Closed probonopd closed 5 years ago
Argh, why are there changes all over the place now? Should I have sent the PR against another branch?
Was this after merging changes from master? I don't think I did anything super drastic, I'd have expected it to merge cleanly. master is the branch under active development, which I've been working on a lot. release is the "stable" branch. It would be nice to have it on master though, since I tend to go maybe too long between releases.
I am not a git wizard, not sure what I did wrong.
I lean a lot on my git cheat sheet that I've slowly accumulated..
Those files definitely look like older versions. To merge from Laidout's original master, to make sure your branch is up to date before a pull request, according to my cheat sheet, it goes like this:
git remote add LaidoutUpstream https://github.com/Laidout/laidout
git fetch LaidoutUpstream
git pull --rebase LaidoutUpstream master
At this point, if all is well your forked repo should be up to date with the Laidout master branch, and the pull request shouldn't complain. At least not about the same things.
If something goes wrong, is it just the .travis.yml and AppRun files that are new? I can add those manually I suppose. In general I wouldn't want packaging specific files randomly laying around in the top level directory, they would get their own subdirectory where I can put a packaging specific readme with it, but if it's just AppRun and one hidden dot file, I could live with that.
If something goes wrong, is it just the .travis.yml and AppRun files that are new? I can add those manually I suppose. In general I wouldn't want packaging specific files randomly laying around in the top level directory, they would get their own subdirectory where I can put a packaging specific readme with it, but if it's just AppRun and one hidden dot file, I could live with that.
Yes, I think this may be the easiest route.
Ok, added files manually and finally had some time to learn travis a little. The build seems to be working! Let me know if you spot anything off! Thanks for your work on this. I'd like to announce on Laidout's website and add you to Laidout's contributor list if that's ok. Is "probonopd" sufficient, or should I use your name? Feel free to email if you have special concerns about attribution.
This PR, when merged, will compile this application on Travis CI upon each
git push
, and upload an AppImage to your GitHub Releases page.Providing an AppImage would have, among others, these advantages:
appimaged
--appimage-extract
parameterHere is an overview of projects that are already distributing upstream-provided, official AppImages.
PLEASE NOTE: For this to work, you need to set up
GITHUB_TOKEN
in Travis CI for this to work; please see https://github.com/probonopd/uploadtool.If you have questions, AppImage developers are on #AppImage on irc.freenode.net.