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.

Sign up for GitHub

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

Jump to bottom

Flatpak & CI improvements #55

Merged
merged 8 commits into from Nov 9, 2021
Merged

Flatpak & CI improvements #55

merged 8 commits into from Nov 9, 2021

Conversation

GeorgesStavracas
Copy link
Member

@GeorgesStavracas GeorgesStavracas commented Nov 8, 2021 •
edited

Generate Flatpak bundles for all manifests we have in-tree.

Cleanup and increment the builds to include:

  • Ubuntu 20.04
  • Ubuntu 21.10
  • Fedora 35

@GeorgesStavracas GeorgesStavracas force-pushed the gbsneto/ci-stuff branch 3 times, most recently from 53bef67 to 86931ad Compare November 8, 2021 20:31
@GeorgesStavracas GeorgesStavracas mentioned this pull request Nov 8, 2021
Merged
@GeorgesStavracas
Copy link
Member Author

I'm not ecstatic about fighting Ubuntu 18.04 to check for the different backends, but at least all backends are compiled by the Flatpak jobs.

@TingPing
Copy link
Member

TingPing commented Nov 8, 2021 •
edited

I'm not ecstatic about fighting Ubuntu 18.04 to check for the different backends

I'm totally ok with adding newer Ubuntu, on top of that one, there.

runs-on: ubuntu-latest
container: ubuntu:21.10

For example. (Note the apt commands won't need sudo and set DEBIAN_FRONTEND: noninteractive, see https://github.com/flatpak/xdg-desktop-portal/blob/master/.github/workflows/check.yml)

@GeorgesStavracas GeorgesStavracas force-pushed the gbsneto/ci-stuff branch 2 times, most recently from 35aca14 to 0cf3dba Compare November 8, 2021 20:54
@TingPing
Copy link
Member

TingPing commented Nov 8, 2021

Note that 21.04 and 21.10 have GTK4 while 20.04 doesn't.

@GeorgesStavracas GeorgesStavracas force-pushed the gbsneto/ci-stuff branch 5 times, most recently from 0217ee1 to 7b54325 Compare November 8, 2021 22:00
@GeorgesStavracas
build-aux: Specify manifests relative to current directory
dc6cdbe 
This is a common practice when dealing with in-tree manifests. We want
flatpak-builder to build the current checkout, instead of pulling from
the master branch.
@GeorgesStavracas
ci: Build Flatpak bundles
baca31a 
Build all available Flatpak manifests (for GTK3, GTK4, and Qt5), and
generate bundles.
@GeorgesStavracas
ci: Set DEBIAN_FRONTEND env var to 'noninteractive'
e4510ea 
This is a safer approach since it prevents apt from getting stuck
waiting for human input on a CI environment.
@GeorgesStavracas
ci: Cleanup Ubuntu 18.04 job
acbd6a8 
Fix indentation. Set a pretty name.
@GeorgesStavracas
ci: Build GTK3 backend
01a68b5 
Build it both on Ubuntu 18.04 and 20.04
@GeorgesStavracas
ci: Add Ubuntu 20.04 job
2dcfab6
@GeorgesStavracas
ci: Add Ubuntu 21.10 job
94ad7f4
@GeorgesStavracas GeorgesStavracas changed the title Draft: Flatpak CI Flatpak & CI improvements Nov 8, 2021
@GeorgesStavracas GeorgesStavracas force-pushed the gbsneto/ci-stuff branch 5 times, most recently from 3caf93e to d0a6388 Compare November 9, 2021 00:20
@GeorgesStavracas GeorgesStavracas marked this pull request as ready for review November 9, 2021 00:26
@GeorgesStavracas
Copy link
Member Author

This is roughly the limit I'm comfortable growing the build.yml file. If we want more distros, it might be better to switch to an OS matrix or any other fancy technique.

TingPing
TingPing approved these changes Nov 9, 2021
View reviewed changes
Copy link
Member

@TingPing TingPing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@TingPing
Copy link
Member

TingPing commented Nov 9, 2021

Whats the plan for building the qt backend?

@GeorgesStavracas
Copy link
Member Author

Whats the plan for building the qt backend?

I'm not touching anything Qt-related anymore until @grulja lands the improved libportal-qt5 with more API coverage, etc.

@GeorgesStavracas GeorgesStavracas merged commit dd52b4d into flatpak:master Nov 9, 2021
@GeorgesStavracas GeorgesStavracas deleted the gbsneto/ci-stuff branch November 9, 2021 01:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TingPing TingPing TingPing approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@GeorgesStavracas @TingPing