Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flatpak support #4383

Merged
merged 15 commits into from Nov 8, 2018

Conversation

Projects
None yet
4 participants
@bscubed
Copy link
Contributor

bscubed commented Oct 28, 2018

Adds Flatpak build capabilities to Travis-CI, bringing cross-platform support to all Linux distributions.


This change is Reviewable

bscubed added some commits Oct 28, 2018

.travis.yml Outdated
@@ -61,6 +61,16 @@ matrix:
script: "./.travis/linux-mingw/build.sh"
after_success: "./.travis/linux-mingw/upload.sh"
cache: ccache
- if: repo =~ ^.*\/(citra-canary|citra-nightly)$

This comment has been minimized.

Copy link
@j-selby

j-selby Oct 28, 2018

Contributor

Is there a reason we aren't testing this on the main repo, and just not deploying? i.e if a PR generates a regression in flatpak, that won't get caught until canary/merge.

This comment has been minimized.

Copy link
@bscubed

bscubed Oct 28, 2018

Author Contributor

Ultimately, we're only gonna be deploying on Nightly/Canary anyways, and there's only really one major point of conflict in the build, so as long as nothing changes one specific line of code in the base CMakeList.txt everything should be fine.

Show resolved Hide resolved .travis/linux-flatpak/docker.sh Outdated

bscubed added some commits Oct 28, 2018

@wwylele

wwylele approved these changes Nov 8, 2018

@wwylele wwylele merged commit 81cbc3f into citra-emu:master Nov 8, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.