| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
...to add additional packages required for the Qt6 image
Change-Id: I42791440eaa754a1ae4ea3c24f86dd0ccedc1ed6
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|\
| |
| |
| | |
Change-Id: I4e437865514add88558f66420718bc02fb39e41d
|
| |
| |
| |
| |
| | |
Change-Id: Ied6d9eac49fcb20de72499ab7c39e83a90a98b75
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I363d99d15c5fe9cfc1320a579b48710f2a71a40f
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Iff317ec5e4a06e9fc9ae4e0a20c6e55656af2855
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|/
|
|
|
| |
Change-Id: I810f6b6c263a1b5ade0ece35e57f6ad30b2864ed
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
| |
Migrate Windows docker job to GitHub actions and remove .travis.yml
Change-Id: I7f2ee5a6f27ded94a84550982c2c9fe404fe7475
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
build-tools: 29.0.3
NDK: 21.3.6528147
SDK Platform: 29
Change-Id: I6d281aa2e914d7567fa2d57698146465b41838d7
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
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 also a job for github actions.
Change-Id: Ibf4b1740379605f32ead66657bc4b81529089cc9
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
| |
Change-Id: I4dcfbe846f7847874908ed8ad84ac615a5a739c1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: Iba015e05e641e09ee64262d072a3980fcf2e9965
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Richard Weickelt <richard@weickelt.de>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit adds a basic 'docker-compose' <focal-baremetal> configuration which
allows to produce the bare-metal tests.
Current docker image contains the following toolchains:
* gcc-arm-none-eabi
* gcc-avr
* gcc-msp430
* sdcc
Change-Id: I7e020081dcb763d704c309ffd96fa03b3c56e4fb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Richard Weickelt <richard@weickelt.de>
|
|
|
|
|
|
|
| |
This allows to run capnproto tests on Linux
Change-Id: I1c500063f13f4aecc16c088f91d3ce790c750abf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I5856b6d6edcf37a9af9dada72271caff60f311f2
Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
This includes macOS, Linux and windows jobs, but does not include
Android job
Change-Id: I59331191b9f3c402930ed4b3454e1b3f4d6d9807
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ie3f341fe18e2ffaf676721748279c6b027590727
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We have not been able to build Qbs with it for a while and it was superseded by
Ubuntu Bionic.
Change-Id: I8fe0d40baf8f522d4fd0b94a0b403b324c300e74
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|/
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Qt is updated to 5.12.5, MSVC is updated to 2017. Qbs is updated to
1.15.0.
Docker-compose is used for managing the image. A unique tag name is used
instead of the generic windowsservercore tag to be always able to refer
to a specific version. Docker-compose is now used for managing the
image.
Change-Id: Ia5733992e7692561b1a6e74a4ac2ea3a7a01c4d8
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
This is needed to run Qbs binaries created with
qbsbuildconfig.enableProjectFileUpdates:true.
Change-Id: I9a5f5065df46e90d54bd47d8559fc36cf58fa590
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I2f0d72abdf12a4e64b79bf9a3c02b32cf4cbeed6
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I21691196660a6f5650f6328abe43ec2269a09dbc
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
This requires Qbs 1.14.1. And while we are at it, we can also upgrade Qt to
5.12.6 in all environments.
Task-number: QBS-1495
Change-Id: Iddb067cca37956f93c9bdf2acc95b2282a232b2b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: Iac392a921b5be14f94c8500a057d7045f76db0bf
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
|
|
| |
Update also the docs to refer to the Ubuntu image rather than Debian.
Change-Id: I2c64f8f169c7a8ff9d5090ebc55c56bffd957659
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
Also introduce accurate versioning for docker images. This
makes it possible to use different build environments in
different branches.
Change-Id: I4feb83dbba886c4369d661ec746428b0c89b80b4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
Use the official packages instead of compiling Qt ourselves.
This simplifies the Docker image a lot. For accessing the
script folder, the Docker context needs to change to the
root directory. Thus, we need a .dockerignore file to keep
the size of the context low.
Change-Id: I58ec8f364feba955518f1eaf5bff234332ae8dec
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Libasan requires ptrace capabilities when running in Docker
- Provide a suppressions file
- Update stretch Docker image to build against libicu and match
the configure options of the official Qt release. Otherwise
the address sanitizer fails when Qbs loads plugins.
Change-Id: Ib620187a3cdd486eaf646ee0bd022b811744a998
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Extend Qt installation to enable Qbs autotests and building docs
(QtDeclarative and QtTools, libclang were missing).
- Add Qt to PATH in the container
- Allow users of docker-compose to override the Docker username
so that they can potentially use their own repositories
without changing the file.
- Fix error in the entrypoint script which didn't work when
running the container without arguments.
- Replace the non-interesting output of building Qt with dots because
the log exceeded the maximum log length on Travis CI,
but being entirely silent triggered the watchdog.
Task-number: QBS-1438
Change-Id: Ibd3abacadfc001db5169a9a3fffce908f8e6e760
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
The Debian Docker image is outdated and the user experience is not optimal,
especially when using it on Linux hosts.
- Update Qt to 5.11.3 and build it from source since the Qt installer
is overly complicated to use
- Create a Qt profile and make it the default
- Add entrypoint script to avoid file permission problems on Linux hosts
- Add docker-compose.yml file for easier command line usage
- Improve documentation
Task-number: QBS-1402
Task-number: QBS-1438
Change-Id: I2cbe53ed115fc8cbb96c1e1305297c581e7d0589
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|