From 9b83aa35207ee9b2bb53e2e0e409dc2a39aeb2c3 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Mon, 6 Jan 2020 16:57:27 +0100 Subject: [PATCH 01/25] add new tags to taglist for images --- ci/tags.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/tags.yml b/ci/tags.yml index 7361262..1da7a66 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -14,6 +14,7 @@ 5.9.6: 5.9.7: 5.9.8: +5.9.9: - "5.9" 5.10.0: 5.10.1: @@ -29,8 +30,12 @@ 5.12.3: 5.12.4: 5.12.5: +5.12.6: - "5.12" 5.13.0: 5.13.1: +5.13.2: - "5.13" - - latest \ No newline at end of file +5.14.0: + - "5.14" + - latest From 359dcf582f36dbab3e0e86e555ad067ef9fc2e18 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Thu, 16 Jan 2020 14:52:22 +0100 Subject: [PATCH 02/25] remove build dir cleaning in the default build entrypoint Background: To give developers more control back about their build process, I decided because of #14, that the build directory should not get cleaned by default. This should even be something that the docker image should not take care of at all. Close #14 --- entrypoint.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 771b3fc..52a83a9 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -12,7 +12,6 @@ if [ "$1" = "build" ]; then cd $APP_BUILDDIR mkdir -p build cd build - rm -rf * qmake $ADDITIONAL_ARGS .. make fi From 2d37a2cb7f414847451f8fbd2be141d5bd1facd3 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Fri, 24 Jan 2020 11:31:00 +0100 Subject: [PATCH 03/25] Build the xcb plugin again for Qt 5.12.0+ --- Dockerfile | 3 ++- buildconfig/configure-5.12.1.sh | 2 +- buildconfig/configure-5.12.2.sh | 2 +- buildconfig/configure-5.12.3.sh | 2 +- buildconfig/configure-5.12.4.sh | 2 +- buildconfig/configure-5.12.5.sh | 2 +- buildconfig/configure-5.12.6.sh | 2 +- buildconfig/configure-5.13.0.sh | 2 +- buildconfig/configure-5.13.1.sh | 2 +- buildconfig/configure-5.13.2.sh | 2 +- buildconfig/configure-5.14.0.sh | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index aad3d7e..baebce6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,6 +49,7 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme libxcb1-dev \ libx11-xcb-dev \ libxcb-glx0-dev \ + libxkbcommon-x11-dev \ # bash needed for argument substitution in entrypoint bash \ # since 5.14.0 we apparently need libdbus-1-dev and libnss3-dev @@ -146,4 +147,4 @@ VOLUME ["${APP_BUILDDIR}"] USER ${QT_USERNAME} -ENTRYPOINT ["entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["entrypoint.sh"] diff --git a/buildconfig/configure-5.12.1.sh b/buildconfig/configure-5.12.1.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.12.1.sh +++ b/buildconfig/configure-5.12.1.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/buildconfig/configure-5.12.2.sh b/buildconfig/configure-5.12.2.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.12.2.sh +++ b/buildconfig/configure-5.12.2.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/buildconfig/configure-5.12.3.sh b/buildconfig/configure-5.12.3.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.12.3.sh +++ b/buildconfig/configure-5.12.3.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/buildconfig/configure-5.12.4.sh b/buildconfig/configure-5.12.4.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.12.4.sh +++ b/buildconfig/configure-5.12.4.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/buildconfig/configure-5.12.5.sh b/buildconfig/configure-5.12.5.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.12.5.sh +++ b/buildconfig/configure-5.12.5.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/buildconfig/configure-5.12.6.sh b/buildconfig/configure-5.12.6.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.12.6.sh +++ b/buildconfig/configure-5.12.6.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/buildconfig/configure-5.13.0.sh b/buildconfig/configure-5.13.0.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.13.0.sh +++ b/buildconfig/configure-5.13.0.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/buildconfig/configure-5.13.1.sh b/buildconfig/configure-5.13.1.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.13.1.sh +++ b/buildconfig/configure-5.13.1.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/buildconfig/configure-5.13.2.sh b/buildconfig/configure-5.13.2.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.13.2.sh +++ b/buildconfig/configure-5.13.2.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/buildconfig/configure-5.14.0.sh b/buildconfig/configure-5.14.0.sh index b530107..f4ca117 100644 --- a/buildconfig/configure-5.14.0.sh +++ b/buildconfig/configure-5.14.0.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file From e40db0c09e79bda6136b53e76ee262db6847cab7 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Mon, 27 Jan 2020 19:20:11 +0100 Subject: [PATCH 04/25] add qt 5.14.1 --- .travis.yml | 3 ++- README.md | 7 ++++++- buildconfig/configure-5.14.1.sh | 3 +++ ci/tags.yml | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 buildconfig/configure-5.14.1.sh diff --git a/.travis.yml b/.travis.yml index dbedabc..e076331 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ services: - docker branches: only: - - deploy + - deploy before_install: - pip install docker - pip install pyaml @@ -17,6 +17,7 @@ env: - secure: Bz/3Zzw3D7lhK61YiHHsniQAlQgDJ4XtpTg/QBjapM/I0vuBnNMKFW8s7TFyjqBhnKcAq41YHG+KIjnnTS5pD8VgDM5U//PW/rJJp/0Q+bQmL5ZG0HOzERNYUWCUtpBdrgqwmTxKvmsuQzzNruR4ERtraCuKCK0U3bAtpcNPAhwNbdfSd03SZaEc+aqEKfxr+gxZo8m/dH8qJMVSttd9B/PMKupmddcxbUHJa04nN0iqdMPgxi2kx/H7jWcoo2MIrCij1vynx0pO5u/4P3v7wfngz0PZwaqjAvDvshAJULkmY4nHK++RRCJ8Ml4A7pgM3XFCc3FcXEQQdfeZfeo9JnhYDnYn2gfJjLwjX+LtPmlTy2lhF4dYoDWg7YKNUufeA+a+qw09500r00mn8P34GTVhvkrnBlK+adz0r0HZ6qfRmRLNu7JpOGx1Saat+8TeoYJ8O+q7hgYHMVqxgU1XZmUdU6BMg0RVNMU3nTn87o4UmGUn8IX7bdYJ6iFxYIL8xQJQCNXAs66v4i4B6yVfSvOsvArhro6x3+EyPXRLT+p+cnGKiNyMqBmjTlZd2UTujx3ziawE9grxHdoSkin8neyYVrEG1CoIJqC+J6nnIWHk8sm89HHKxhngQqZKiuRYi0TOYdRpKGJH3tJDqpVk66VQr3nO4ciaOCnJlKSk8Gc= - secure: cCBqL4SXhRodrrZydl8KarefizmhJMyWRuywleeIaluiIt1OM1S2JpwAg2tWNN3pjrLhXQIOeSYR4Q6R4eaVp9YcmWB6gkiYRdnjWHsaufnviz0Dz2KJrSMDAcMAOFWIQwEmXxI2znAKitBnpjAZOVgOqFKeLfAFhDPlQbM4S++n0rKUL4sMCrrUv+DskPGlreH0LFzHzL3OnzkKBRg73bQ8sXAnwJZKU1VV+xNetBKB4CQwS2jPcfHUZC7OJJB0795uGCC8DiTA+VY+T8frpeH7NhD6gAyEwq5QG5oO7l+sVBFfWWJWX8Zi8qCBq4KAPxv48UHPqc/DlawDyszSC6PpTZv4slvn55gvh5lIrUJp4/29Zcr+0MFj9J+3/j/d9YldZ0lqjPisAM44h2TXQs7jnu4o1YMlZQQ7q2yxyDGG/SMe4P+wJLQgOdWUmSqdAyl3D1krrfVPV3LiEYgDugsYVZP40Ooh45S8t9pc3AIUP+R1nQT3UZ/2Nkx6WDTMzkXVcRYEA3t50oX+QzOpX6oyuThhS+N1sbPH9sQbrhLGjYAIHmF/Vt9JsYeP84ju7rZg3ml6WT0TBVioAPfDbEDQZoCKBz8P+wMqR13jcrAH837sEHttrP8keaZ1An5pvZOG9THeKiIagH/hwlVkcgg9AzPz2YGq96f2C6rnE70= matrix: + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index 2c58ab1..743415e 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,8 @@ All currently supported versions of `Qt` should be available as tags. I added al | Tags | Size | | ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | -| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.0]][lnk_5.14.0] | [![imgSizeInfo][size_img_5.14.0]][lnk_5.14.0] | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | +| [![imgVerInfo][ver_img_5.14.0]][lnk_5.14.0] | [![imgSizeInfo][size_img_5.14.0]][lnk_5.14.0] | | [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | | [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | | [![imgVerInfo][ver_img_5.13.0]][lnk_5.13.0] | [![imgSizeInfo][size_img_5.13.0]][lnk_5.13.0] | @@ -115,6 +116,10 @@ All currently supported versions of `Qt` should be available as tags. I added al [size_img_5.14]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.14.svg [lnk_5.14]: https://microbadger.com/images/darkmattercoder/qt-build:5.14 +[ver_img_5.14.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.14.1.svg +[size_img_5.14.1]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.14.1.svg +[lnk_5.14.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.14.1 + [ver_img_5.14.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.14.0.svg [size_img_5.14.0]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.14.0.svg [lnk_5.14.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.14.0 diff --git a/buildconfig/configure-5.14.1.sh b/buildconfig/configure-5.14.1.sh new file mode 100644 index 0000000..f4ca117 --- /dev/null +++ b/buildconfig/configure-5.14.1.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 1da7a66..706114c 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -37,5 +37,6 @@ 5.13.2: - "5.13" 5.14.0: +5.14.1: - "5.14" - latest From 53ce0610eda46658a4a7a38166f0be01ec49eeea Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Fri, 31 Jan 2020 13:24:10 +0100 Subject: [PATCH 05/25] add qt 5.12.7 --- .travis.yml | 1 + README.md | 7 ++++++- buildconfig/configure-5.12.7.sh | 3 +++ ci/tags.yml | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 buildconfig/configure-5.12.7.sh diff --git a/.travis.yml b/.travis.yml index e076331..67286e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ env: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=7 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=6 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=5 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=4 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index 743415e..9a70b7c 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,8 @@ All currently supported versions of `Qt` should be available as tags. I added al | [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | | [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | | [![imgVerInfo][ver_img_5.13.0]][lnk_5.13.0] | [![imgSizeInfo][size_img_5.13.0]][lnk_5.13.0] | -| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.6]][lnk_5.12.6] | [![imgSizeInfo][size_img_5.12.6]][lnk_5.12.6] | +| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.7]][lnk_5.12.7] | [![imgSizeInfo][size_img_5.12.7]][lnk_5.12.7] | +| [![imgVerInfo][ver_img_5.12.6]][lnk_5.12.6] | [![imgSizeInfo][size_img_5.12.6]][lnk_5.12.6] | | [![imgVerInfo][ver_img_5.12.5]][lnk_5.12.5] | [![imgSizeInfo][size_img_5.12.5]][lnk_5.12.5] | | [![imgVerInfo][ver_img_5.12.4]][lnk_5.12.4] | [![imgSizeInfo][size_img_5.12.4]][lnk_5.12.4] | | [![imgVerInfo][ver_img_5.12.3]][lnk_5.12.3] | [![imgSizeInfo][size_img_5.12.3]][lnk_5.12.3] | @@ -144,6 +145,10 @@ All currently supported versions of `Qt` should be available as tags. I added al [size_img_5.12]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.svg [lnk_5.12]: https://microbadger.com/images/darkmattercoder/qt-build:5.12 +[ver_img_5.12.7]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.7.svg +[size_img_5.12.7]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.7.svg +[lnk_5.12.7]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.7 + [ver_img_5.12.6]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.6.svg [size_img_5.12.6]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.6.svg [lnk_5.12.6]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.6 diff --git a/buildconfig/configure-5.12.7.sh b/buildconfig/configure-5.12.7.sh new file mode 100644 index 0000000..f4ca117 --- /dev/null +++ b/buildconfig/configure-5.12.7.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 706114c..45f0b55 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -31,6 +31,7 @@ 5.12.4: 5.12.5: 5.12.6: +5.12.7: - "5.12" 5.13.0: 5.13.1: From 11f01757c89ce4ce343ab19b6a8c236ca1481d41 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Wed, 18 Mar 2020 22:30:20 +0100 Subject: [PATCH 06/25] add new shields for image sizes --- README.md | 196 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 119 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index 9a70b7c..a260daf 100644 --- a/README.md +++ b/README.md @@ -73,208 +73,250 @@ In case you want to do a quick, customised build like I do it in the automated b All currently supported versions of `Qt` should be available as tags. I added also versions that have been supported at the time adding them first, but are now archived. I'd like to add other archived versions, too, but I did not yet put any effort into thet. This is no hard work though, so might be a nice ![first contribution](https://img.shields.io/badge/-first_contribution-006b75.svg) -| Tags | Size | -| ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | -| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | -| [![imgVerInfo][ver_img_5.14.0]][lnk_5.14.0] | [![imgSizeInfo][size_img_5.14.0]][lnk_5.14.0] | -| [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | -| [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | -| [![imgVerInfo][ver_img_5.13.0]][lnk_5.13.0] | [![imgSizeInfo][size_img_5.13.0]][lnk_5.13.0] | -| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.7]][lnk_5.12.7] | [![imgSizeInfo][size_img_5.12.7]][lnk_5.12.7] | -| [![imgVerInfo][ver_img_5.12.6]][lnk_5.12.6] | [![imgSizeInfo][size_img_5.12.6]][lnk_5.12.6] | -| [![imgVerInfo][ver_img_5.12.5]][lnk_5.12.5] | [![imgSizeInfo][size_img_5.12.5]][lnk_5.12.5] | -| [![imgVerInfo][ver_img_5.12.4]][lnk_5.12.4] | [![imgSizeInfo][size_img_5.12.4]][lnk_5.12.4] | -| [![imgVerInfo][ver_img_5.12.3]][lnk_5.12.3] | [![imgSizeInfo][size_img_5.12.3]][lnk_5.12.3] | -| [![imgVerInfo][ver_img_5.12.2]][lnk_5.12.2] | [![imgSizeInfo][size_img_5.12.2]][lnk_5.12.2] | -| [![imgVerInfo][ver_img_5.12.1]][lnk_5.12.1] | [![imgSizeInfo][size_img_5.12.1]][lnk_5.12.1] | -| [![imgVerInfo][ver_img_5.12.0]][lnk_5.12.0] | [![imgSizeInfo][size_img_5.12.0]][lnk_5.12.0] | -| [![imgVerInfo][ver_img_5.11]][lnk_5.11] [![imgVerInfo][ver_img_5.11.3]][lnk_5.11.3] | [![imgSizeInfo][size_img_5.11.3]][lnk_5.11.3] | -| [![imgVerInfo][ver_img_5.11.2]][lnk_5.11.2] | [![imgSizeInfo][size_img_5.11.2]][lnk_5.11.2] | -| [![imgVerInfo][ver_img_5.11.1]][lnk_5.11.1] | [![imgSizeInfo][size_img_5.11.1]][lnk_5.11.1] | -| [![imgVerInfo][ver_img_5.11.0]][lnk_5.11.0] | [![imgSizeInfo][size_img_5.11.0]][lnk_5.11.0] | -| [![imgVerInfo][ver_img_5.10]][lnk_5.10] [![imgVerInfo][ver_img_5.10.1]][lnk_5.10.1] | [![imgSizeInfo][size_img_5.10.1]][lnk_5.10.1] | -| [![imgVerInfo][ver_img_5.10.0]][lnk_5.10.0] | [![imgSizeInfo][size_img_5.10.0]][lnk_5.10.0] | -| [![imgVerInfo][ver_img_5.9]][lnk_5.9] [![imgVerInfo][ver_img_5.9.9]][lnk_5.9.9] | [![imgSizeInfo][size_img_5.9.9]][lnk_5.9.9] | -| [![imgVerInfo][ver_img_5.9.8]][lnk_5.9.8] | [![imgSizeInfo][size_img_5.9.8]][lnk_5.9.8] | -| [![imgVerInfo][ver_img_5.9.7]][lnk_5.9.7] | [![imgSizeInfo][size_img_5.9.7]][lnk_5.9.7] | -| [![imgVerInfo][ver_img_5.9.6]][lnk_5.9.6] | [![imgSizeInfo][size_img_5.9.6]][lnk_5.9.6] | -| [![imgVerInfo][ver_img_5.9.5]][lnk_5.9.5] | [![imgSizeInfo][size_img_5.9.5]][lnk_5.9.5] | -| [![imgVerInfo][ver_img_5.9.4]][lnk_5.9.4] | [![imgSizeInfo][size_img_5.9.4]][lnk_5.9.4] | -| [![imgVerInfo][ver_img_5.9.3]][lnk_5.9.3] | [![imgSizeInfo][size_img_5.9.3]][lnk_5.9.3] | -| [![imgVerInfo][ver_img_5.9.2]][lnk_5.9.2] | [![imgSizeInfo][size_img_5.9.2]][lnk_5.9.2] | -| [![imgVerInfo][ver_img_5.9.1]][lnk_5.9.1] | [![imgSizeInfo][size_img_5.9.1]][lnk_5.9.1] | -| [![imgVerInfo][ver_img_5.9.0]][lnk_5.9.0] | [![imgSizeInfo][size_img_5.9.0]][lnk_5.9.0] | -| [![imgVerInfo][ver_img_5.6]][lnk_5.6] [![imgVerInfo][ver_img_5.6.3]][lnk_5.6.3] | [![imgSizeInfo][size_img_5.6.3]][lnk_5.6.3] | -| [![imgVerInfo][ver_img_5.6.2]][lnk_5.6.2] | [![imgSizeInfo][size_img_5.6.2]][lnk_5.6.2] | -| [![imgVerInfo][ver_img_5.6.1-1]][lnk_5.6.1-1] [![imgVerInfo][ver_img_5.6.1]][lnk_5.6.1] | [![imgSizeInfo][size_img_5.6.1]][lnk_5.6.1] | -| [![imgVerInfo][ver_img_5.6.0]][lnk_5.6.0] | [![imgSizeInfo][size_img_5.6.0]][lnk_5.6.0] | +| Tags | Size | Layers | +| ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------------ | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | [![imgLayerInfo][layers_img_5.14.1]][lnk_5.14.1] | +| [![imgVerInfo][ver_img_5.14.0]][lnk_5.14.0] | [![imgSizeInfo][size_img_5.14.0]][lnk_5.14.0] | [![imgLayerInfo][layers_img_5.14.0]][lnk_5.14.0] | +| [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | [![imgLayerInfo][layers_img_5.13.2]][lnk_5.13.2] | +| [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | [![imgLayerInfo][layers_img_5.13.1]][lnk_5.13.1] | +| [![imgVerInfo][ver_img_5.13.0]][lnk_5.13.0] | [![imgSizeInfo][size_img_5.13.0]][lnk_5.13.0] | [![imgLayerInfo][layers_img_5.13.0]][lnk_5.13.0] | +| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.7]][lnk_5.12.7] | [![imgSizeInfo][size_img_5.12.7]][lnk_5.12.7] | [![imgLayerInfo][layers_img_5.12.7]][lnk_5.12.7] | +| [![imgVerInfo][ver_img_5.12.6]][lnk_5.12.6] | [![imgSizeInfo][size_img_5.12.6]][lnk_5.12.6] | [![imgLayerInfo][layers_img_5.12.6]][lnk_5.12.6] | +| [![imgVerInfo][ver_img_5.12.5]][lnk_5.12.5] | [![imgSizeInfo][size_img_5.12.5]][lnk_5.12.5] | [![imgLayerInfo][layers_img_5.12.5]][lnk_5.12.5] | +| [![imgVerInfo][ver_img_5.12.4]][lnk_5.12.4] | [![imgSizeInfo][size_img_5.12.4]][lnk_5.12.4] | [![imgLayerInfo][layers_img_5.12.4]][lnk_5.12.4] | +| [![imgVerInfo][ver_img_5.12.3]][lnk_5.12.3] | [![imgSizeInfo][size_img_5.12.3]][lnk_5.12.3] | [![imgLayerInfo][layers_img_5.12.3]][lnk_5.12.3] | +| [![imgVerInfo][ver_img_5.12.2]][lnk_5.12.2] | [![imgSizeInfo][size_img_5.12.2]][lnk_5.12.2] | [![imgLayerInfo][layers_img_5.12.2]][lnk_5.12.2] | +| [![imgVerInfo][ver_img_5.12.1]][lnk_5.12.1] | [![imgSizeInfo][size_img_5.12.1]][lnk_5.12.1] | [![imgLayerInfo][layers_img_5.12.1]][lnk_5.12.1] | +| [![imgVerInfo][ver_img_5.12.0]][lnk_5.12.0] | [![imgSizeInfo][size_img_5.12.0]][lnk_5.12.0] | [![imgLayerInfo][layers_img_5.12.0]][lnk_5.12.0] | +| [![imgVerInfo][ver_img_5.11]][lnk_5.11] [![imgVerInfo][ver_img_5.11.3]][lnk_5.11.3] | [![imgSizeInfo][size_img_5.11.3]][lnk_5.11.3] | [![imgLayerInfo][layers_img_5.11.3]][lnk_5.11.3] | +| [![imgVerInfo][ver_img_5.11.2]][lnk_5.11.2] | [![imgSizeInfo][size_img_5.11.2]][lnk_5.11.2] | [![imgLayerInfo][layers_img_5.11.2]][lnk_5.11.2] | +| [![imgVerInfo][ver_img_5.11.1]][lnk_5.11.1] | [![imgSizeInfo][size_img_5.11.1]][lnk_5.11.1] | [![imgLayerInfo][layers_img_5.11.1]][lnk_5.11.1] | +| [![imgVerInfo][ver_img_5.11.0]][lnk_5.11.0] | [![imgSizeInfo][size_img_5.11.0]][lnk_5.11.0] | [![imgLayerInfo][layers_img_5.11.0]][lnk_5.11.0] | +| [![imgVerInfo][ver_img_5.10]][lnk_5.10] [![imgVerInfo][ver_img_5.10.1]][lnk_5.10.1] | [![imgSizeInfo][size_img_5.10.1]][lnk_5.10.1] | [![imgLayerInfo][layers_img_5.10.1]][lnk_5.10.1] | +| [![imgVerInfo][ver_img_5.10.0]][lnk_5.10.0] | [![imgSizeInfo][size_img_5.10.0]][lnk_5.10.0] | [![imgLayerInfo][layers_img_5.10.0]][lnk_5.10.0] | +| [![imgVerInfo][ver_img_5.9]][lnk_5.9] [![imgVerInfo][ver_img_5.9.9]][lnk_5.9.9] | [![imgSizeInfo][size_img_5.9.9]][lnk_5.9.9] | [![imgLayerInfo][layers_img_5.9.9]][lnk_5.9.9] | +| [![imgVerInfo][ver_img_5.9.8]][lnk_5.9.8] | [![imgSizeInfo][size_img_5.9.8]][lnk_5.9.8] | [![imgLayerInfo][layers_img_5.9.8]][lnk_5.9.8] | +| [![imgVerInfo][ver_img_5.9.7]][lnk_5.9.7] | [![imgSizeInfo][size_img_5.9.7]][lnk_5.9.7] | [![imgLayerInfo][layers_img_5.9.7]][lnk_5.9.7] | +| [![imgVerInfo][ver_img_5.9.6]][lnk_5.9.6] | [![imgSizeInfo][size_img_5.9.6]][lnk_5.9.6] | [![imgLayerInfo][layers_img_5.9.6]][lnk_5.9.6] | +| [![imgVerInfo][ver_img_5.9.5]][lnk_5.9.5] | [![imgSizeInfo][size_img_5.9.5]][lnk_5.9.5] | [![imgLayerInfo][layers_img_5.9.5]][lnk_5.9.5] | +| [![imgVerInfo][ver_img_5.9.4]][lnk_5.9.4] | [![imgSizeInfo][size_img_5.9.4]][lnk_5.9.4] | [![imgLayerInfo][layers_img_5.9.4]][lnk_5.9.4] | +| [![imgVerInfo][ver_img_5.9.3]][lnk_5.9.3] | [![imgSizeInfo][size_img_5.9.3]][lnk_5.9.3] | [![imgLayerInfo][layers_img_5.9.3]][lnk_5.9.3] | +| [![imgVerInfo][ver_img_5.9.2]][lnk_5.9.2] | [![imgSizeInfo][size_img_5.9.2]][lnk_5.9.2] | [![imgLayerInfo][layers_img_5.9.2]][lnk_5.9.2] | +| [![imgVerInfo][ver_img_5.9.1]][lnk_5.9.1] | [![imgSizeInfo][size_img_5.9.1]][lnk_5.9.1] | [![imgLayerInfo][layers_img_5.9.1]][lnk_5.9.1] | +| [![imgVerInfo][ver_img_5.9.0]][lnk_5.9.0] | [![imgSizeInfo][size_img_5.9.0]][lnk_5.9.0] | [![imgLayerInfo][layers_img_5.9.0]][lnk_5.9.0] | +| [![imgVerInfo][ver_img_5.6]][lnk_5.6] [![imgVerInfo][ver_img_5.6.3]][lnk_5.6.3] | [![imgSizeInfo][size_img_5.6.3]][lnk_5.6.3] | [![imgLayerInfo][layers_img_5.6.3]][lnk_5.6.3] | +| [![imgVerInfo][ver_img_5.6.2]][lnk_5.6.2] | [![imgSizeInfo][size_img_5.6.2]][lnk_5.6.2] | [![imgLayerInfo][layers_img_5.6.2]][lnk_5.6.2] | +| [![imgVerInfo][ver_img_5.6.1-1]][lnk_5.6.1-1] [![imgVerInfo][ver_img_5.6.1]][lnk_5.6.1] | [![imgSizeInfo][size_img_5.6.1]][lnk_5.6.1] | [![imgLayerInfo][layers_img_5.6.1]][lnk_5.6.1] | +| [![imgVerInfo][ver_img_5.6.0]][lnk_5.6.0] | [![imgSizeInfo][size_img_5.6.0]][lnk_5.6.0] | [![imgLayerInfo][layers_img_5.6.0]][lnk_5.6.0] | [ver_img_latest]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:latest.svg -[size_img_latest]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:latest.svg +[size_img_latest]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/latest +[layers_img_latest]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/latest [lnk_latest]: https://microbadger.com/images/darkmattercoder/qt-build:latest [ver_img_5.14]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.14.svg -[size_img_5.14]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.14.svg +[size_img_5.14]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.14 +[layers_img_5.14]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.14 [lnk_5.14]: https://microbadger.com/images/darkmattercoder/qt-build:5.14 [ver_img_5.14.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.14.1.svg -[size_img_5.14.1]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.14.1.svg +[size_img_5.14.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.14.1 +[layers_img_5.14.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.14.1 [lnk_5.14.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.14.1 [ver_img_5.14.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.14.0.svg -[size_img_5.14.0]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.14.0.svg +[size_img_5.14.0]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.14.0 +[layers_img_5.14.0]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.14.0 [lnk_5.14.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.14.0 [ver_img_5.13]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.13.svg -[size_img_5.13]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.13.svg +[size_img_5.13]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.13 +[layers_img_5.13]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.13 [lnk_5.13]: https://microbadger.com/images/darkmattercoder/qt-build:5.13 [ver_img_5.13.2]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.13.2.svg -[size_img_5.13.2]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.13.2.svg +[size_img_5.13.2]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.13.2 +[layers_img_5.13.2]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.13.2 [lnk_5.13.2]: https://microbadger.com/images/darkmattercoder/qt-build:5.13.2 [ver_img_5.13.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.13.1.svg -[size_img_5.13.1]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.13.1.svg +[size_img_5.13.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.13.1 +[layers_img_5.13.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.13.1 [lnk_5.13.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.13.1 [ver_img_5.13.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.13.0.svg -[size_img_5.13.0]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.13.0.svg +[size_img_5.13.0]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.13.0 +[layers_img_5.13.0]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.13.0 [lnk_5.13.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.13.0 [ver_img_5.12]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.svg -[size_img_5.12]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.svg +[size_img_5.12]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12 +[layers_img_5.12]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12 [lnk_5.12]: https://microbadger.com/images/darkmattercoder/qt-build:5.12 [ver_img_5.12.7]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.7.svg -[size_img_5.12.7]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.7.svg +[size_img_5.12.7]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.7 +[layers_img_5.12.7]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.7 [lnk_5.12.7]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.7 [ver_img_5.12.6]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.6.svg -[size_img_5.12.6]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.6.svg +[size_img_5.12.6]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.6 +[layers_img_5.12.6]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.6 [lnk_5.12.6]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.6 [ver_img_5.12.5]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.5.svg -[size_img_5.12.5]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.5.svg +[size_img_5.12.5]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.5 +[layers_img_5.12.5]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.5 [lnk_5.12.5]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.5 [ver_img_5.12.4]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.4.svg -[size_img_5.12.4]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.4.svg +[size_img_5.12.4]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.4 +[layers_img_5.12.4]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.4 [lnk_5.12.4]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.4 [ver_img_5.12.3]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.3.svg -[size_img_5.12.3]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.3.svg +[size_img_5.12.3]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.3 +[layers_img_5.12.3]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.3 [lnk_5.12.3]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.3 [ver_img_5.12.2]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.2.svg -[size_img_5.12.2]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.2.svg +[size_img_5.12.2]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.2 +[layers_img_5.12.2]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.2 [lnk_5.12.2]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.2 [ver_img_5.12.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.1.svg -[size_img_5.12.1]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.1.svg +[size_img_5.12.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.1 +[layers_img_5.12.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.1 [lnk_5.12.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.1 [ver_img_5.12.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.0.svg -[size_img_5.12.0]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.12.0.svg +[size_img_5.12.0]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.0 +[layers_img_5.12.0]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.0 [lnk_5.12.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.0 [ver_img_5.11]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.11.svg -[size_img_5.11]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.11.svg +[size_img_5.11]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.11 +[layers_img_5.11]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.11 [lnk_5.11]: https://microbadger.com/images/darkmattercoder/qt-build:5.11 [ver_img_5.11.3]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.11.3.svg -[size_img_5.11.3]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.11.3.svg +[size_img_5.11.3]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.11.3 +[layers_img_5.11.3]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.11.3 [lnk_5.11.3]: https://microbadger.com/images/darkmattercoder/qt-build:5.11.3 [ver_img_5.11.2]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.11.2.svg -[size_img_5.11.2]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.11.2.svg +[size_img_5.11.2]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.11.2 +[layers_img_5.11.2]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.11.2 [lnk_5.11.2]: https://microbadger.com/images/darkmattercoder/qt-build:5.11.2 [ver_img_5.11.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.11.1.svg -[size_img_5.11.1]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.11.1.svg +[size_img_5.11.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.11.1 +[layers_img_5.11.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.11.1 [lnk_5.11.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.11.1 [ver_img_5.11.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.11.0.svg -[size_img_5.11.0]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.11.0.svg +[size_img_5.11.0]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.11.0 +[layers_img_5.11.0]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.11.0 [lnk_5.11.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.11.0 [ver_img_5.10]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.10.svg -[size_img_5.10]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.10.svg +[size_img_5.10]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.10 +[layers_img_5.10]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.10 [lnk_5.10]: https://microbadger.com/images/darkmattercoder/qt-build:5.10 [ver_img_5.10.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.10.1.svg -[size_img_5.10.1]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.10.1.svg +[size_img_5.10.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.10.1 +[layers_img_5.10.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.10.1 [lnk_5.10.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.10.1 [ver_img_5.10.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.10.0.svg -[size_img_5.10.0]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.10.0.svg +[size_img_5.10.0]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.10.0 +[layers_img_5.10.0]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.10.0 [lnk_5.10.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.10.0 [ver_img_5.9]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.svg -[size_img_5.9]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.svg +[size_img_5.9]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9 +[layers_img_5.9]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9 [lnk_5.9]: https://microbadger.com/images/darkmattercoder/qt-build:5.9 [ver_img_5.9.9]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.9.svg -[size_img_5.9.9]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.9.svg +[size_img_5.9.9]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.9 +[layers_img_5.9.9]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.9 [lnk_5.9.9]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.9 [ver_img_5.9.8]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.8.svg -[size_img_5.9.8]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.8.svg +[size_img_5.9.8]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.8 +[layers_img_5.9.8]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.8 [lnk_5.9.8]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.8 [ver_img_5.9.7]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.7.svg -[size_img_5.9.7]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.7.svg +[size_img_5.9.7]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.7 +[layers_img_5.9.7]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.7 [lnk_5.9.7]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.7 [ver_img_5.9.6]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.6.svg -[size_img_5.9.6]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.6.svg +[size_img_5.9.6]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.6 +[layers_img_5.9.6]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.6 [lnk_5.9.6]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.6 [ver_img_5.9.5]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.5.svg -[size_img_5.9.5]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.5.svg +[size_img_5.9.5]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.5 +[layers_img_5.9.5]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.5 [lnk_5.9.5]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.5 [ver_img_5.9.4]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.4.svg -[size_img_5.9.4]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.4.svg +[size_img_5.9.4]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.4 +[layers_img_5.9.4]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.4 [lnk_5.9.4]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.4 [ver_img_5.9.3]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.3.svg -[size_img_5.9.3]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.3.svg +[size_img_5.9.3]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.3 +[layers_img_5.9.3]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.3 [lnk_5.9.3]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.3 [ver_img_5.9.2]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.2.svg -[size_img_5.9.2]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.2.svg +[size_img_5.9.2]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.2 +[layers_img_5.9.2]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.2 [lnk_5.9.2]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.2 [ver_img_5.9.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.1.svg -[size_img_5.9.1]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.1.svg +[size_img_5.9.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.1 +[layers_img_5.9.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.1 [lnk_5.9.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.1 [ver_img_5.9.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.9.0.svg -[size_img_5.9.0]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.0.svg +[size_img_5.9.0]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.9.0 +[layers_img_5.9.0]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.9.0 [lnk_5.9.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.0 [ver_img_5.6]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.6.svg -[size_img_5.6]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.6.svg +[size_img_5.6]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.6 +[layers_img_5.6]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.6 [lnk_5.6]: https://microbadger.com/images/darkmattercoder/qt-build:5.6 [ver_img_5.6.3]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.6.3.svg -[size_img_5.6.3]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.6.3.svg +[size_img_5.6.3]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.6.3 +[layers_img_5.6.3]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.6.3 [lnk_5.6.3]: https://microbadger.com/images/darkmattercoder/qt-build:5.6.3 [ver_img_5.6.2]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.6.2.svg -[size_img_5.6.2]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.6.2.svg +[size_img_5.6.2]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.6.2 +[layers_img_5.6.2]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.6.2 [lnk_5.6.2]: https://microbadger.com/images/darkmattercoder/qt-build:5.6.2 [ver_img_5.6.1-1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.6.1-1.svg -[size_img_5.6.1-1]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.6.1-1.svg +[size_img_5.6.1-1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.6.1-1 +[layers_img_5.6.1-1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.6.1-1 [lnk_5.6.1-1]: https://microbadger.com/images/darkmattercoder/qt-build:5.6.1-1 [ver_img_5.6.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.6.1.svg -[size_img_5.6.1]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.6.1.svg +[size_img_5.6.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.6.1 +[layers_img_5.6.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.6.1 [lnk_5.6.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.6.1 [ver_img_5.6.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.6.0.svg -[size_img_5.6.0]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.6.0.svg +[size_img_5.6.0]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.6.0 +[layers_img_5.6.0]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.6.0 [lnk_5.6.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.6.0 ## Contributions From bd82cc72dd126af68d58938281e5cd57c332a63e Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 19 Mar 2020 22:06:02 +0100 Subject: [PATCH 07/25] update header shield for layers and size --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a260daf..81a8bed 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # qt-build [![Build Status](https://travis-ci.com/darkmattercoder/qt-build.svg?branch=deploy)](https://travis-ci.com/darkmattercoder/qt-build) -[![Image information](https://images.microbadger.com/badges/image/darkmattercoder/qt-build.svg)](https://microbadger.com/images/darkmattercoder/qt-build "Get your own image badge on microbadger.com") +[![Image Size information](https://img.shields.io/docker/image-size/darkmattercoder/qt-build/latest)](https://microbadger.com/images/darkmattercoder/qt-build) +[![Image Layers information](https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/latest)](https://microbadger.com/images/darkmattercoder/qt-build) [![Image version information](https://images.microbadger.com/badges/version/darkmattercoder/qt-build.svg)](https://microbadger.com/images/darkmattercoder/qt-build) ![Dockerhub pulls](https://img.shields.io/docker/pulls/darkmattercoder/qt-build.svg) ![Dockerhub stars](https://img.shields.io/docker/stars/darkmattercoder/qt-build.svg) From 13e0a54b559f89fe14c9e3cb4ef295e7c3c3b58a Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Mon, 23 Mar 2020 18:31:48 +0100 Subject: [PATCH 08/25] change archive path according to latest qt download page changes --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 67286e9..13d9642 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,12 +30,12 @@ env: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=9 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=7 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 @@ -46,10 +46,10 @@ env: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=1 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=1 stages: - test - merge From 8586c8a9491ffaef0e5b471705483203c2039df3 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Thu, 2 Apr 2020 10:52:13 +0200 Subject: [PATCH 09/25] add qt 5.14.2 --- .travis.yml | 1 + README.md | 8 +++++++- buildconfig/configure-5.14.2.sh | 3 +++ ci/tags.yml | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 buildconfig/configure-5.14.2.sh diff --git a/.travis.yml b/.travis.yml index 13d9642..71134b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: - secure: Bz/3Zzw3D7lhK61YiHHsniQAlQgDJ4XtpTg/QBjapM/I0vuBnNMKFW8s7TFyjqBhnKcAq41YHG+KIjnnTS5pD8VgDM5U//PW/rJJp/0Q+bQmL5ZG0HOzERNYUWCUtpBdrgqwmTxKvmsuQzzNruR4ERtraCuKCK0U3bAtpcNPAhwNbdfSd03SZaEc+aqEKfxr+gxZo8m/dH8qJMVSttd9B/PMKupmddcxbUHJa04nN0iqdMPgxi2kx/H7jWcoo2MIrCij1vynx0pO5u/4P3v7wfngz0PZwaqjAvDvshAJULkmY4nHK++RRCJ8Ml4A7pgM3XFCc3FcXEQQdfeZfeo9JnhYDnYn2gfJjLwjX+LtPmlTy2lhF4dYoDWg7YKNUufeA+a+qw09500r00mn8P34GTVhvkrnBlK+adz0r0HZ6qfRmRLNu7JpOGx1Saat+8TeoYJ8O+q7hgYHMVqxgU1XZmUdU6BMg0RVNMU3nTn87o4UmGUn8IX7bdYJ6iFxYIL8xQJQCNXAs66v4i4B6yVfSvOsvArhro6x3+EyPXRLT+p+cnGKiNyMqBmjTlZd2UTujx3ziawE9grxHdoSkin8neyYVrEG1CoIJqC+J6nnIWHk8sm89HHKxhngQqZKiuRYi0TOYdRpKGJH3tJDqpVk66VQr3nO4ciaOCnJlKSk8Gc= - secure: cCBqL4SXhRodrrZydl8KarefizmhJMyWRuywleeIaluiIt1OM1S2JpwAg2tWNN3pjrLhXQIOeSYR4Q6R4eaVp9YcmWB6gkiYRdnjWHsaufnviz0Dz2KJrSMDAcMAOFWIQwEmXxI2znAKitBnpjAZOVgOqFKeLfAFhDPlQbM4S++n0rKUL4sMCrrUv+DskPGlreH0LFzHzL3OnzkKBRg73bQ8sXAnwJZKU1VV+xNetBKB4CQwS2jPcfHUZC7OJJB0795uGCC8DiTA+VY+T8frpeH7NhD6gAyEwq5QG5oO7l+sVBFfWWJWX8Zi8qCBq4KAPxv48UHPqc/DlawDyszSC6PpTZv4slvn55gvh5lIrUJp4/29Zcr+0MFj9J+3/j/d9YldZ0lqjPisAM44h2TXQs7jnu4o1YMlZQQ7q2yxyDGG/SMe4P+wJLQgOdWUmSqdAyl3D1krrfVPV3LiEYgDugsYVZP40Ooh45S8t9pc3AIUP+R1nQT3UZ/2Nkx6WDTMzkXVcRYEA3t50oX+QzOpX6oyuThhS+N1sbPH9sQbrhLGjYAIHmF/Vt9JsYeP84ju7rZg3ml6WT0TBVioAPfDbEDQZoCKBz8P+wMqR13jcrAH837sEHttrP8keaZ1An5pvZOG9THeKiIagH/hwlVkcgg9AzPz2YGq96f2C6rnE70= matrix: + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index 81a8bed..e1918bd 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,8 @@ All currently supported versions of `Qt` should be available as tags. I added al | Tags | Size | Layers | | ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------------ | -| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | [![imgLayerInfo][layers_img_5.14.1]][lnk_5.14.1] | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.2]][lnk_5.14.2] | [![imgSizeInfo][size_img_5.14.2]][lnk_5.14.2] | [![imgLayerInfo][layers_img_5.14.2]][lnk_5.14.2] | +| [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | [![imgLayerInfo][layers_img_5.14.1]][lnk_5.14.1] | | [![imgVerInfo][ver_img_5.14.0]][lnk_5.14.0] | [![imgSizeInfo][size_img_5.14.0]][lnk_5.14.0] | [![imgLayerInfo][layers_img_5.14.0]][lnk_5.14.0] | | [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | [![imgLayerInfo][layers_img_5.13.2]][lnk_5.13.2] | | [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | [![imgLayerInfo][layers_img_5.13.1]][lnk_5.13.1] | @@ -120,6 +121,11 @@ All currently supported versions of `Qt` should be available as tags. I added al [layers_img_5.14]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.14 [lnk_5.14]: https://microbadger.com/images/darkmattercoder/qt-build:5.14 +[ver_img_5.14.2]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.14.2.svg +[size_img_5.14.2]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.14.2 +[layers_img_5.14.2]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.14.2 +[lnk_5.14.2]: https://microbadger.com/images/darkmattercoder/qt-build:5.14.2 + [ver_img_5.14.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.14.1.svg [size_img_5.14.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.14.1 [layers_img_5.14.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.14.1 diff --git a/buildconfig/configure-5.14.2.sh b/buildconfig/configure-5.14.2.sh new file mode 100644 index 0000000..f4ca117 --- /dev/null +++ b/buildconfig/configure-5.14.2.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 45f0b55..0f4db77 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -39,5 +39,6 @@ - "5.13" 5.14.0: 5.14.1: +5.14.2: - "5.14" - latest From 4ac7987ccaa84a55afc7418208d9692f64b3ff8f Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Thu, 9 Apr 2020 01:24:22 +0200 Subject: [PATCH 10/25] add qt 5.12.8 --- .travis.yml | 1 + README.md | 8 +++++++- buildconfig/configure-5.12.8.sh | 3 +++ ci/tags.yml | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 buildconfig/configure-5.12.8.sh diff --git a/.travis.yml b/.travis.yml index 71134b8..8ead9b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ env: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=8 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=7 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=6 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=5 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index e1918bd..55a1c24 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,8 @@ All currently supported versions of `Qt` should be available as tags. I added al | [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | [![imgLayerInfo][layers_img_5.13.2]][lnk_5.13.2] | | [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | [![imgLayerInfo][layers_img_5.13.1]][lnk_5.13.1] | | [![imgVerInfo][ver_img_5.13.0]][lnk_5.13.0] | [![imgSizeInfo][size_img_5.13.0]][lnk_5.13.0] | [![imgLayerInfo][layers_img_5.13.0]][lnk_5.13.0] | -| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.7]][lnk_5.12.7] | [![imgSizeInfo][size_img_5.12.7]][lnk_5.12.7] | [![imgLayerInfo][layers_img_5.12.7]][lnk_5.12.7] | +| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.8]][lnk_5.12.8] | [![imgSizeInfo][size_img_5.12.8]][lnk_5.12.8] | [![imgLayerInfo][layers_img_5.12.8]][lnk_5.12.8] | +| [![imgVerInfo][ver_img_5.12.7]][lnk_5.12.7] | [![imgSizeInfo][size_img_5.12.7]][lnk_5.12.7] | [![imgLayerInfo][layers_img_5.12.7]][lnk_5.12.7] | | [![imgVerInfo][ver_img_5.12.6]][lnk_5.12.6] | [![imgSizeInfo][size_img_5.12.6]][lnk_5.12.6] | [![imgLayerInfo][layers_img_5.12.6]][lnk_5.12.6] | | [![imgVerInfo][ver_img_5.12.5]][lnk_5.12.5] | [![imgSizeInfo][size_img_5.12.5]][lnk_5.12.5] | [![imgLayerInfo][layers_img_5.12.5]][lnk_5.12.5] | | [![imgVerInfo][ver_img_5.12.4]][lnk_5.12.4] | [![imgSizeInfo][size_img_5.12.4]][lnk_5.12.4] | [![imgLayerInfo][layers_img_5.12.4]][lnk_5.12.4] | @@ -161,6 +162,11 @@ All currently supported versions of `Qt` should be available as tags. I added al [layers_img_5.12]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12 [lnk_5.12]: https://microbadger.com/images/darkmattercoder/qt-build:5.12 +[ver_img_5.12.8]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.8.svg +[size_img_5.12.8]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.8 +[layers_img_5.12.8]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.8 +[lnk_5.12.8]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.8 + [ver_img_5.12.7]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.7.svg [size_img_5.12.7]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.7 [layers_img_5.12.7]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.7 diff --git a/buildconfig/configure-5.12.8.sh b/buildconfig/configure-5.12.8.sh new file mode 100644 index 0000000..f4ca117 --- /dev/null +++ b/buildconfig/configure-5.12.8.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 0f4db77..361df15 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -32,6 +32,7 @@ 5.12.5: 5.12.6: 5.12.7: +5.12.8: - "5.12" 5.13.0: 5.13.1: From 8b998fae9a54673205d25a9e3daa2662e6dc659c Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 26 May 2020 12:57:15 +0200 Subject: [PATCH 11/25] add qt 5.15.0 --- .travis.yml | 1 + README.md | 13 ++++++++++++- buildconfig/configure-5.15.0.sh | 3 +++ ci/tags.yml | 4 +++- 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 buildconfig/configure-5.15.0.sh diff --git a/.travis.yml b/.travis.yml index 8ead9b2..ad2ff9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: - secure: Bz/3Zzw3D7lhK61YiHHsniQAlQgDJ4XtpTg/QBjapM/I0vuBnNMKFW8s7TFyjqBhnKcAq41YHG+KIjnnTS5pD8VgDM5U//PW/rJJp/0Q+bQmL5ZG0HOzERNYUWCUtpBdrgqwmTxKvmsuQzzNruR4ERtraCuKCK0U3bAtpcNPAhwNbdfSd03SZaEc+aqEKfxr+gxZo8m/dH8qJMVSttd9B/PMKupmddcxbUHJa04nN0iqdMPgxi2kx/H7jWcoo2MIrCij1vynx0pO5u/4P3v7wfngz0PZwaqjAvDvshAJULkmY4nHK++RRCJ8Ml4A7pgM3XFCc3FcXEQQdfeZfeo9JnhYDnYn2gfJjLwjX+LtPmlTy2lhF4dYoDWg7YKNUufeA+a+qw09500r00mn8P34GTVhvkrnBlK+adz0r0HZ6qfRmRLNu7JpOGx1Saat+8TeoYJ8O+q7hgYHMVqxgU1XZmUdU6BMg0RVNMU3nTn87o4UmGUn8IX7bdYJ6iFxYIL8xQJQCNXAs66v4i4B6yVfSvOsvArhro6x3+EyPXRLT+p+cnGKiNyMqBmjTlZd2UTujx3ziawE9grxHdoSkin8neyYVrEG1CoIJqC+J6nnIWHk8sm89HHKxhngQqZKiuRYi0TOYdRpKGJH3tJDqpVk66VQr3nO4ciaOCnJlKSk8Gc= - secure: cCBqL4SXhRodrrZydl8KarefizmhJMyWRuywleeIaluiIt1OM1S2JpwAg2tWNN3pjrLhXQIOeSYR4Q6R4eaVp9YcmWB6gkiYRdnjWHsaufnviz0Dz2KJrSMDAcMAOFWIQwEmXxI2znAKitBnpjAZOVgOqFKeLfAFhDPlQbM4S++n0rKUL4sMCrrUv+DskPGlreH0LFzHzL3OnzkKBRg73bQ8sXAnwJZKU1VV+xNetBKB4CQwS2jPcfHUZC7OJJB0795uGCC8DiTA+VY+T8frpeH7NhD6gAyEwq5QG5oO7l+sVBFfWWJWX8Zi8qCBq4KAPxv48UHPqc/DlawDyszSC6PpTZv4slvn55gvh5lIrUJp4/29Zcr+0MFj9J+3/j/d9YldZ0lqjPisAM44h2TXQs7jnu4o1YMlZQQ7q2yxyDGG/SMe4P+wJLQgOdWUmSqdAyl3D1krrfVPV3LiEYgDugsYVZP40Ooh45S8t9pc3AIUP+R1nQT3UZ/2Nkx6WDTMzkXVcRYEA3t50oX+QzOpX6oyuThhS+N1sbPH9sQbrhLGjYAIHmF/Vt9JsYeP84ju7rZg3ml6WT0TBVioAPfDbEDQZoCKBz8P+wMqR13jcrAH837sEHttrP8keaZ1An5pvZOG9THeKiIagH/hwlVkcgg9AzPz2YGq96f2C6rnE70= matrix: + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=15 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index 55a1c24..c788a4d 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,8 @@ All currently supported versions of `Qt` should be available as tags. I added al | Tags | Size | Layers | | ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------------ | -| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.2]][lnk_5.14.2] | [![imgSizeInfo][size_img_5.14.2]][lnk_5.14.2] | [![imgLayerInfo][layers_img_5.14.2]][lnk_5.14.2] | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.15]][lnk_5.15] [![imgVerInfo][ver_img_5.15.0]][lnk_5.15.0] | [![imgSizeInfo][size_img_5.15.0]][lnk_5.15.0] | [![imgLayerInfo][layers_img_5.15.0]][lnk_5.15.0] | +| [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.2]][lnk_5.14.2] | [![imgSizeInfo][size_img_5.14.2]][lnk_5.14.2] | [![imgLayerInfo][layers_img_5.14.2]][lnk_5.14.2] | | [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | [![imgLayerInfo][layers_img_5.14.1]][lnk_5.14.1] | | [![imgVerInfo][ver_img_5.14.0]][lnk_5.14.0] | [![imgSizeInfo][size_img_5.14.0]][lnk_5.14.0] | [![imgLayerInfo][layers_img_5.14.0]][lnk_5.14.0] | | [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | [![imgLayerInfo][layers_img_5.13.2]][lnk_5.13.2] | @@ -117,6 +118,16 @@ All currently supported versions of `Qt` should be available as tags. I added al [layers_img_latest]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/latest [lnk_latest]: https://microbadger.com/images/darkmattercoder/qt-build:latest +[ver_img_5.15]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.15.svg +[size_img_5.15]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.15 +[layers_img_5.15]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.15 +[lnk_5.15]: https://microbadger.com/images/darkmattercoder/qt-build:5.15 + +[ver_img_5.15.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.15.0.svg +[size_img_5.15.0]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.15.0 +[layers_img_5.15.0]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.15.0 +[lnk_5.15.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.15.0 + [ver_img_5.14]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.14.svg [size_img_5.14]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.14 [layers_img_5.14]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.14 diff --git a/buildconfig/configure-5.15.0.sh b/buildconfig/configure-5.15.0.sh new file mode 100644 index 0000000..f4ca117 --- /dev/null +++ b/buildconfig/configure-5.15.0.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 361df15..e535716 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -42,4 +42,6 @@ 5.14.1: 5.14.2: - "5.14" - - latest +5.15.0: + - "5.15" + - latest \ No newline at end of file From 3566c7234d42472a3c66dbf16073d2689ec92f21 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 27 May 2020 18:28:42 +0200 Subject: [PATCH 12/25] remove deprecated qt-xcb flag for qt 5.15.0 --- buildconfig/configure-5.15.0.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildconfig/configure-5.15.0.sh b/buildconfig/configure-5.15.0.sh index f4ca117..b530107 100644 --- a/buildconfig/configure-5.15.0.sh +++ b/buildconfig/configure-5.15.0.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file From b1f785f4aa3fd762fc0818d3cfdf69d17d975545 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 24 Jun 2020 22:24:56 +0200 Subject: [PATCH 13/25] add qt 5.12.9 --- .travis.yml | 1 + README.md | 8 +++++++- buildconfig/configure-5.12.9.sh | 3 +++ ci/tags.yml | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 buildconfig/configure-5.12.9.sh diff --git a/.travis.yml b/.travis.yml index ad2ff9b..eed9761 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ env: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=9 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=8 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=7 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=6 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index c788a4d..a5cd57f 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,8 @@ All currently supported versions of `Qt` should be available as tags. I added al | [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | [![imgLayerInfo][layers_img_5.13.2]][lnk_5.13.2] | | [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | [![imgLayerInfo][layers_img_5.13.1]][lnk_5.13.1] | | [![imgVerInfo][ver_img_5.13.0]][lnk_5.13.0] | [![imgSizeInfo][size_img_5.13.0]][lnk_5.13.0] | [![imgLayerInfo][layers_img_5.13.0]][lnk_5.13.0] | -| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.8]][lnk_5.12.8] | [![imgSizeInfo][size_img_5.12.8]][lnk_5.12.8] | [![imgLayerInfo][layers_img_5.12.8]][lnk_5.12.8] | +| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.9]][lnk_5.12.9] | [![imgSizeInfo][size_img_5.12.9]][lnk_5.12.9] | [![imgLayerInfo][layers_img_5.12.9]][lnk_5.12.9] | +| [![imgVerInfo][ver_img_5.12.8]][lnk_5.12.8] | [![imgSizeInfo][size_img_5.12.8]][lnk_5.12.8] | [![imgLayerInfo][layers_img_5.12.8]][lnk_5.12.8] | | [![imgVerInfo][ver_img_5.12.7]][lnk_5.12.7] | [![imgSizeInfo][size_img_5.12.7]][lnk_5.12.7] | [![imgLayerInfo][layers_img_5.12.7]][lnk_5.12.7] | | [![imgVerInfo][ver_img_5.12.6]][lnk_5.12.6] | [![imgSizeInfo][size_img_5.12.6]][lnk_5.12.6] | [![imgLayerInfo][layers_img_5.12.6]][lnk_5.12.6] | | [![imgVerInfo][ver_img_5.12.5]][lnk_5.12.5] | [![imgSizeInfo][size_img_5.12.5]][lnk_5.12.5] | [![imgLayerInfo][layers_img_5.12.5]][lnk_5.12.5] | @@ -173,6 +174,11 @@ All currently supported versions of `Qt` should be available as tags. I added al [layers_img_5.12]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12 [lnk_5.12]: https://microbadger.com/images/darkmattercoder/qt-build:5.12 +[ver_img_5.12.9]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.9.svg +[size_img_5.12.9]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.9 +[layers_img_5.12.9]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.9 +[lnk_5.12.9]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.9 + [ver_img_5.12.8]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.8.svg [size_img_5.12.8]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.8 [layers_img_5.12.8]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.8 diff --git a/buildconfig/configure-5.12.9.sh b/buildconfig/configure-5.12.9.sh new file mode 100644 index 0000000..f4ca117 --- /dev/null +++ b/buildconfig/configure-5.12.9.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index e535716..0c7b7f1 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -33,6 +33,7 @@ 5.12.6: 5.12.7: 5.12.8: +5.12.9: - "5.12" 5.13.0: 5.13.1: From ad4a8ec1a82817dc3d40bc006dc4bad47ed467d6 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Thu, 20 Aug 2020 21:01:00 +0200 Subject: [PATCH 14/25] update travis build environment to focal due to docker api mismatch in bionic --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eed9761..53cd593 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: bionic +dist: focal language: python python: - 3.6 From 77326ae3a8927ce0220ba6480694480a6285014b Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 23 Sep 2020 10:18:23 +0200 Subject: [PATCH 15/25] add qt 5.15.1 --- .travis.yml | 1 + README.md | 8 +++++++- buildconfig/configure-5.15.1.sh | 3 +++ ci/tags.yml | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 buildconfig/configure-5.15.1.sh diff --git a/.travis.yml b/.travis.yml index 53cd593..1780e91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: - secure: Bz/3Zzw3D7lhK61YiHHsniQAlQgDJ4XtpTg/QBjapM/I0vuBnNMKFW8s7TFyjqBhnKcAq41YHG+KIjnnTS5pD8VgDM5U//PW/rJJp/0Q+bQmL5ZG0HOzERNYUWCUtpBdrgqwmTxKvmsuQzzNruR4ERtraCuKCK0U3bAtpcNPAhwNbdfSd03SZaEc+aqEKfxr+gxZo8m/dH8qJMVSttd9B/PMKupmddcxbUHJa04nN0iqdMPgxi2kx/H7jWcoo2MIrCij1vynx0pO5u/4P3v7wfngz0PZwaqjAvDvshAJULkmY4nHK++RRCJ8Ml4A7pgM3XFCc3FcXEQQdfeZfeo9JnhYDnYn2gfJjLwjX+LtPmlTy2lhF4dYoDWg7YKNUufeA+a+qw09500r00mn8P34GTVhvkrnBlK+adz0r0HZ6qfRmRLNu7JpOGx1Saat+8TeoYJ8O+q7hgYHMVqxgU1XZmUdU6BMg0RVNMU3nTn87o4UmGUn8IX7bdYJ6iFxYIL8xQJQCNXAs66v4i4B6yVfSvOsvArhro6x3+EyPXRLT+p+cnGKiNyMqBmjTlZd2UTujx3ziawE9grxHdoSkin8neyYVrEG1CoIJqC+J6nnIWHk8sm89HHKxhngQqZKiuRYi0TOYdRpKGJH3tJDqpVk66VQr3nO4ciaOCnJlKSk8Gc= - secure: cCBqL4SXhRodrrZydl8KarefizmhJMyWRuywleeIaluiIt1OM1S2JpwAg2tWNN3pjrLhXQIOeSYR4Q6R4eaVp9YcmWB6gkiYRdnjWHsaufnviz0Dz2KJrSMDAcMAOFWIQwEmXxI2znAKitBnpjAZOVgOqFKeLfAFhDPlQbM4S++n0rKUL4sMCrrUv+DskPGlreH0LFzHzL3OnzkKBRg73bQ8sXAnwJZKU1VV+xNetBKB4CQwS2jPcfHUZC7OJJB0795uGCC8DiTA+VY+T8frpeH7NhD6gAyEwq5QG5oO7l+sVBFfWWJWX8Zi8qCBq4KAPxv48UHPqc/DlawDyszSC6PpTZv4slvn55gvh5lIrUJp4/29Zcr+0MFj9J+3/j/d9YldZ0lqjPisAM44h2TXQs7jnu4o1YMlZQQ7q2yxyDGG/SMe4P+wJLQgOdWUmSqdAyl3D1krrfVPV3LiEYgDugsYVZP40Ooh45S8t9pc3AIUP+R1nQT3UZ/2Nkx6WDTMzkXVcRYEA3t50oX+QzOpX6oyuThhS+N1sbPH9sQbrhLGjYAIHmF/Vt9JsYeP84ju7rZg3ml6WT0TBVioAPfDbEDQZoCKBz8P+wMqR13jcrAH837sEHttrP8keaZ1An5pvZOG9THeKiIagH/hwlVkcgg9AzPz2YGq96f2C6rnE70= matrix: + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=15 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=15 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index a5cd57f..76a75b8 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,8 @@ All currently supported versions of `Qt` should be available as tags. I added al | Tags | Size | Layers | | ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------------ | -| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.15]][lnk_5.15] [![imgVerInfo][ver_img_5.15.0]][lnk_5.15.0] | [![imgSizeInfo][size_img_5.15.0]][lnk_5.15.0] | [![imgLayerInfo][layers_img_5.15.0]][lnk_5.15.0] | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.15]][lnk_5.15] [![imgVerInfo][ver_img_5.15.1]][lnk_5.15.1] | [![imgSizeInfo][size_img_5.15.1]][lnk_5.15.1] | [![imgLayerInfo][layers_img_5.15.1]][lnk_5.15.1] | +| [![imgVerInfo][ver_img_5.15.0]][lnk_5.15.0] | [![imgSizeInfo][size_img_5.15.0]][lnk_5.15.0] | [![imgLayerInfo][layers_img_5.15.0]][lnk_5.15.0] | | [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.2]][lnk_5.14.2] | [![imgSizeInfo][size_img_5.14.2]][lnk_5.14.2] | [![imgLayerInfo][layers_img_5.14.2]][lnk_5.14.2] | | [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | [![imgLayerInfo][layers_img_5.14.1]][lnk_5.14.1] | | [![imgVerInfo][ver_img_5.14.0]][lnk_5.14.0] | [![imgSizeInfo][size_img_5.14.0]][lnk_5.14.0] | [![imgLayerInfo][layers_img_5.14.0]][lnk_5.14.0] | @@ -124,6 +125,11 @@ All currently supported versions of `Qt` should be available as tags. I added al [layers_img_5.15]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.15 [lnk_5.15]: https://microbadger.com/images/darkmattercoder/qt-build:5.15 +[ver_img_5.15.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.15.1.svg +[size_img_5.15.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.15.1 +[layers_img_5.15.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.15.1 +[lnk_5.15.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.15.1 + [ver_img_5.15.0]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.15.0.svg [size_img_5.15.0]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.15.0 [layers_img_5.15.0]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.15.0 diff --git a/buildconfig/configure-5.15.1.sh b/buildconfig/configure-5.15.1.sh new file mode 100644 index 0000000..b530107 --- /dev/null +++ b/buildconfig/configure-5.15.1.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 0c7b7f1..58980db 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -44,5 +44,6 @@ 5.14.2: - "5.14" 5.15.0: +5.15.1: - "5.15" - latest \ No newline at end of file From 73a9b6460d77d38182c3353c10901ab6bee4a3d4 Mon Sep 17 00:00:00 2001 From: AlexV Date: Tue, 20 Oct 2020 15:21:50 +0200 Subject: [PATCH 16/25] adding default values for local docker build --- build-dockerfile-local.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build-dockerfile-local.sh b/build-dockerfile-local.sh index 53d5a9f..91dd560 100755 --- a/build-dockerfile-local.sh +++ b/build-dockerfile-local.sh @@ -2,17 +2,17 @@ # Call this script like so: #./build-dockerfile-local.sh 5 6 0 official_releases everywhere-opensource 2 8 set -e -QT_VERSION_MAJOR=$1 -QT_VERSION_MINOR=$2 -QT_VERSION_PATCH=$3 -QT_DOWNLOAD_BRANCH=$4 -QT_TARBALL_NAMING_SCHEME=$5 -CI_BUILD=$6 -CORE_COUNT=$7 +QT_VERSION_MAJOR=${1:-5} +QT_VERSION_MINOR=${2:-12} +QT_VERSION_PATCH=${3:-9} +QT_DOWNLOAD_BRANCH=${4:-official_releases} +QT_TARBALL_NAMING_SCHEME=${5:-everywhere} +CI_BUILD=${6:-2} +CORE_COUNT=${7:-4} PROXY=$8 # base docker build --pull --cache-from darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --build-arg PROXY=$PROXY --target=base -t darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . # builder docker build --pull --cache-from darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --build-arg PROXY=$PROXY --target=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . # qt -docker build --pull --cache-from darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=qt -t darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . \ No newline at end of file +docker build --pull --cache-from darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH --build-arg QT_VERSION_MAJOR=$QT_VERSION_MAJOR --build-arg QT_VERSION_MINOR=$QT_VERSION_MINOR --build-arg QT_VERSION_PATCH=$QT_VERSION_PATCH --build-arg QT_DOWNLOAD_BRANCH=$QT_DOWNLOAD_BRANCH --build-arg QT_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=qt -t darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . From 3f43b551c7d6328bf5ee63e7dfb73b9e167c043b Mon Sep 17 00:00:00 2001 From: AlexV Date: Tue, 20 Oct 2020 16:43:58 +0200 Subject: [PATCH 17/25] adding sudo capabilities for the user --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index baebce6..c2ba165 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,8 @@ ENV QT_PREFIX=/usr/local # Install all build dependencies RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recommends install \ ca-certificates \ + # sudo to be able to modify the container as the user, if needed. + sudo \ curl \ python \ gperf \ @@ -71,6 +73,10 @@ RUN if [ ${USER_GID} ]; then \ useradd -g ${QT_USERNAME} ${QT_USERNAME}; \ fi && mkdir /home/${QT_USERNAME} +# make sure the user is able to sudo if needed +RUN adduser ${QT_USERNAME} sudo +RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + # build stage FROM base as builder From f7cffb0bb19c89134483dcb631aa27d031fe8c15 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 28 Oct 2020 13:15:34 +0100 Subject: [PATCH 18/25] add xcb plugin presence test --- .gitignore | 2 ++ tests/xcb-plugin/main.cpp | 15 +++++++++++++++ tests/xcb-plugin/xcb-plugin.pro | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100755 tests/xcb-plugin/main.cpp create mode 100755 tests/xcb-plugin/xcb-plugin.pro diff --git a/.gitignore b/.gitignore index 71e9088..aef3a3e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ Makefile run-tests.sh tests.pro /.qmake.stash +tests/build-* +*.pro.user* diff --git a/tests/xcb-plugin/main.cpp b/tests/xcb-plugin/main.cpp new file mode 100755 index 0000000..ab1641e --- /dev/null +++ b/tests/xcb-plugin/main.cpp @@ -0,0 +1,15 @@ +#include +#include +//#define PLUGIN_DIR "plugindir" +int main() { + QString platformDir = QString(PLUGIN_DIR) + "\\platforms"; + QDir pluginDir(platformDir); + QStringList platformPlugins = pluginDir.entryList(); + qDebug() << "plugins found in file system: " << platformPlugins; + if (platformPlugins.contains("libqxcb.so")) { + qDebug() << "xcb plugin found"; + return 0; + } + qDebug() << "xcb plugin not found"; + return 1; +} diff --git a/tests/xcb-plugin/xcb-plugin.pro b/tests/xcb-plugin/xcb-plugin.pro new file mode 100755 index 0000000..92dd0ca --- /dev/null +++ b/tests/xcb-plugin/xcb-plugin.pro @@ -0,0 +1,7 @@ +QT += core +QT -= gui +TARGET = xcb-plugin +CONFIG += console +TEMPLATE = app +SOURCES += main.cpp +DEFINES += PLUGIN_DIR=\\\"$$[QT_INSTALL_PLUGINS]\\\" From 8b382ebe097f939a447a217a3f69bab87f25df61 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 28 Oct 2020 18:19:37 +0100 Subject: [PATCH 19/25] add working xcb config for qt 5.15 --- Dockerfile | 10 ++++++++++ buildconfig/configure-5.15.0.sh | 2 +- buildconfig/configure-5.15.1.sh | 2 +- tests/xcb-plugin/main.cpp | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c2ba165..d9eca8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,16 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme libx11-xcb-dev \ libxcb-glx0-dev \ libxkbcommon-x11-dev \ + libxcb-shm0-dev \ + libxcb-icccm4-dev \ + libxcb-image0-dev \ + libxcb-keysyms1-dev \ + libxcb-render-util0-dev \ + libxcb-xinerama0-dev \ + x11proto-record-dev \ + libxtst-dev \ + libatspi2.0-dev \ + libatk-bridge2.0-dev \ # bash needed for argument substitution in entrypoint bash \ # since 5.14.0 we apparently need libdbus-1-dev and libnss3-dev diff --git a/buildconfig/configure-5.15.0.sh b/buildconfig/configure-5.15.0.sh index b530107..d160759 100644 --- a/buildconfig/configure-5.15.0.sh +++ b/buildconfig/configure-5.15.0.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine -xcb -bundled-xcb-xinput \ No newline at end of file diff --git a/buildconfig/configure-5.15.1.sh b/buildconfig/configure-5.15.1.sh index b530107..8672377 100644 --- a/buildconfig/configure-5.15.1.sh +++ b/buildconfig/configure-5.15.1.sh @@ -1,3 +1,3 @@ #!/bin/sh sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine \ No newline at end of file +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine -xcb -bundled-xcb-xinput \ No newline at end of file diff --git a/tests/xcb-plugin/main.cpp b/tests/xcb-plugin/main.cpp index ab1641e..3699cde 100755 --- a/tests/xcb-plugin/main.cpp +++ b/tests/xcb-plugin/main.cpp @@ -2,7 +2,8 @@ #include //#define PLUGIN_DIR "plugindir" int main() { - QString platformDir = QString(PLUGIN_DIR) + "\\platforms"; + QString platformDir = QString(PLUGIN_DIR) + "/platforms"; + qDebug() << "searching plugin in directory " << platformDir; QDir pluginDir(platformDir); QStringList platformPlugins = pluginDir.entryList(); qDebug() << "plugins found in file system: " << platformPlugins; From 6b646ae7d95acf4e474128e5a91425d054203f6a Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 10 Nov 2020 23:49:26 +0100 Subject: [PATCH 20/25] add qt 5.12.10 --- .travis.yml | 1 + README.md | 86 +++++++++++++++++--------------- buildconfig/configure-5.12.10.sh | 3 ++ ci/tags.yml | 1 + 4 files changed, 51 insertions(+), 40 deletions(-) create mode 100644 buildconfig/configure-5.12.10.sh diff --git a/.travis.yml b/.travis.yml index 1780e91..fc5f923 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ env: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=10 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=9 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=8 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=7 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index 76a75b8..0ac4ec6 100644 --- a/README.md +++ b/README.md @@ -74,46 +74,47 @@ In case you want to do a quick, customised build like I do it in the automated b All currently supported versions of `Qt` should be available as tags. I added also versions that have been supported at the time adding them first, but are now archived. I'd like to add other archived versions, too, but I did not yet put any effort into thet. This is no hard work though, so might be a nice ![first contribution](https://img.shields.io/badge/-first_contribution-006b75.svg) -| Tags | Size | Layers | -| ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------------ | -| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.15]][lnk_5.15] [![imgVerInfo][ver_img_5.15.1]][lnk_5.15.1] | [![imgSizeInfo][size_img_5.15.1]][lnk_5.15.1] | [![imgLayerInfo][layers_img_5.15.1]][lnk_5.15.1] | -| [![imgVerInfo][ver_img_5.15.0]][lnk_5.15.0] | [![imgSizeInfo][size_img_5.15.0]][lnk_5.15.0] | [![imgLayerInfo][layers_img_5.15.0]][lnk_5.15.0] | -| [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.2]][lnk_5.14.2] | [![imgSizeInfo][size_img_5.14.2]][lnk_5.14.2] | [![imgLayerInfo][layers_img_5.14.2]][lnk_5.14.2] | -| [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | [![imgLayerInfo][layers_img_5.14.1]][lnk_5.14.1] | -| [![imgVerInfo][ver_img_5.14.0]][lnk_5.14.0] | [![imgSizeInfo][size_img_5.14.0]][lnk_5.14.0] | [![imgLayerInfo][layers_img_5.14.0]][lnk_5.14.0] | -| [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | [![imgLayerInfo][layers_img_5.13.2]][lnk_5.13.2] | -| [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | [![imgLayerInfo][layers_img_5.13.1]][lnk_5.13.1] | -| [![imgVerInfo][ver_img_5.13.0]][lnk_5.13.0] | [![imgSizeInfo][size_img_5.13.0]][lnk_5.13.0] | [![imgLayerInfo][layers_img_5.13.0]][lnk_5.13.0] | -| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.9]][lnk_5.12.9] | [![imgSizeInfo][size_img_5.12.9]][lnk_5.12.9] | [![imgLayerInfo][layers_img_5.12.9]][lnk_5.12.9] | -| [![imgVerInfo][ver_img_5.12.8]][lnk_5.12.8] | [![imgSizeInfo][size_img_5.12.8]][lnk_5.12.8] | [![imgLayerInfo][layers_img_5.12.8]][lnk_5.12.8] | -| [![imgVerInfo][ver_img_5.12.7]][lnk_5.12.7] | [![imgSizeInfo][size_img_5.12.7]][lnk_5.12.7] | [![imgLayerInfo][layers_img_5.12.7]][lnk_5.12.7] | -| [![imgVerInfo][ver_img_5.12.6]][lnk_5.12.6] | [![imgSizeInfo][size_img_5.12.6]][lnk_5.12.6] | [![imgLayerInfo][layers_img_5.12.6]][lnk_5.12.6] | -| [![imgVerInfo][ver_img_5.12.5]][lnk_5.12.5] | [![imgSizeInfo][size_img_5.12.5]][lnk_5.12.5] | [![imgLayerInfo][layers_img_5.12.5]][lnk_5.12.5] | -| [![imgVerInfo][ver_img_5.12.4]][lnk_5.12.4] | [![imgSizeInfo][size_img_5.12.4]][lnk_5.12.4] | [![imgLayerInfo][layers_img_5.12.4]][lnk_5.12.4] | -| [![imgVerInfo][ver_img_5.12.3]][lnk_5.12.3] | [![imgSizeInfo][size_img_5.12.3]][lnk_5.12.3] | [![imgLayerInfo][layers_img_5.12.3]][lnk_5.12.3] | -| [![imgVerInfo][ver_img_5.12.2]][lnk_5.12.2] | [![imgSizeInfo][size_img_5.12.2]][lnk_5.12.2] | [![imgLayerInfo][layers_img_5.12.2]][lnk_5.12.2] | -| [![imgVerInfo][ver_img_5.12.1]][lnk_5.12.1] | [![imgSizeInfo][size_img_5.12.1]][lnk_5.12.1] | [![imgLayerInfo][layers_img_5.12.1]][lnk_5.12.1] | -| [![imgVerInfo][ver_img_5.12.0]][lnk_5.12.0] | [![imgSizeInfo][size_img_5.12.0]][lnk_5.12.0] | [![imgLayerInfo][layers_img_5.12.0]][lnk_5.12.0] | -| [![imgVerInfo][ver_img_5.11]][lnk_5.11] [![imgVerInfo][ver_img_5.11.3]][lnk_5.11.3] | [![imgSizeInfo][size_img_5.11.3]][lnk_5.11.3] | [![imgLayerInfo][layers_img_5.11.3]][lnk_5.11.3] | -| [![imgVerInfo][ver_img_5.11.2]][lnk_5.11.2] | [![imgSizeInfo][size_img_5.11.2]][lnk_5.11.2] | [![imgLayerInfo][layers_img_5.11.2]][lnk_5.11.2] | -| [![imgVerInfo][ver_img_5.11.1]][lnk_5.11.1] | [![imgSizeInfo][size_img_5.11.1]][lnk_5.11.1] | [![imgLayerInfo][layers_img_5.11.1]][lnk_5.11.1] | -| [![imgVerInfo][ver_img_5.11.0]][lnk_5.11.0] | [![imgSizeInfo][size_img_5.11.0]][lnk_5.11.0] | [![imgLayerInfo][layers_img_5.11.0]][lnk_5.11.0] | -| [![imgVerInfo][ver_img_5.10]][lnk_5.10] [![imgVerInfo][ver_img_5.10.1]][lnk_5.10.1] | [![imgSizeInfo][size_img_5.10.1]][lnk_5.10.1] | [![imgLayerInfo][layers_img_5.10.1]][lnk_5.10.1] | -| [![imgVerInfo][ver_img_5.10.0]][lnk_5.10.0] | [![imgSizeInfo][size_img_5.10.0]][lnk_5.10.0] | [![imgLayerInfo][layers_img_5.10.0]][lnk_5.10.0] | -| [![imgVerInfo][ver_img_5.9]][lnk_5.9] [![imgVerInfo][ver_img_5.9.9]][lnk_5.9.9] | [![imgSizeInfo][size_img_5.9.9]][lnk_5.9.9] | [![imgLayerInfo][layers_img_5.9.9]][lnk_5.9.9] | -| [![imgVerInfo][ver_img_5.9.8]][lnk_5.9.8] | [![imgSizeInfo][size_img_5.9.8]][lnk_5.9.8] | [![imgLayerInfo][layers_img_5.9.8]][lnk_5.9.8] | -| [![imgVerInfo][ver_img_5.9.7]][lnk_5.9.7] | [![imgSizeInfo][size_img_5.9.7]][lnk_5.9.7] | [![imgLayerInfo][layers_img_5.9.7]][lnk_5.9.7] | -| [![imgVerInfo][ver_img_5.9.6]][lnk_5.9.6] | [![imgSizeInfo][size_img_5.9.6]][lnk_5.9.6] | [![imgLayerInfo][layers_img_5.9.6]][lnk_5.9.6] | -| [![imgVerInfo][ver_img_5.9.5]][lnk_5.9.5] | [![imgSizeInfo][size_img_5.9.5]][lnk_5.9.5] | [![imgLayerInfo][layers_img_5.9.5]][lnk_5.9.5] | -| [![imgVerInfo][ver_img_5.9.4]][lnk_5.9.4] | [![imgSizeInfo][size_img_5.9.4]][lnk_5.9.4] | [![imgLayerInfo][layers_img_5.9.4]][lnk_5.9.4] | -| [![imgVerInfo][ver_img_5.9.3]][lnk_5.9.3] | [![imgSizeInfo][size_img_5.9.3]][lnk_5.9.3] | [![imgLayerInfo][layers_img_5.9.3]][lnk_5.9.3] | -| [![imgVerInfo][ver_img_5.9.2]][lnk_5.9.2] | [![imgSizeInfo][size_img_5.9.2]][lnk_5.9.2] | [![imgLayerInfo][layers_img_5.9.2]][lnk_5.9.2] | -| [![imgVerInfo][ver_img_5.9.1]][lnk_5.9.1] | [![imgSizeInfo][size_img_5.9.1]][lnk_5.9.1] | [![imgLayerInfo][layers_img_5.9.1]][lnk_5.9.1] | -| [![imgVerInfo][ver_img_5.9.0]][lnk_5.9.0] | [![imgSizeInfo][size_img_5.9.0]][lnk_5.9.0] | [![imgLayerInfo][layers_img_5.9.0]][lnk_5.9.0] | -| [![imgVerInfo][ver_img_5.6]][lnk_5.6] [![imgVerInfo][ver_img_5.6.3]][lnk_5.6.3] | [![imgSizeInfo][size_img_5.6.3]][lnk_5.6.3] | [![imgLayerInfo][layers_img_5.6.3]][lnk_5.6.3] | -| [![imgVerInfo][ver_img_5.6.2]][lnk_5.6.2] | [![imgSizeInfo][size_img_5.6.2]][lnk_5.6.2] | [![imgLayerInfo][layers_img_5.6.2]][lnk_5.6.2] | -| [![imgVerInfo][ver_img_5.6.1-1]][lnk_5.6.1-1] [![imgVerInfo][ver_img_5.6.1]][lnk_5.6.1] | [![imgSizeInfo][size_img_5.6.1]][lnk_5.6.1] | [![imgLayerInfo][layers_img_5.6.1]][lnk_5.6.1] | -| [![imgVerInfo][ver_img_5.6.0]][lnk_5.6.0] | [![imgSizeInfo][size_img_5.6.0]][lnk_5.6.0] | [![imgLayerInfo][layers_img_5.6.0]][lnk_5.6.0] | +| Tags | Size | Layers | +| ------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | -------------------------------------------------- | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.15]][lnk_5.15] [![imgVerInfo][ver_img_5.15.1]][lnk_5.15.1] | [![imgSizeInfo][size_img_5.15.1]][lnk_5.15.1] | [![imgLayerInfo][layers_img_5.15.1]][lnk_5.15.1] | +| [![imgVerInfo][ver_img_5.15.0]][lnk_5.15.0] | [![imgSizeInfo][size_img_5.15.0]][lnk_5.15.0] | [![imgLayerInfo][layers_img_5.15.0]][lnk_5.15.0] | +| [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.2]][lnk_5.14.2] | [![imgSizeInfo][size_img_5.14.2]][lnk_5.14.2] | [![imgLayerInfo][layers_img_5.14.2]][lnk_5.14.2] | +| [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | [![imgLayerInfo][layers_img_5.14.1]][lnk_5.14.1] | +| [![imgVerInfo][ver_img_5.14.0]][lnk_5.14.0] | [![imgSizeInfo][size_img_5.14.0]][lnk_5.14.0] | [![imgLayerInfo][layers_img_5.14.0]][lnk_5.14.0] | +| [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.2]][lnk_5.13.2] | [![imgSizeInfo][size_img_5.13.2]][lnk_5.13.2] | [![imgLayerInfo][layers_img_5.13.2]][lnk_5.13.2] | +| [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | [![imgLayerInfo][layers_img_5.13.1]][lnk_5.13.1] | +| [![imgVerInfo][ver_img_5.13.0]][lnk_5.13.0] | [![imgSizeInfo][size_img_5.13.0]][lnk_5.13.0] | [![imgLayerInfo][layers_img_5.13.0]][lnk_5.13.0] | +| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.10]][lnk_5.12.10] | [![imgSizeInfo][size_img_5.12.10]][lnk_5.12.10] | [![imgLayerInfo][layers_img_5.12.10]][lnk_5.12.10] | +| [![imgVerInfo][ver_img_5.12.9]][lnk_5.12.9] | [![imgSizeInfo][size_img_5.12.9]][lnk_5.12.9] | [![imgLayerInfo][layers_img_5.12.9]][lnk_5.12.9] | +| [![imgVerInfo][ver_img_5.12.8]][lnk_5.12.8] | [![imgSizeInfo][size_img_5.12.8]][lnk_5.12.8] | [![imgLayerInfo][layers_img_5.12.8]][lnk_5.12.8] | +| [![imgVerInfo][ver_img_5.12.7]][lnk_5.12.7] | [![imgSizeInfo][size_img_5.12.7]][lnk_5.12.7] | [![imgLayerInfo][layers_img_5.12.7]][lnk_5.12.7] | +| [![imgVerInfo][ver_img_5.12.6]][lnk_5.12.6] | [![imgSizeInfo][size_img_5.12.6]][lnk_5.12.6] | [![imgLayerInfo][layers_img_5.12.6]][lnk_5.12.6] | +| [![imgVerInfo][ver_img_5.12.5]][lnk_5.12.5] | [![imgSizeInfo][size_img_5.12.5]][lnk_5.12.5] | [![imgLayerInfo][layers_img_5.12.5]][lnk_5.12.5] | +| [![imgVerInfo][ver_img_5.12.4]][lnk_5.12.4] | [![imgSizeInfo][size_img_5.12.4]][lnk_5.12.4] | [![imgLayerInfo][layers_img_5.12.4]][lnk_5.12.4] | +| [![imgVerInfo][ver_img_5.12.3]][lnk_5.12.3] | [![imgSizeInfo][size_img_5.12.3]][lnk_5.12.3] | [![imgLayerInfo][layers_img_5.12.3]][lnk_5.12.3] | +| [![imgVerInfo][ver_img_5.12.2]][lnk_5.12.2] | [![imgSizeInfo][size_img_5.12.2]][lnk_5.12.2] | [![imgLayerInfo][layers_img_5.12.2]][lnk_5.12.2] | +| [![imgVerInfo][ver_img_5.12.1]][lnk_5.12.1] | [![imgSizeInfo][size_img_5.12.1]][lnk_5.12.1] | [![imgLayerInfo][layers_img_5.12.1]][lnk_5.12.1] | +| [![imgVerInfo][ver_img_5.12.0]][lnk_5.12.0] | [![imgSizeInfo][size_img_5.12.0]][lnk_5.12.0] | [![imgLayerInfo][layers_img_5.12.0]][lnk_5.12.0] | +| [![imgVerInfo][ver_img_5.11]][lnk_5.11] [![imgVerInfo][ver_img_5.11.3]][lnk_5.11.3] | [![imgSizeInfo][size_img_5.11.3]][lnk_5.11.3] | [![imgLayerInfo][layers_img_5.11.3]][lnk_5.11.3] | +| [![imgVerInfo][ver_img_5.11.2]][lnk_5.11.2] | [![imgSizeInfo][size_img_5.11.2]][lnk_5.11.2] | [![imgLayerInfo][layers_img_5.11.2]][lnk_5.11.2] | +| [![imgVerInfo][ver_img_5.11.1]][lnk_5.11.1] | [![imgSizeInfo][size_img_5.11.1]][lnk_5.11.1] | [![imgLayerInfo][layers_img_5.11.1]][lnk_5.11.1] | +| [![imgVerInfo][ver_img_5.11.0]][lnk_5.11.0] | [![imgSizeInfo][size_img_5.11.0]][lnk_5.11.0] | [![imgLayerInfo][layers_img_5.11.0]][lnk_5.11.0] | +| [![imgVerInfo][ver_img_5.10]][lnk_5.10] [![imgVerInfo][ver_img_5.10.1]][lnk_5.10.1] | [![imgSizeInfo][size_img_5.10.1]][lnk_5.10.1] | [![imgLayerInfo][layers_img_5.10.1]][lnk_5.10.1] | +| [![imgVerInfo][ver_img_5.10.0]][lnk_5.10.0] | [![imgSizeInfo][size_img_5.10.0]][lnk_5.10.0] | [![imgLayerInfo][layers_img_5.10.0]][lnk_5.10.0] | +| [![imgVerInfo][ver_img_5.9]][lnk_5.9] [![imgVerInfo][ver_img_5.9.9]][lnk_5.9.9] | [![imgSizeInfo][size_img_5.9.9]][lnk_5.9.9] | [![imgLayerInfo][layers_img_5.9.9]][lnk_5.9.9] | +| [![imgVerInfo][ver_img_5.9.8]][lnk_5.9.8] | [![imgSizeInfo][size_img_5.9.8]][lnk_5.9.8] | [![imgLayerInfo][layers_img_5.9.8]][lnk_5.9.8] | +| [![imgVerInfo][ver_img_5.9.7]][lnk_5.9.7] | [![imgSizeInfo][size_img_5.9.7]][lnk_5.9.7] | [![imgLayerInfo][layers_img_5.9.7]][lnk_5.9.7] | +| [![imgVerInfo][ver_img_5.9.6]][lnk_5.9.6] | [![imgSizeInfo][size_img_5.9.6]][lnk_5.9.6] | [![imgLayerInfo][layers_img_5.9.6]][lnk_5.9.6] | +| [![imgVerInfo][ver_img_5.9.5]][lnk_5.9.5] | [![imgSizeInfo][size_img_5.9.5]][lnk_5.9.5] | [![imgLayerInfo][layers_img_5.9.5]][lnk_5.9.5] | +| [![imgVerInfo][ver_img_5.9.4]][lnk_5.9.4] | [![imgSizeInfo][size_img_5.9.4]][lnk_5.9.4] | [![imgLayerInfo][layers_img_5.9.4]][lnk_5.9.4] | +| [![imgVerInfo][ver_img_5.9.3]][lnk_5.9.3] | [![imgSizeInfo][size_img_5.9.3]][lnk_5.9.3] | [![imgLayerInfo][layers_img_5.9.3]][lnk_5.9.3] | +| [![imgVerInfo][ver_img_5.9.2]][lnk_5.9.2] | [![imgSizeInfo][size_img_5.9.2]][lnk_5.9.2] | [![imgLayerInfo][layers_img_5.9.2]][lnk_5.9.2] | +| [![imgVerInfo][ver_img_5.9.1]][lnk_5.9.1] | [![imgSizeInfo][size_img_5.9.1]][lnk_5.9.1] | [![imgLayerInfo][layers_img_5.9.1]][lnk_5.9.1] | +| [![imgVerInfo][ver_img_5.9.0]][lnk_5.9.0] | [![imgSizeInfo][size_img_5.9.0]][lnk_5.9.0] | [![imgLayerInfo][layers_img_5.9.0]][lnk_5.9.0] | +| [![imgVerInfo][ver_img_5.6]][lnk_5.6] [![imgVerInfo][ver_img_5.6.3]][lnk_5.6.3] | [![imgSizeInfo][size_img_5.6.3]][lnk_5.6.3] | [![imgLayerInfo][layers_img_5.6.3]][lnk_5.6.3] | +| [![imgVerInfo][ver_img_5.6.2]][lnk_5.6.2] | [![imgSizeInfo][size_img_5.6.2]][lnk_5.6.2] | [![imgLayerInfo][layers_img_5.6.2]][lnk_5.6.2] | +| [![imgVerInfo][ver_img_5.6.1-1]][lnk_5.6.1-1] [![imgVerInfo][ver_img_5.6.1]][lnk_5.6.1] | [![imgSizeInfo][size_img_5.6.1]][lnk_5.6.1] | [![imgLayerInfo][layers_img_5.6.1]][lnk_5.6.1] | +| [![imgVerInfo][ver_img_5.6.0]][lnk_5.6.0] | [![imgSizeInfo][size_img_5.6.0]][lnk_5.6.0] | [![imgLayerInfo][layers_img_5.6.0]][lnk_5.6.0] | [ver_img_latest]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:latest.svg [size_img_latest]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/latest @@ -180,6 +181,11 @@ All currently supported versions of `Qt` should be available as tags. I added al [layers_img_5.12]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12 [lnk_5.12]: https://microbadger.com/images/darkmattercoder/qt-build:5.12 +[ver_img_5.12.10]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.10.svg +[size_img_5.12.10]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.10 +[layers_img_5.12.10]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.10 +[lnk_5.12.10]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.10 + [ver_img_5.12.9]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.12.9.svg [size_img_5.12.9]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.12.9 [layers_img_5.12.9]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.12.9 diff --git a/buildconfig/configure-5.12.10.sh b/buildconfig/configure-5.12.10.sh new file mode 100644 index 0000000..f4ca117 --- /dev/null +++ b/buildconfig/configure-5.12.10.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -skip qtwebengine \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 58980db..2e1e432 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -34,6 +34,7 @@ 5.12.7: 5.12.8: 5.12.9: +5.12.10: - "5.12" 5.13.0: 5.13.1: From c2b4fa07406addea3ec3b1dc6f0bc098c22d07ea Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Fri, 20 Nov 2020 17:20:38 +0100 Subject: [PATCH 21/25] add qt 5.15.2 --- .travis.yml | 1 + README.md | 8 +++++++- buildconfig/configure-5.15.2.sh | 3 +++ ci/tags.yml | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 buildconfig/configure-5.15.2.sh diff --git a/.travis.yml b/.travis.yml index fc5f923..192debf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: - secure: Bz/3Zzw3D7lhK61YiHHsniQAlQgDJ4XtpTg/QBjapM/I0vuBnNMKFW8s7TFyjqBhnKcAq41YHG+KIjnnTS5pD8VgDM5U//PW/rJJp/0Q+bQmL5ZG0HOzERNYUWCUtpBdrgqwmTxKvmsuQzzNruR4ERtraCuKCK0U3bAtpcNPAhwNbdfSd03SZaEc+aqEKfxr+gxZo8m/dH8qJMVSttd9B/PMKupmddcxbUHJa04nN0iqdMPgxi2kx/H7jWcoo2MIrCij1vynx0pO5u/4P3v7wfngz0PZwaqjAvDvshAJULkmY4nHK++RRCJ8Ml4A7pgM3XFCc3FcXEQQdfeZfeo9JnhYDnYn2gfJjLwjX+LtPmlTy2lhF4dYoDWg7YKNUufeA+a+qw09500r00mn8P34GTVhvkrnBlK+adz0r0HZ6qfRmRLNu7JpOGx1Saat+8TeoYJ8O+q7hgYHMVqxgU1XZmUdU6BMg0RVNMU3nTn87o4UmGUn8IX7bdYJ6iFxYIL8xQJQCNXAs66v4i4B6yVfSvOsvArhro6x3+EyPXRLT+p+cnGKiNyMqBmjTlZd2UTujx3ziawE9grxHdoSkin8neyYVrEG1CoIJqC+J6nnIWHk8sm89HHKxhngQqZKiuRYi0TOYdRpKGJH3tJDqpVk66VQr3nO4ciaOCnJlKSk8Gc= - secure: cCBqL4SXhRodrrZydl8KarefizmhJMyWRuywleeIaluiIt1OM1S2JpwAg2tWNN3pjrLhXQIOeSYR4Q6R4eaVp9YcmWB6gkiYRdnjWHsaufnviz0Dz2KJrSMDAcMAOFWIQwEmXxI2znAKitBnpjAZOVgOqFKeLfAFhDPlQbM4S++n0rKUL4sMCrrUv+DskPGlreH0LFzHzL3OnzkKBRg73bQ8sXAnwJZKU1VV+xNetBKB4CQwS2jPcfHUZC7OJJB0795uGCC8DiTA+VY+T8frpeH7NhD6gAyEwq5QG5oO7l+sVBFfWWJWX8Zi8qCBq4KAPxv48UHPqc/DlawDyszSC6PpTZv4slvn55gvh5lIrUJp4/29Zcr+0MFj9J+3/j/d9YldZ0lqjPisAM44h2TXQs7jnu4o1YMlZQQ7q2yxyDGG/SMe4P+wJLQgOdWUmSqdAyl3D1krrfVPV3LiEYgDugsYVZP40Ooh45S8t9pc3AIUP+R1nQT3UZ/2Nkx6WDTMzkXVcRYEA3t50oX+QzOpX6oyuThhS+N1sbPH9sQbrhLGjYAIHmF/Vt9JsYeP84ju7rZg3ml6WT0TBVioAPfDbEDQZoCKBz8P+wMqR13jcrAH837sEHttrP8keaZ1An5pvZOG9THeKiIagH/hwlVkcgg9AzPz2YGq96f2C6rnE70= matrix: + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=15 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=15 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=15 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index 0ac4ec6..a94652f 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,8 @@ All currently supported versions of `Qt` should be available as tags. I added al | Tags | Size | Layers | | ------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | -------------------------------------------------- | -| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.15]][lnk_5.15] [![imgVerInfo][ver_img_5.15.1]][lnk_5.15.1] | [![imgSizeInfo][size_img_5.15.1]][lnk_5.15.1] | [![imgLayerInfo][layers_img_5.15.1]][lnk_5.15.1] | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.15]][lnk_5.15] [![imgVerInfo][ver_img_5.15.2]][lnk_5.15.2] | [![imgSizeInfo][size_img_5.15.2]][lnk_5.15.2] | [![imgLayerInfo][layers_img_5.15.2]][lnk_5.15.2] | +| [![imgVerInfo][ver_img_5.15.1]][lnk_5.15.1] | [![imgSizeInfo][size_img_5.15.1]][lnk_5.15.1] | [![imgLayerInfo][layers_img_5.15.1]][lnk_5.15.1] | | [![imgVerInfo][ver_img_5.15.0]][lnk_5.15.0] | [![imgSizeInfo][size_img_5.15.0]][lnk_5.15.0] | [![imgLayerInfo][layers_img_5.15.0]][lnk_5.15.0] | | [![imgVerInfo][ver_img_5.14]][lnk_5.14] [![imgVerInfo][ver_img_5.14.2]][lnk_5.14.2] | [![imgSizeInfo][size_img_5.14.2]][lnk_5.14.2] | [![imgLayerInfo][layers_img_5.14.2]][lnk_5.14.2] | | [![imgVerInfo][ver_img_5.14.1]][lnk_5.14.1] | [![imgSizeInfo][size_img_5.14.1]][lnk_5.14.1] | [![imgLayerInfo][layers_img_5.14.1]][lnk_5.14.1] | @@ -126,6 +127,11 @@ All currently supported versions of `Qt` should be available as tags. I added al [layers_img_5.15]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.15 [lnk_5.15]: https://microbadger.com/images/darkmattercoder/qt-build:5.15 +[ver_img_5.15.2]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.15.2.svg +[size_img_5.15.2]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.15.2 +[layers_img_5.15.2]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.15.2 +[lnk_5.15.2]: https://microbadger.com/images/darkmattercoder/qt-build:5.15.2 + [ver_img_5.15.1]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:5.15.1.svg [size_img_5.15.1]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/5.15.1 [layers_img_5.15.1]: https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/5.15.1 diff --git a/buildconfig/configure-5.15.2.sh b/buildconfig/configure-5.15.2.sh new file mode 100644 index 0000000..8672377 --- /dev/null +++ b/buildconfig/configure-5.15.2.sh @@ -0,0 +1,3 @@ +#!/bin/sh +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -skip qtwebengine -xcb -bundled-xcb-xinput \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 2e1e432..e484f18 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -46,5 +46,6 @@ - "5.14" 5.15.0: 5.15.1: +5.15.2: - "5.15" - latest \ No newline at end of file From 900b7875b1c01cc4ce32122d34822d7f13ae2ee7 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Sun, 22 Nov 2020 22:36:51 +0100 Subject: [PATCH 22/25] add missing package xcb-util Qt introduced a new requirement for xcb during configure in patch https://codereview.qt-project.org/q/39b1dea2ec5cde9523df61c78dec5d4b195f66d2+ --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index d9eca8b..31ec0e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,6 +58,7 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme libxcb-keysyms1-dev \ libxcb-render-util0-dev \ libxcb-xinerama0-dev \ + libxcb-util-dev \ x11proto-record-dev \ libxtst-dev \ libatspi2.0-dev \ From faee7496377dae21e71be715cd57957acf35403e Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 8 Dec 2020 16:19:48 +0100 Subject: [PATCH 23/25] add info about ongoing and upcoming Qt 6 effort --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index a94652f..8fa3b74 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,11 @@ Find the sources on [Github](https://github.com/darkmattercoder/qt-build) Automated builds will run weekly, thus changes in the underlying base images will reach the registry within that time. +## What about Qt 6? + +When I started this project in 2018, I had no Idea, that it would be useful for so many of you. The Qt company released Qt 6.0.0 on December 08, 2020. A lot of changes have been introduced in the code base and mainly Qt decided to finally get rid of `qmake` as build system. Since this is a siginificant change, I do not plan to provide build images for Qt 6 in this very repository. Instead, I am currently working to provide those images via a separate repository, which I do not want to include more clutter than necessary. Qt 6 is the perfect starting point for this. +However, since the user base for the images I provide through this very repository has grown in size, I will for sure not abandon this repository and keep maintaining it at least as long as Qt 5 is officially supported. Most probably even longer. Right now, my focus however is to provide good and well usable docker images for Qt 6, which is what currently requires a bit more attention than this Qt 5 based repo. Once I feel ready, I will put a corresponding link here to make readers aware of it. + ## What is missing Due to a build time limitation of 3 hours with travis ci, I unfortunately am not able to provide `qtwebengine` with my builds. Once I either get help with transferring the build pipeline to another platform, where the time limitation is not that strict, or once travis give their VMs more cores for build jobs so that the build fits in 3 hours, I can include `qtwebengine` in my builds. Until then, you have to build the image locally with the provided script (description below) and adjust the build config if you absolutely need it. From 146dd93522ae347791a704a0278ed9e0ba022704 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Mon, 1 Feb 2021 06:45:22 +0100 Subject: [PATCH 24/25] adjust 5.14 and 5.13 download link, add deprecation info on some versions --- .travis.yml | 32 ++++++++++++++++---------------- README.md | 29 ++++++++++++++++++----------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 192debf..601ecd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,12 @@ env: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=15 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=15 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=15 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=14 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=13 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=10 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=9 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=8 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 @@ -37,12 +37,12 @@ env: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=9 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=7 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 @@ -53,10 +53,10 @@ env: - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=1 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=1 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + # - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_DOWNLOAD_BRANCH=new_archive QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=1 stages: - test - merge diff --git a/README.md b/README.md index 8fa3b74..1f72187 100644 --- a/README.md +++ b/README.md @@ -75,10 +75,12 @@ The build arguments can entirely be omitted, resulting in a build with some defa In case you want to do a quick, customised build like I do it in the automated build process. Have a look at the self-explanatory script `build-dockerfile-local.sh`. -## Available tags +## Available and maintained tags All currently supported versions of `Qt` should be available as tags. I added also versions that have been supported at the time adding them first, but are now archived. I'd like to add other archived versions, too, but I did not yet put any effort into thet. This is no hard work though, so might be a nice ![first contribution](https://img.shields.io/badge/-first_contribution-006b75.svg) +Some images have been built and are available in the dockerhub registry, but due to missing sources on the qt download servers, they cannot be built automatically anymore and thus, its base layer image is not updated anymore. You should consider that when you want to use them. Find them in the second table below. + | Tags | Size | Layers | | ------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | -------------------------------------------------- | | [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.15]][lnk_5.15] [![imgVerInfo][ver_img_5.15.2]][lnk_5.15.2] | [![imgSizeInfo][size_img_5.15.2]][lnk_5.15.2] | [![imgLayerInfo][layers_img_5.15.2]][lnk_5.15.2] | @@ -101,12 +103,6 @@ All currently supported versions of `Qt` should be available as tags. I added al | [![imgVerInfo][ver_img_5.12.2]][lnk_5.12.2] | [![imgSizeInfo][size_img_5.12.2]][lnk_5.12.2] | [![imgLayerInfo][layers_img_5.12.2]][lnk_5.12.2] | | [![imgVerInfo][ver_img_5.12.1]][lnk_5.12.1] | [![imgSizeInfo][size_img_5.12.1]][lnk_5.12.1] | [![imgLayerInfo][layers_img_5.12.1]][lnk_5.12.1] | | [![imgVerInfo][ver_img_5.12.0]][lnk_5.12.0] | [![imgSizeInfo][size_img_5.12.0]][lnk_5.12.0] | [![imgLayerInfo][layers_img_5.12.0]][lnk_5.12.0] | -| [![imgVerInfo][ver_img_5.11]][lnk_5.11] [![imgVerInfo][ver_img_5.11.3]][lnk_5.11.3] | [![imgSizeInfo][size_img_5.11.3]][lnk_5.11.3] | [![imgLayerInfo][layers_img_5.11.3]][lnk_5.11.3] | -| [![imgVerInfo][ver_img_5.11.2]][lnk_5.11.2] | [![imgSizeInfo][size_img_5.11.2]][lnk_5.11.2] | [![imgLayerInfo][layers_img_5.11.2]][lnk_5.11.2] | -| [![imgVerInfo][ver_img_5.11.1]][lnk_5.11.1] | [![imgSizeInfo][size_img_5.11.1]][lnk_5.11.1] | [![imgLayerInfo][layers_img_5.11.1]][lnk_5.11.1] | -| [![imgVerInfo][ver_img_5.11.0]][lnk_5.11.0] | [![imgSizeInfo][size_img_5.11.0]][lnk_5.11.0] | [![imgLayerInfo][layers_img_5.11.0]][lnk_5.11.0] | -| [![imgVerInfo][ver_img_5.10]][lnk_5.10] [![imgVerInfo][ver_img_5.10.1]][lnk_5.10.1] | [![imgSizeInfo][size_img_5.10.1]][lnk_5.10.1] | [![imgLayerInfo][layers_img_5.10.1]][lnk_5.10.1] | -| [![imgVerInfo][ver_img_5.10.0]][lnk_5.10.0] | [![imgSizeInfo][size_img_5.10.0]][lnk_5.10.0] | [![imgLayerInfo][layers_img_5.10.0]][lnk_5.10.0] | | [![imgVerInfo][ver_img_5.9]][lnk_5.9] [![imgVerInfo][ver_img_5.9.9]][lnk_5.9.9] | [![imgSizeInfo][size_img_5.9.9]][lnk_5.9.9] | [![imgLayerInfo][layers_img_5.9.9]][lnk_5.9.9] | | [![imgVerInfo][ver_img_5.9.8]][lnk_5.9.8] | [![imgSizeInfo][size_img_5.9.8]][lnk_5.9.8] | [![imgLayerInfo][layers_img_5.9.8]][lnk_5.9.8] | | [![imgVerInfo][ver_img_5.9.7]][lnk_5.9.7] | [![imgSizeInfo][size_img_5.9.7]][lnk_5.9.7] | [![imgLayerInfo][layers_img_5.9.7]][lnk_5.9.7] | @@ -117,10 +113,21 @@ All currently supported versions of `Qt` should be available as tags. I added al | [![imgVerInfo][ver_img_5.9.2]][lnk_5.9.2] | [![imgSizeInfo][size_img_5.9.2]][lnk_5.9.2] | [![imgLayerInfo][layers_img_5.9.2]][lnk_5.9.2] | | [![imgVerInfo][ver_img_5.9.1]][lnk_5.9.1] | [![imgSizeInfo][size_img_5.9.1]][lnk_5.9.1] | [![imgLayerInfo][layers_img_5.9.1]][lnk_5.9.1] | | [![imgVerInfo][ver_img_5.9.0]][lnk_5.9.0] | [![imgSizeInfo][size_img_5.9.0]][lnk_5.9.0] | [![imgLayerInfo][layers_img_5.9.0]][lnk_5.9.0] | -| [![imgVerInfo][ver_img_5.6]][lnk_5.6] [![imgVerInfo][ver_img_5.6.3]][lnk_5.6.3] | [![imgSizeInfo][size_img_5.6.3]][lnk_5.6.3] | [![imgLayerInfo][layers_img_5.6.3]][lnk_5.6.3] | -| [![imgVerInfo][ver_img_5.6.2]][lnk_5.6.2] | [![imgSizeInfo][size_img_5.6.2]][lnk_5.6.2] | [![imgLayerInfo][layers_img_5.6.2]][lnk_5.6.2] | -| [![imgVerInfo][ver_img_5.6.1-1]][lnk_5.6.1-1] [![imgVerInfo][ver_img_5.6.1]][lnk_5.6.1] | [![imgSizeInfo][size_img_5.6.1]][lnk_5.6.1] | [![imgLayerInfo][layers_img_5.6.1]][lnk_5.6.1] | -| [![imgVerInfo][ver_img_5.6.0]][lnk_5.6.0] | [![imgSizeInfo][size_img_5.6.0]][lnk_5.6.0] | [![imgLayerInfo][layers_img_5.6.0]][lnk_5.6.0] | + +## Available but unmaintained tags + +| Tags | Size | Layers | +| --------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------------ | +| [![imgVerInfo][ver_img_5.11]][lnk_5.11] [![imgVerInfo][ver_img_5.11.3]][lnk_5.11.3] | [![imgSizeInfo][size_img_5.11.3]][lnk_5.11.3] | [![imgLayerInfo][layers_img_5.11.3]][lnk_5.11.3] | +| [![imgVerInfo][ver_img_5.11.2]][lnk_5.11.2] | [![imgSizeInfo][size_img_5.11.2]][lnk_5.11.2] | [![imgLayerInfo][layers_img_5.11.2]][lnk_5.11.2] | +| [![imgVerInfo][ver_img_5.11.1]][lnk_5.11.1] | [![imgSizeInfo][size_img_5.11.1]][lnk_5.11.1] | [![imgLayerInfo][layers_img_5.11.1]][lnk_5.11.1] | +| [![imgVerInfo][ver_img_5.11.0]][lnk_5.11.0] | [![imgSizeInfo][size_img_5.11.0]][lnk_5.11.0] | [![imgLayerInfo][layers_img_5.11.0]][lnk_5.11.0] | +| [![imgVerInfo][ver_img_5.10]][lnk_5.10] [![imgVerInfo][ver_img_5.10.1]][lnk_5.10.1] | [![imgSizeInfo][size_img_5.10.1]][lnk_5.10.1] | [![imgLayerInfo][layers_img_5.10.1]][lnk_5.10.1] | +| [![imgVerInfo][ver_img_5.10.0]][lnk_5.10.0] | [![imgSizeInfo][size_img_5.10.0]][lnk_5.10.0] | [![imgLayerInfo][layers_img_5.10.0]][lnk_5.10.0] | +| [![imgVerInfo][ver_img_5.6]][lnk_5.6] [![imgVerInfo][ver_img_5.6.3]][lnk_5.6.3] | [![imgSizeInfo][size_img_5.6.3]][lnk_5.6.3] | [![imgLayerInfo][layers_img_5.6.3]][lnk_5.6.3] | +| [![imgVerInfo][ver_img_5.6.2]][lnk_5.6.2] | [![imgSizeInfo][size_img_5.6.2]][lnk_5.6.2] | [![imgLayerInfo][layers_img_5.6.2]][lnk_5.6.2] | +| [![imgVerInfo][ver_img_5.6.1-1]][lnk_5.6.1-1] [![imgVerInfo][ver_img_5.6.1]][lnk_5.6.1] | [![imgSizeInfo][size_img_5.6.1]][lnk_5.6.1] | [![imgLayerInfo][layers_img_5.6.1]][lnk_5.6.1] | +| [![imgVerInfo][ver_img_5.6.0]][lnk_5.6.0] | [![imgSizeInfo][size_img_5.6.0]][lnk_5.6.0] | [![imgLayerInfo][layers_img_5.6.0]][lnk_5.6.0] | [ver_img_latest]: https://images.microbadger.com/badges/version/darkmattercoder/qt-build:latest.svg [size_img_latest]: https://img.shields.io/docker/image-size/darkmattercoder/qt-build/latest From dab1cd840408cae0f83e60a46de4192c08d70b64 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Thu, 3 Feb 2022 23:37:30 +0100 Subject: [PATCH 25/25] Add unmaintained notice --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 1f72187..9282596 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,15 @@ # qt-build +## Warning: Unmaintained + +As the build infrastructure provided by travis ci has entirely stopped working for open source projects. New auto builds aren't done anymore. +The base images on dockerhub are not updated regularly. As I still cannot fully understand how to easily transfer the travis-ci workflow to github actions, I cannot provide automated builds. +Automating the builds of the images is a key feature for me. But I am simply not able to get that done at the moment. So I declare this project unmaintained because I have no interest anymore to put additional effort into it. + +I am still willing to accept pull requests though. **However, no ones that do not perform an auto build using actions**. If someone is able to fix the ci/cd for me, I am willing to add at least the missing `Qt 5` versions. + +The recipe to build the images by yourself is well documented in here, so that for any present qt version configured, you simply should be able to get working images by building them the way I do. + [![Build Status](https://travis-ci.com/darkmattercoder/qt-build.svg?branch=deploy)](https://travis-ci.com/darkmattercoder/qt-build) [![Image Size information](https://img.shields.io/docker/image-size/darkmattercoder/qt-build/latest)](https://microbadger.com/images/darkmattercoder/qt-build) [![Image Layers information](https://img.shields.io/microbadger/layers/darkmattercoder/qt-build/latest)](https://microbadger.com/images/darkmattercoder/qt-build)