aboutsummaryrefslogtreecommitdiffstats
path: root/docker/bionic
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade linux images to Ubuntu 20.04Ivan Komissarov2020-09-143-315/+0
| | | | | Change-Id: I4dcfbe846f7847874908ed8ad84ac615a5a739c1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: Install additional dependencies in the imagesIvan Komissarov2020-08-311-0/+1
| | | | | | | | To be able to run Qbs with sanitizer Change-Id: Ia098a419a001ebbea039281ff20ccbc11198226a Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Initial CMake portIvan Komissarov2020-08-171-0/+2
| | | | | | | | | | | | | | | | | | | This change allows to build Qbs using CMake build tool Tested platforms - Linux (gcc) - macOS (clang) - Windows (msvc2017) Missing features (compared to Qbs build) - Documentation build - Bundled QtScript support - Static build - .pc file for qbscore - qbs module for qbscore Change-Id: I09b5dadd6723d5a47e5ef2a9a38d3300488718f2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* travis: install cap'n'proto packages in Bionic imageIvan Komissarov2020-07-281-0/+2
| | | | | | | This allows to run capnproto tests on Linux Change-Id: I1c500063f13f4aecc16c088f91d3ce790c750abf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Switch to Qt 5.15.0 and drop CI support for MinGW on LinuxRichard Weickelt2020-07-201-106/+2
| | | | | | | | | | | Cross-builds with MinGW on Linux are dropped mainly because of build issues and because MinGW support bloats the resulting Docker image. We have CI jobs running on Windows with MSVC and Clang-cl which should be sufficient. Change-Id: Iac4e0eaf1270844836697bebf52f9c056457caaf Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Add support to generation of aab packageRaphaël Cotty2020-06-251-0/+4
| | | | | | | | | This patch adds the Android.sdk packageType property which sets the target application. By default (previous behavior) qbs generates an apk package. When set to aab, qbs generates instead an aab package Change-Id: Ic09776d08e2a2ecd68fb4c08881201a7a0a25240 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: fix PATH in android imagesIvan Komissarov2020-06-091-1/+1
| | | | | | Change-Id: I5856b6d6edcf37a9af9dada72271caff60f311f2 Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Install libgrpc++-dev packages in Bionic imageIvan Komissarov2020-04-021-0/+1
| | | | | | | | | This enables autotesting the GRPC test in Travis (otherwise, headers are missing and IncludeProbe fails to find them) Change-Id: I77792a2c5dbfc3f73020b7964cca3274a5165c3c Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add OpenGL to bionic-android Docker imageRichard Weickelt2020-02-261-1/+1
| | | | | | | | This is needed to run Qbs binaries created with qbsbuildconfig.enableProjectFileUpdates:true. Change-Id: I9a5f5065df46e90d54bd47d8559fc36cf58fa590 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use python3 in Travis for building docs and running clang-tidyIvan Komissarov2020-02-211-2/+5
| | | | | | Change-Id: I2f0d72abdf12a4e64b79bf9a3c02b32cf4cbeed6 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Install more packages in bionic image to run more testsIvan Komissarov2020-02-101-5/+17
| | | | | | Change-Id: I21691196660a6f5650f6328abe43ec2269a09dbc Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add Docker environment to test Qbs with Qt for AndroidRaphaël Cotty2020-01-101-0/+107
| | | | | | | | | | | | | | | | | | | | | | The Docker images contains ndk r20 and qt 5.13.2 as well as 5.14.0. Containers can be started with the following command line: - docker-compose pull bionic-android-513 - docker-compose run --rm bionic-android-513 The current folder is mounted under /qbs. Assuming that Qbs has been built in the current directory and with release configuration, the autotests can be invoked with: docker-compose run --rm bionic-android-513 scripts/test-qt-for-android.sh \ release/install-root/usr/local/bin A job Travis CI job is added which builds Qt and runs the Android blackbox tests. Change-Id: I76b1901cb7c41f8b5b0122265c99c9b37b59f261 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update Dockerfile for Ubuntu/bionic to install clang-8Ivan Komissarov2019-12-021-2/+9
| | | | | | | | Requied to be able to run clang-tidy Change-Id: Ie0b6eb3229e8a93ea2e7dd10d75824fb40702fa6 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Enable ccache on Linux/DockerRichard Weickelt2019-11-251-0/+1
| | | | | | | | This speeds up CI builds a lot. Change-Id: I53962e1683b4dd923c3a7d254db24164a4e623a6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Export the GLIB switch properlyRichard Weickelt2019-10-211-1/+1
| | | | | | | | | The GLIB event dispatcher was disabled in order to work around QTBUG-79020. But the environment variable was not exported properly and hence, the work-around had no effect. Change-Id: I9bad99168456ae734c895db0ed4f46885d6b4d48 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Disable glib event dispatcher in bionic Docker imageRichard Weickelt2019-10-071-0/+3
| | | | | | | | | | | | Disable glib in the bionic Docker image, as the glib event dispatcher leads to deadlocks in TestBlackbox::concurrentExecutor quite often. The problem should hardly occur in practice. This is a work-around until QTBUG-79020 is fixed. Fixes: QBS-1499 Change-Id: I8cecc979b1c13b053c0ee0787cc4bc0a0de8b701 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Allow overlapping uid/gid in containerRichard Weickelt2019-09-021-2/+2
| | | | | | | | | | | | | | | Makes it possible to start the container on a Linux host where the uid/gid of the current user is similar to an existing uid/gid in the container that is not the "devel" user. For instance, if the host gid is 100, then groupmod in the entrypoint script refuses to change the "devel" user to gid 100 because that gid is already taken by the "apt" group in the container. Change-Id: Ifc4980b118b9b94bf744aa1108225d3c727eb644 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add Ubuntu 18.04 Docker imageRichard Weickelt2019-08-272-0/+276
Contains: - Qbs 1.13.1 (from QtCreator 4.9.2) - Qt 5.12.4 for Linux (prebuilt) - Qt 5.12.4 for Windows (compiled from source) - gcc 7.4 - mingw-w64 (7.3) This image can build Qbs and all its components for Linux and Windows targets. It might supersede Debian stretch which is not officially supported by Qt 5.12. The only limitation is that it can neither build Chocolatey packages nor run windeployqt. Change-Id: Icee1f002483f68839d39c8c152a9c5d886dabcfb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>