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

pass to sdk 5.15 #882

Merged
merged 11 commits into from
Dec 14, 2021
Merged

pass to sdk 5.15 #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc12cb4
pass to sdk 5.15
Nov 24, 2020
66b96d8
Merge branch 'master' into flatpak-qt5.15
Dec 1, 2020
10bbfd7
fix webengine
Dec 1, 2020
4fe7326
Merge branch 'flatpak-qt5.15' of https://github.com/mbonani/aseba-1 i…
Dec 1, 2020
4f803c7
Merge branch 'master' into flatpak-qt5.15
Jun 10, 2021
a20d814
Merge branch 'master' into flatpak-qt5.15
Jul 28, 2021
fc3c557
Merge branch 'master' into flatpak-qt5.15
Aug 16, 2021
7141cc3
Merge branch 'master' into flatpak-qt5.15
Nov 25, 2021
66dd8f1
Merge branch 'master' into flatpak-qt5.15
Dec 6, 2021
f2e7531
Merge branch 'master' of https://github.com/mobsya/aseba into flatpak…
Dec 14, 2021
7083ec2
use 20.04 agent
Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ parameters:
jobs:
- job: 'BuildFlatpak'
pool:
vmImage: 'Ubuntu-18.04'
vmImage: 'Ubuntu-20.04'
container: fpkde
steps:
- script: |
Expand Down
4 changes: 3 additions & 1 deletion flatpak/org.mobsya.ThymioSuite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"app-id": "org.mobsya.ThymioSuite",
"runtime": "org.kde.Platform",
"base": "io.qt.qtwebengine.BaseApp",
"base-version": "5.15",
"sdk": "org.kde.Sdk",
"runtime-version": "5.12",
"runtime-version": "5.15",
"finish-args": [
"--socket=x11",
"--socket=wayland",
Expand Down