almost works

This commit is contained in:
2023-04-20 11:33:19 +03:00
parent 9c68e310f6
commit 8d93ea3424

View File

@@ -9,7 +9,7 @@
"image_from": "debian:buster-slim", "image_from": "debian:buster-slim",
"image_prepare_script": "install_apt.sh" "image_prepare_script": "install_apt.sh"
}, },
"ppa_filters": ["raspbian10"] "ppa_filters": ["debian10", "raspbian10"]
}, },
"Debian 11": { "Debian 11": {
"enabled": true, "enabled": true,
@@ -20,7 +20,8 @@
"image_from": "debian:bullseye-slim", "image_from": "debian:bullseye-slim",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["debian11"]
}, },
"Debian 12": { "Debian 12": {
"enabled": false, "enabled": false,
@@ -31,7 +32,8 @@
"image_from": "debian:bookworm-slim", "image_from": "debian:bookworm-slim",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["debian12"]
}, },
"Debian 13": { "Debian 13": {
"enabled": false, "enabled": false,
@@ -42,7 +44,8 @@
"image_from": "debian:trixie-slim", "image_from": "debian:trixie-slim",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["debian13"]
}, },
"Ubuntu 20.04": { "Ubuntu 20.04": {
"enabled": true, "enabled": true,
@@ -52,8 +55,9 @@
"docker_from": "ubuntu:20.04", "docker_from": "ubuntu:20.04",
"docker_build_options": { "docker_build_options": {
"image_from": "ubuntu:20.04", "image_from": "ubuntu:20.04",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh"
} },
"ppa_filters": ["ubuntu20.04"]
}, },
"Ubuntu 22.04": { "Ubuntu 22.04": {
"enabled": true, "enabled": true,
@@ -64,7 +68,8 @@
"image_from": "ubuntu:22.04", "image_from": "ubuntu:22.04",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["ubuntu22.04"]
}, },
"Ubuntu 24.04": { "Ubuntu 24.04": {
"enabled": false, "enabled": false,
@@ -75,7 +80,8 @@
"image_from": "ubuntu:24.04", "image_from": "ubuntu:24.04",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["ubuntu24.04"]
}, },
"Ubuntu 22.10": { "Ubuntu 22.10": {
"enabled": true, "enabled": true,
@@ -87,7 +93,8 @@
"image_from": "ubuntu:22.10", "image_from": "ubuntu:22.10",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["ubuntu22.10"]
}, },
"Windows x64": { "Windows x64": {
"enabled": true, "enabled": true,
@@ -107,7 +114,7 @@
"docker_image": "osx", "docker_image": "osx",
"docker_build_options": {} "docker_build_options": {}
}, },
"Raspbian": { "Raspbian 10": {
"enabled": true, "enabled": true,
"docker_dir": "pi", "docker_dir": "pi",
"docker_image": "pi", "docker_image": "pi",