From bc12cb4949d593b41f8594caa81b05e71f3bae03 Mon Sep 17 00:00:00 2001 From: Michael Bonani Date: Tue, 24 Nov 2020 13:41:41 +0100 Subject: [PATCH 1/3] pass to sdk 5.15 --- flatpak/org.mobsya.ThymioSuite.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/org.mobsya.ThymioSuite.json b/flatpak/org.mobsya.ThymioSuite.json index d50c43700..9ddeb2515 100644 --- a/flatpak/org.mobsya.ThymioSuite.json +++ b/flatpak/org.mobsya.ThymioSuite.json @@ -2,7 +2,7 @@ "app-id": "org.mobsya.ThymioSuite", "runtime": "org.kde.Platform", "sdk": "org.kde.Sdk", - "runtime-version": "5.12", + "runtime-version": "5.15", "finish-args": [ "--socket=x11", "--socket=wayland", From 10bbfd78d18155cd812a7bae4bac235fc9bc164d Mon Sep 17 00:00:00 2001 From: Michael Bonani Date: Tue, 1 Dec 2020 17:51:49 +0100 Subject: [PATCH 2/3] fix webengine --- flatpak/org.mobsya.ThymioSuite.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flatpak/org.mobsya.ThymioSuite.json b/flatpak/org.mobsya.ThymioSuite.json index 9ddeb2515..5d29eae3d 100644 --- a/flatpak/org.mobsya.ThymioSuite.json +++ b/flatpak/org.mobsya.ThymioSuite.json @@ -1,6 +1,8 @@ { "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.15", "finish-args": [ From 7083ec2d43e0eda682912281d3843db03e75c056 Mon Sep 17 00:00:00 2001 From: Michael Bonani Date: Tue, 14 Dec 2021 22:03:37 +0100 Subject: [PATCH 3/3] use 20.04 agent --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 17b9d9595..7c24796fc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -45,7 +45,7 @@ parameters: jobs: - job: 'BuildFlatpak' pool: - vmImage: 'Ubuntu-18.04' + vmImage: 'Ubuntu-20.04' container: fpkde steps: - script: |