aboutsummaryrefslogtreecommitdiffstats
path: root/docker-compose.yml
Commit message (Collapse)AuthorAgeFilesLines
* docker: remove Focal imageIvan Komissarov2024-02-271-11/+0
| | | | | Change-Id: I9cc2a4dd7c2baef682cead318d711e7cedb898cc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: update qt4 image to JammyIvan Komissarov2024-02-191-4/+4
| | | | | Change-Id: Ic81ffb3a65ceb0e373b9bc2981ccd6f6b67b5df1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: upgrade baremetal image to JammyIvan Komissarov2024-02-191-4/+4
| | | | | Change-Id: I8881561219215c534ec41261511d3210faa815d6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: upgrade Android images to JammyIvan Komissarov2024-02-191-26/+26
| | | | | Change-Id: I87101508891fb49237e8a05c6d272b8fc27117d6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: reduce number of Android imagesIvan Komissarov2024-02-191-22/+0
| | | | | | | Only Qt LTS images remain. Change-Id: Ic3fa3b661601a684f75b7e8ce6d74fa3bf0edab4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: update qt5 image to JammyIvan Komissarov2024-02-191-14/+11
| | | | | | | As well as GitHub actions jobs. Change-Id: Ic942f953c4ba7aebe9062280134e9ea0b7b9da0c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: Update static Qt image to JammyIvan Komissarov2024-02-191-11/+11
| | | | | | | As well as GitHub actions job. Change-Id: Ic294a11fa6902f5825a4c73812e1afc0070ffff8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: Add Ubuntu Jammy imageIvan Komissarov2024-02-151-0/+14
| | | | | | | | | | Ubuntu Focal is almost 4 years old now; some packages, like LLVM, are quite old as well - it would be nice to use the same llvm verion that macos github runners use (which is 15, the latest is 17), while only llvm-12 is available on focal. Change-Id: I5f033abb41ab62c58e204307f04b2a224f8e59bf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Docker: Update Qt version in Windows imageChristian Kandeler2023-11-241-2/+2
| | | | | | | | With Qt 6.5, qhelpgenerator crashes when building the documentation, which prevents us from building release packages. Change-Id: I51b30ef6a6bf18d9032aa27ac6afae5edf558c18 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Docker: Update Qt in Windows imageChristian Kandeler2023-08-231-2/+2
| | | | | | | | Qt 6.2 prints annoying warning messages when using QProcess in non-Qt threads. Change-Id: Id6e3d65052595c6b492bd53ad73160aed84100a3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* docker: update qt static imageIvan Komissarov2023-06-261-3/+3
| | | | | | | ...and install llvm into it to be able to build qdoc Change-Id: I9b468403fe690eed482c379a0c78ed5c1cd6e0a7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* android: remove old Qt versions from CIIvan Komissarov2023-05-221-33/+0
| | | | | | | | | | | | | | | Ideally, we need to rebuild all images when docker file is changed and maintaning that amount of images is quite a burden. Also, most users use LTS versions like 5.15, 6.2, 6.5 or the latest Qt version. Leave 6.3 and 6.4 for now in order to test regressions since there were some breaking changes in these versions. Change-Id: Id4f7e817119f3226c1a2350d0e6f4772da162943 Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add docker image focal-android-650 and workaround armv7 packageRaphael Cotty2023-05-191-0/+11
| | | | | Change-Id: I2a0be7bf2102f738be3fd6b184d21982b359f3b8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Merge branch '2.0' into masterIvan Komissarov2023-05-111-5/+5
|\ | | | | | | Change-Id: I0322637bf5e81873da34f36e108611b163076e5f
| * docker: Update focal imagesIvan Komissarov2023-05-061-5/+5
| | | | | | | | | | Change-Id: Ide8cb42abc270bb691b2f4caff6412531cbaf50a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge 2.0 into masterChristian Kandeler2023-03-061-3/+3
|\| | | | | | | Change-Id: If8cf6ccf0bb3bc57f8589d5b742a26a6c85dbc1c
| * docker: update Windows imageIvan Komissarov2023-02-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | - install latest vs2019 compiler - install latest win10 SDK - add vswhere to simplify searching VS - update Qt to 6.2.4 - update Qbs to 1.24.0 - drop support for 32-bit packages in choco Change-Id: I0a57baf160307b84e62fea5c56687efcce7fe42c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add docker image focal-android-642 and workaround armv7 packageRaphael Cotty2023-03-051-0/+11
|/ | | | | | | | | Add docker image focal-android-642 and corresponding github action. Add workaround QTBUG-111713 to correct Qt 6.4.2 android armv7 package. Change-Id: I8f7c5fd566237d4c490fb6014b0a4efbb6f04a53 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Update clang and clang-tidyIvan Komissarov2022-08-251-2/+2
| | | | | | | clang-8 fails to compile Qt 6 code, so update it. Change-Id: Ib0d25c961738ec7549856366b27ef62f87cb910d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update focal-qt6 image to Qt 6.2.4Ivan Komissarov2022-08-101-2/+2
| | | | | Change-Id: I098072d593d927d52b56e06d48e3fbe018c072a4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: make 'focal' a reference to 'focal-qt5'Ivan Komissarov2022-08-091-2/+5
| | | | | Change-Id: I0a9421b379a0cb0288820aee43d4dcf7cbbae47a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: install qdoc into Qt4 imageIvan Komissarov2022-08-051-1/+1
| | | | | Change-Id: Ic0a05c8d97e77f441e6efdd1216715d2479cdb10 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update static docker image to Qt 6.3.1Christian Kandeler2022-08-021-2/+2
| | | | | Change-Id: I6ebb9976cd003e9d1a6bbf0a16730088c4c4fb8c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add Qt 6.3 Android image and update ANDROID_PLATFORMRaphael Cotty2022-02-061-5/+16
| | | | | | | | | | | | | Add docker image focal-android-630 and corresponding github action. Update ANDROID_PLATFORM to "android-30" because Qt AndroidManifest uses property allowNativeHeapPointerTagging (QTBUG-97009) since 6.2.1 which was added in API30. Also update android test because bug QTBUG-97834 was solved in Qt 6.3. Change-Id: Id45701433a779d2c6cb8dfdbfb0676e2daad6f88 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Docker/github action: update mirrors and use Qtc 5.0.3Raphael Cotty2021-12-101-8/+8
| | | | | | | Update available mirrors which all provide Qtc 5.0.3. Change-Id: I9315c607bbdfd6a7fdb8a8e00f99df41aba8b97f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add qt6 static docker imageRaphael Cotty2021-11-211-0/+11
| | | | | | | | Add qt6.2 docker image and github action Fixes: QBS-1534 Change-Id: Ia1675697fbd6bcbaabfafc11940bf5cb9447206b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* docker: update Qbs in the Focal imageIvan Komissarov2021-10-271-2/+2
| | | | | Change-Id: Ic70618a70ec0ad2422d65cd8771c307236cc7a6d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: update Qt version to 6.2.0Ivan Komissarov2021-10-261-3/+3
| | | | | Change-Id: I32ad441109df950e39d26cc766f1e38fc52f5ec3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Add android image for Qt 6.2Raphael Cotty2021-10-251-0/+11
| | | | | Change-Id: Ib48209643b755954f0f38c3f1bcfb487e23cf292 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add android testing with different ndk versionsRaphael Cotty2021-09-301-4/+38
| | | | | | | | | | | | | New docker images are added to test different android ndks. Those images don't have Qt so only a subset of the tests are run. So far I added 3 images: r23 (LTS), r21e (LTS) and r19c (minimum one). The other android images also have a new ANDROID_NDK_VERSION argument set to the r23. Change-Id: Iaa7c80b9cac1c7888b3297fac13333d22a9ad0bc Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* docker: update Qbs version to 1.19.2Ivan Komissarov2021-09-281-3/+3
| | | | | | | Also, remove unneeded command Change-Id: I952bd7bc2bf1e5fac9de140ad160b6cd25539b40 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* docker: Add SuseLeap imageIvan Komissarov2021-09-271-0/+11
| | | | | | | | It is nice to have a configured RPM-based distro for local testing. Change-Id: Id6eeae1d0d5bccc27f240f996d6f9ea1b56aa1b0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: Update Qt version to 6.1.2Ivan Komissarov2021-07-301-3/+3
| | | | | Change-Id: Ic75271f17ab4bbfbaccad605adf0bb9f16189a06 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: Update images to Qbs 1.18.2Raphael Cotty2021-05-051-6/+6
| | | | | | | | | | Qbs 1.21.0 will removes the "product" variable in the Export items after it was deprecated in Qbs 1.18. So in order to build Qbs with Qbs, the installed Qbs version must be updated. Change-Id: Ibee0676823e41defc5d613e486be0a230c431905 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Correct qt6 testRaphael Cotty2021-04-061-1/+1
| | | | | Change-Id: I1f05ae51f30f0158cb3dec6ce189d96f52987c7a Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add Qt6 docker image and update Qt5 imageIvan Komissarov2021-03-191-1/+12
| | | | | | | ...to add additional packages required for the Qt6 image Change-Id: I42791440eaa754a1ae4ea3c24f86dd0ccedc1ed6 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Merge branch '1.18'Ivan Komissarov2021-02-191-0/+8
|\ | | | | | | Change-Id: I4e437865514add88558f66420718bc02fb39e41d
| * Add qt4 docker image for basic testingRaphaël Cotty2020-12-181-0/+8
| | | | | | | | | | Change-Id: Ied6d9eac49fcb20de72499ab7c39e83a90a98b75 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | docker: update focal image to Qt 5.15.2 and Qbs 1.17.1Ivan Komissarov2021-02-161-3/+3
| | | | | | | | | | | | Change-Id: I363d99d15c5fe9cfc1320a579b48710f2a71a40f Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add RISC-V 64-bit architecture for GCC compiler to CIDenis Shienkov2021-02-121-1/+1
| | | | | | | | | | Change-Id: Iff317ec5e4a06e9fc9ae4e0a20c6e55656af2855 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add XTENSA architecture for GCC compiler to CIDenis Shienkov2021-02-081-1/+1
|/ | | | | Change-Id: I810f6b6c263a1b5ade0ece35e57f6ad30b2864ed Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Retire Travis CIIvan Komissarov2020-11-231-0/+1
| | | | | | | Migrate Windows docker job to GitHub actions and remove .travis.yml Change-Id: I7f2ee5a6f27ded94a84550982c2c9fe404fe7475 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Update sdk/ndk/tools versionsRaphaël Cotty2020-11-181-4/+4
| | | | | | | | | build-tools: 29.0.3 NDK: 21.3.6528147 SDK Platform: 29 Change-Id: I6d281aa2e914d7567fa2d57698146465b41838d7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Update for Qt 6Raphaël Cotty2020-11-171-3/+13
| | | | | | | | | | Manage the new directory layout of Qt6. Update generation of the input file for androiddeployqt. Fixes: QBS-1613 Fixes: QBS-1609 Change-Id: Ie633fad467f310bfc4cd42e9c32d9cfc2e734582 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add Android Docker image containing Qt 5.15Richard Weickelt2020-10-261-0/+10
| | | | | | | Add also a job for github actions. Change-Id: Ibf4b1740379605f32ead66657bc4b81529089cc9 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Upgrade linux images to Ubuntu 20.04Ivan Komissarov2020-09-141-13/+13
| | | | | Change-Id: I4dcfbe846f7847874908ed8ad84ac615a5a739c1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use qbs archive for packagingIvan Komissarov2020-09-031-0/+1
| | | | | | | | | | | | This changes the way how the archives are created by the github actions. Previously, the archive was created as a separate aaction, now "qbs archive" product is used. Also, rename the "qbs archive" product to qbs_archive since it is hard to deal with spaces in bash commands. Change-Id: Ia9d0f7004b503b4ce86243cad93dec7c57a9a212 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Initial support for GitHub ActionsIvan Komissarov2020-09-011-0/+2
| | | | | | | | | | This commit adds jobs similar to what we have in Travis. Some tests are disabled when running on GitHub since they do not pass for various reasons. Note that those tests are usually skipped on Travis due to missing dependencies. Change-Id: Icec96dc22e2939d12568d2de1f1a4537c35977ad Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: Fix 'duplicate mount point' error on LinuxIvan Komissarov2020-08-311-2/+6
| | | | | | Change-Id: Iba015e05e641e09ee64262d072a3980fcf2e9965 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Richard Weickelt <richard@weickelt.de>
* docker: Install additional dependencies in the imagesIvan Komissarov2020-08-311-3/+3
| | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 19:26:59 +0000