From 8d93ea342410bcd8ed328970f70f5ce820cf8b53 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 20 Apr 2023 11:33:19 +0300 Subject: [PATCH] almost works --- platforms.json | 71 +++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/platforms.json b/platforms.json index 898fc78..cd5ac35 100644 --- a/platforms.json +++ b/platforms.json @@ -6,10 +6,10 @@ "docker_dir": "linux_desktop", "docker_image": "debian", "docker_build_options": { - "image_from": "debian:buster-slim", - "image_prepare_script": "install_apt.sh" + "image_from": "debian:buster-slim", + "image_prepare_script": "install_apt.sh" }, - "ppa_filters": ["raspbian10"] + "ppa_filters": ["debian10", "raspbian10"] }, "Debian 11": { "enabled": true, @@ -17,10 +17,11 @@ "docker_dir": "linux_desktop", "docker_image": "debian11", "docker_build_options": { - "image_from": "debian:bullseye-slim", - "image_prepare_script": "install_apt.sh", - "QT_FROM_SOURCE": false - } + "image_from": "debian:bullseye-slim", + "image_prepare_script": "install_apt.sh", + "QT_FROM_SOURCE": false + }, + "ppa_filters": ["debian11"] }, "Debian 12": { "enabled": false, @@ -28,10 +29,11 @@ "docker_dir": "linux_desktop", "docker_image": "debian12", "docker_build_options": { - "image_from": "debian:bookworm-slim", - "image_prepare_script": "install_apt.sh", - "QT_FROM_SOURCE": false - } + "image_from": "debian:bookworm-slim", + "image_prepare_script": "install_apt.sh", + "QT_FROM_SOURCE": false + }, + "ppa_filters": ["debian12"] }, "Debian 13": { "enabled": false, @@ -39,10 +41,11 @@ "docker_dir": "linux_desktop", "docker_image": "debian13", "docker_build_options": { - "image_from": "debian:trixie-slim", - "image_prepare_script": "install_apt.sh", - "QT_FROM_SOURCE": false - } + "image_from": "debian:trixie-slim", + "image_prepare_script": "install_apt.sh", + "QT_FROM_SOURCE": false + }, + "ppa_filters": ["debian13"] }, "Ubuntu 20.04": { "enabled": true, @@ -51,9 +54,10 @@ "docker_image": "ubuntu", "docker_from": "ubuntu:20.04", "docker_build_options": { - "image_from": "ubuntu:20.04", - "image_prepare_script": "install_apt.sh", - } + "image_from": "ubuntu:20.04", + "image_prepare_script": "install_apt.sh" + }, + "ppa_filters": ["ubuntu20.04"] }, "Ubuntu 22.04": { "enabled": true, @@ -61,10 +65,11 @@ "docker_dir": "linux_desktop", "docker_image": "ubuntu22.04", "docker_build_options": { - "image_from": "ubuntu:22.04", - "image_prepare_script": "install_apt.sh", - "QT_FROM_SOURCE": false - } + "image_from": "ubuntu:22.04", + "image_prepare_script": "install_apt.sh", + "QT_FROM_SOURCE": false + }, + "ppa_filters": ["ubuntu22.04"] }, "Ubuntu 24.04": { "enabled": false, @@ -72,10 +77,11 @@ "docker_dir": "linux_desktop", "docker_image": "ubuntu24.04", "docker_build_options": { - "image_from": "ubuntu:24.04", - "image_prepare_script": "install_apt.sh", - "QT_FROM_SOURCE": false - } + "image_from": "ubuntu:24.04", + "image_prepare_script": "install_apt.sh", + "QT_FROM_SOURCE": false + }, + "ppa_filters": ["ubuntu24.04"] }, "Ubuntu 22.10": { "enabled": true, @@ -84,10 +90,11 @@ "docker_dir": "linux_desktop", "docker_image": "ubuntu22.10", "docker_build_options": { - "image_from": "ubuntu:22.10", - "image_prepare_script": "install_apt.sh", - "QT_FROM_SOURCE": false - } + "image_from": "ubuntu:22.10", + "image_prepare_script": "install_apt.sh", + "QT_FROM_SOURCE": false + }, + "ppa_filters": ["ubuntu22.10"] }, "Windows x64": { "enabled": true, @@ -107,7 +114,7 @@ "docker_image": "osx", "docker_build_options": {} }, - "Raspbian": { + "Raspbian 10": { "enabled": true, "docker_dir": "pi", "docker_image": "pi", @@ -118,7 +125,7 @@ "docker_dir": "android", "docker_image": "android", "docker_build_options": { - "QT_DOWNLOAD_SERVER": "172.17.0.1" + "QT_DOWNLOAD_SERVER": "172.17.0.1" } } }