toolchans and ubuntu 23.04 (disabled)
This commit is contained in:
@@ -85,7 +85,6 @@
|
|||||||
},
|
},
|
||||||
"Ubuntu 22.10": {
|
"Ubuntu 22.10": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"comment": "Last Ubuntu",
|
|
||||||
"codename": "kinetic",
|
"codename": "kinetic",
|
||||||
"docker_dir": "linux_desktop",
|
"docker_dir": "linux_desktop",
|
||||||
"docker_image": "ubuntu22.10",
|
"docker_image": "ubuntu22.10",
|
||||||
@@ -95,30 +94,46 @@
|
|||||||
"QT_FROM_SOURCE": false
|
"QT_FROM_SOURCE": false
|
||||||
},
|
},
|
||||||
"ppa_filters": ["ubuntu22.10"]
|
"ppa_filters": ["ubuntu22.10"]
|
||||||
|
},
|
||||||
|
"Ubuntu 23.04": {
|
||||||
|
"enabled": false,
|
||||||
|
"codename": "lunar",
|
||||||
|
"docker_dir": "linux_desktop",
|
||||||
|
"docker_image": "ubuntu23.04",
|
||||||
|
"docker_build_options": {
|
||||||
|
"image_from": "ubuntu:23.04",
|
||||||
|
"image_prepare_script": "install_apt.sh",
|
||||||
|
"QT_FROM_SOURCE": false
|
||||||
|
},
|
||||||
|
"ppa_filters": ["ubuntu23.04"]
|
||||||
},
|
},
|
||||||
"Windows x64": {
|
"Windows x64": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"docker_dir": "windows",
|
"docker_dir": "windows",
|
||||||
"docker_image": "windows",
|
"docker_image": "windows",
|
||||||
"docker_build_options": {}
|
"docker_build_options": {},
|
||||||
|
"cmake_toolchain": "/soft/toolchain-Windows.cmake"
|
||||||
},
|
},
|
||||||
"Windows x32": {
|
"Windows x32": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"docker_dir": "windows32",
|
"docker_dir": "windows32",
|
||||||
"docker_image": "windows32",
|
"docker_image": "windows32",
|
||||||
"docker_build_options": {}
|
"docker_build_options": {},
|
||||||
|
"cmake_toolchain": "/soft/toolchain-Windows32.cmake"
|
||||||
},
|
},
|
||||||
"OSX": {
|
"OSX": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"docker_dir": "osx",
|
"docker_dir": "osx",
|
||||||
"docker_image": "osx",
|
"docker_image": "osx",
|
||||||
"docker_build_options": {}
|
"docker_build_options": {},
|
||||||
|
"cmake_toolchain": "/soft/toolchain-Darwin.cmake"
|
||||||
},
|
},
|
||||||
"Raspbian 10": {
|
"Raspbian 10": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"docker_dir": "pi",
|
"docker_dir": "pi",
|
||||||
"docker_image": "pi",
|
"docker_image": "pi",
|
||||||
"docker_build_options": {}
|
"docker_build_options": {},
|
||||||
|
"cmake_toolchain": "/soft/toolchain-RPi.cmake"
|
||||||
},
|
},
|
||||||
"Android": {
|
"Android": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
@@ -126,7 +141,8 @@
|
|||||||
"docker_image": "android",
|
"docker_image": "android",
|
||||||
"docker_build_options": {
|
"docker_build_options": {
|
||||||
"QT_DOWNLOAD_SERVER": "172.17.0.1"
|
"QT_DOWNLOAD_SERVER": "172.17.0.1"
|
||||||
}
|
},
|
||||||
|
"cmake_toolchain": "/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user