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

Rebase 2.3.3 #19

Merged
merged 14 commits into from
Aug 31, 2023
Merged

Rebase 2.3.3 #19

merged 14 commits into from
Aug 31, 2023

Conversation

dylanmccall
Copy link
Contributor

Closes #18

dylanmccall and others added 14 commits August 28, 2023 15:00
Instead of these options always using a `KOLIBRI_APP_` or
`KOLIBRI_DEVEL_APP_` prefix based on the build profile, we will generate
a prefix at build time. This will allow different build configurations
to use different prefixes without needing to modify Python code.
Improve app environment variable prefixes
`Gdk` is no longer used and python statements don't require semicolons.
This makes sure the linting is run for pull requests and builds the
flatpak as a bundle. That will make testing much easier prior to its
existence on Flathub.
In `KolibriDaemonManager.__kolibri_api_call_async`, we were incorrectly
calling `Soup.Message.set_request_body`. This function no longer exists
in Soup 3.0. Instead, we should use `set_request_body_from_bytes`.

learningequality/kolibri-installer-gnome#92
Make the development flatpak build as org.endlessos.Key.Devel.

Including modification
- ("Add github workflow to lint and build flatpak bundle")
  from Dan Nicholson

Fixes: #7
Copy link
Member

@dbnicholson dbnicholson left a comment

Choose a reason for hiding this comment

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

This is messy, but it looks like the merge will work out correctly.

@dbnicholson dbnicholson merged commit 0f5d518 into main Aug 31, 2023
2 checks passed
@dbnicholson dbnicholson deleted the rebase-2.3.3 branch August 31, 2023 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rebase on upstream v2.3.3
3 participants