From bd14c5d59cedb05ffc0b500b3e0415e85a2b3834 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 21 May 2019 18:27:25 +0200 Subject: [PATCH 01/75] adding libssl-dev --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 54dd972..8196bca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,7 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme build-essential \ pkg-config \ libgl1-mesa-dev \ + libssl-dev \ # xcb dependencies libfontconfig1-dev \ libfreetype6-dev \ From 7f3b878e2995ee187bbc24ad72630971adaf6981 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 08:34:45 +0200 Subject: [PATCH 02/75] trying to build the ssl version for qt to compile --- buildconfig/configure-5.6.0.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index 12061d5..53f39ab 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -1,2 +1,13 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +LATEST_TAG=git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0 +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared +make +make test +make install + +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include/openssl -L /opt/openssl_build_stable/lib \ No newline at end of file From 4edc4edec257bb64ea82ec1e13e0709cf8103898 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 08:46:57 +0200 Subject: [PATCH 03/75] adding git --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8196bca..4ddb3d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,8 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme pkg-config \ libgl1-mesa-dev \ libssl-dev \ + # git is needed to build openssl in older versions + git \ # xcb dependencies libfontconfig1-dev \ libfreetype6-dev \ From fad50469138875dab2640d5062bd24b91de89892 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 08:58:17 +0200 Subject: [PATCH 04/75] fixed wrong env var assignment --- buildconfig/configure-5.6.0.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index 53f39ab..fad9e2b 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -3,7 +3,7 @@ set -e # adding compatible ssl version git clone https://github.com/openssl/openssl.git cd openssl -LATEST_TAG=git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0 +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) git checkout $LATEST_TAG ./config --prefix=/opt/openssl_build_stable -shared make From b94882263077b3a3f974d2c29d8dcee0dc87feaa Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 09:24:08 +0200 Subject: [PATCH 05/75] git correct branch --- buildconfig/configure-5.6.0.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index fad9e2b..c059bd0 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -3,6 +3,7 @@ set -e # adding compatible ssl version git clone https://github.com/openssl/openssl.git cd openssl +git checkout OpenSSL_1_0_2-stable LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) git checkout $LATEST_TAG ./config --prefix=/opt/openssl_build_stable -shared From bc8fcf9dd8b76e949dab27d3067f0ca81fa17532 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 09:46:05 +0200 Subject: [PATCH 06/75] make output suppressing --- buildconfig/configure-5.6.0.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index c059bd0..adfb783 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -7,8 +7,8 @@ git checkout OpenSSL_1_0_2-stable LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) git checkout $LATEST_TAG ./config --prefix=/opt/openssl_build_stable -shared -make +make > /dev/null 2>&1 || make make test -make install +make install > /dev/null || make install OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include/openssl -L /opt/openssl_build_stable/lib \ No newline at end of file From 1f301c42ed08cf3ab7de740c04977d0116f6a2e6 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 12:04:04 +0200 Subject: [PATCH 07/75] config output suppressed --- buildconfig/configure-5.6.0.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index adfb783..f77b3a5 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -1,14 +1,15 @@ #!/bin/sh set -e +set -x # adding compatible ssl version git clone https://github.com/openssl/openssl.git cd openssl git checkout OpenSSL_1_0_2-stable LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) git checkout $LATEST_TAG -./config --prefix=/opt/openssl_build_stable -shared +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared make > /dev/null 2>&1 || make make test -make install > /dev/null || make install +make install > /dev/null 2>&1 || make install OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include/openssl -L /opt/openssl_build_stable/lib \ No newline at end of file From 83f8b32eaf3e6f98e7d356a7d0786be52725c90f Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 12:31:36 +0200 Subject: [PATCH 08/75] core count is now an env var and gets passed to configure script --- Dockerfile | 11 ++++++----- buildconfig/configure-5.6.0.sh | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ddb3d3..bd8d224 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,17 +81,18 @@ RUN curl -sSL https://download.qt.io/official_releases/qt/${QT_VERSION_MAJOR}.${ WORKDIR ${QT_BUILD_DIR} -# Configure, make, install -ADD buildconfig/configure-${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}.sh configure.sh - -RUN chmod +x ./configure.sh && ./configure.sh - # Possibility to make outputs less verbose when required for a ci build ARG CI_BUILD= ENV CI_BUILD=${CI_BUILD} # Speeding up make depending of your system ARG CORE_COUNT=1 +ENV CORE_COUNT=${CORE_COUNT} + +# Configure, make, install +ADD buildconfig/configure-${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}.sh configure.sh + +RUN chmod +x ./configure.sh && ./configure.sh ${CORE_COUNT} ${CI_BUILD} RUN if [ $CI_BUILD = 2 ]; then \ echo "Suppressing all make output for CI environments to decrease log size..."; \ diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index f77b3a5..3e77cb5 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -1,6 +1,7 @@ #!/bin/sh set -e set -x +CORE_COUNT=$1 # adding compatible ssl version git clone https://github.com/openssl/openssl.git cd openssl @@ -8,8 +9,8 @@ git checkout OpenSSL_1_0_2-stable LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) git checkout $LATEST_TAG ./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared -make > /dev/null 2>&1 || make -make test +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make -j$CORE_COUNT test > /dev/null 2>&1 || make -j$CORE_COUNT test make install > /dev/null 2>&1 || make install OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include/openssl -L /opt/openssl_build_stable/lib \ No newline at end of file From 376400f65368fd1a3130580f3fa1d10acd95620b Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 15:45:08 +0200 Subject: [PATCH 09/75] relative dir fix in configure script --- buildconfig/configure-5.6.0.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index 3e77cb5..f695919 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -12,5 +12,5 @@ git checkout $LATEST_TAG make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make -j$CORE_COUNT test > /dev/null 2>&1 || make -j$CORE_COUNT test make install > /dev/null 2>&1 || make install - +cd .. OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include/openssl -L /opt/openssl_build_stable/lib \ No newline at end of file From 75d5b4bcf4d782259fb3ea58a6955613b574dcaa Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 18:09:07 +0200 Subject: [PATCH 10/75] make output in case of failure shall only contain the last 500 errors, hoping that helps to see actual errors --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd8d224..d4fb8ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,10 +96,10 @@ RUN chmod +x ./configure.sh && ./configure.sh ${CORE_COUNT} ${CI_BUILD} RUN if [ $CI_BUILD = 2 ]; then \ echo "Suppressing all make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null 2>&1 || make; \ + make -j${CORE_COUNT} > /dev/null 2>&1 || make | tail -n500; \ elif [ $CI_BUILD ]; then \ echo "Suppressing regular make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null || make; \ + make -j${CORE_COUNT} > /dev/null || make | tail -n500; \ else make -j${CORE_COUNT}; \ fi; From b8f5a0cb239b5903ed304eb5a5e097fed677c93e Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 18:53:03 +0200 Subject: [PATCH 11/75] added ci build to matrix and cleaned docker file --- .travis.yml | 50 +++++++++++++++++++++++++------------------------- Dockerfile | 3 ++- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a94378..b20aa32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,29 +16,29 @@ 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=6 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=4 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=5 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=7 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 QT_TARBALL_NAMING_SCHEME=everywhere-opensource - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=1 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=4 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=5 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=7 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 stages: - test - merge @@ -46,8 +46,8 @@ script: - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin || travis_terminate 1; fi' - docker pull darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - docker pull darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - - travis_wait 180 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_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 --target=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; - - travis_wait 180 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_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 --target=qt -t darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; + - travis_wait 180 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_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=2 --target=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; + - travis_wait 180 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_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=2 --target=qt -t darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' diff --git a/Dockerfile b/Dockerfile index d4fb8ed..dad5e02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -100,7 +100,8 @@ RUN if [ $CI_BUILD = 2 ]; then \ elif [ $CI_BUILD ]; then \ echo "Suppressing regular make output for CI environments to decrease log size..."; \ make -j${CORE_COUNT} > /dev/null || make | tail -n500; \ - else make -j${CORE_COUNT}; \ + else \ + make -j${CORE_COUNT}; \ fi; # install it From 82a29b1b83d8b1d467a06572739a46995416b070 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 22:15:37 +0200 Subject: [PATCH 12/75] added core count in matrix, improved dockerfile --- .travis.yml | 50 +++++++++++++++++++++++++------------------------- Dockerfile | 4 ++-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index b20aa32..24318b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,29 +16,29 @@ 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=6 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=1 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=4 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=5 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=7 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=1 CORE_COUNT=1 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=4 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=5 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 stages: - test - merge @@ -46,8 +46,8 @@ script: - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin || travis_terminate 1; fi' - docker pull darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - docker pull darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - - travis_wait 180 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_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=2 --target=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; - - travis_wait 180 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_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=2 --target=qt -t darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; + - travis_wait 180 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_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; + - travis_wait 180 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_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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' diff --git a/Dockerfile b/Dockerfile index dad5e02..e0b1426 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,10 +96,10 @@ RUN chmod +x ./configure.sh && ./configure.sh ${CORE_COUNT} ${CI_BUILD} RUN if [ $CI_BUILD = 2 ]; then \ echo "Suppressing all make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null 2>&1 || make | tail -n500; \ + make -j${CORE_COUNT} > /dev/null 2>&1 || $(echo "Running make again to see errors..." && make > /tmp/makelog && tail -n 500 /tmp/makelog); \ elif [ $CI_BUILD ]; then \ echo "Suppressing regular make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null || make | tail -n500; \ + make -j${CORE_COUNT} > /dev/null || $(echo "Running make again to see errors..." && make > /tmp/makelog && tail -n 500 /tmp/makelog); \ else \ make -j${CORE_COUNT}; \ fi; From cb5e93f4739259fef6e59b3775548934f6f59369 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 22 May 2019 23:08:47 +0200 Subject: [PATCH 13/75] re-suppressed make output --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 24318b1..a518c12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,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=6 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=1 CORE_COUNT=1 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=1 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 From 80637d5dac104bcd14ef0dc9a2f16c4ab757ec6e Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Thu, 23 May 2019 00:39:16 +0200 Subject: [PATCH 14/75] improving build call --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e0b1426..ab43d21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,10 +96,10 @@ RUN chmod +x ./configure.sh && ./configure.sh ${CORE_COUNT} ${CI_BUILD} RUN if [ $CI_BUILD = 2 ]; then \ echo "Suppressing all make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null 2>&1 || $(echo "Running make again to see errors..." && make > /tmp/makelog && tail -n 500 /tmp/makelog); \ + make -j${CORE_COUNT} > /dev/null 2>&1 || echo "Running make again to see errors..." && make > /tmp/makelog 2>&1 || echo "displaying last N lines..." && tail -n 500 /tmp/makelog; \ elif [ $CI_BUILD ]; then \ echo "Suppressing regular make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null || $(echo "Running make again to see errors..." && make > /tmp/makelog && tail -n 500 /tmp/makelog); \ + make -j${CORE_COUNT} > /dev/null || $(echo "Running make again to see errors..." && make > /tmp/makelog || echo "displaying last N lines..." && tail -n 500 /tmp/makelog; \ else \ make -j${CORE_COUNT}; \ fi; From 19c8e661aaee73cf30f52b2fe17d0a8c2806fbfc Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Thu, 23 May 2019 00:54:57 +0200 Subject: [PATCH 15/75] unnecessary parens --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ab43d21..cb46b84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ RUN if [ $CI_BUILD = 2 ]; then \ make -j${CORE_COUNT} > /dev/null 2>&1 || echo "Running make again to see errors..." && make > /tmp/makelog 2>&1 || echo "displaying last N lines..." && tail -n 500 /tmp/makelog; \ elif [ $CI_BUILD ]; then \ echo "Suppressing regular make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null || $(echo "Running make again to see errors..." && make > /tmp/makelog || echo "displaying last N lines..." && tail -n 500 /tmp/makelog; \ + make -j${CORE_COUNT} > /dev/null || echo "Running make again to see errors..." && make > /tmp/makelog || echo "displaying last N lines..." && tail -n 500 /tmp/makelog; \ else \ make -j${CORE_COUNT}; \ fi; From 841716a6d5c5cba75313f02d0b044df82cdcdb9d Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Thu, 23 May 2019 01:21:04 +0200 Subject: [PATCH 16/75] openssl 1.0.1 for 5.6.0 and docker file improvements --- Dockerfile | 4 ++-- buildconfig/configure-5.6.0.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb46b84..03b5f46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,10 +96,10 @@ RUN chmod +x ./configure.sh && ./configure.sh ${CORE_COUNT} ${CI_BUILD} RUN if [ $CI_BUILD = 2 ]; then \ echo "Suppressing all make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null 2>&1 || echo "Running make again to see errors..." && make > /tmp/makelog 2>&1 || echo "displaying last N lines..." && tail -n 500 /tmp/makelog; \ + make -j${CORE_COUNT} > /dev/null 2>&1 || echo "Running make again to see errors..." && make > /tmp/makelog 2>&1 || echo "displaying last N lines..." && tail -n 500 /tmp/makelog && exit 2; \ elif [ $CI_BUILD ]; then \ echo "Suppressing regular make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null || echo "Running make again to see errors..." && make > /tmp/makelog || echo "displaying last N lines..." && tail -n 500 /tmp/makelog; \ + make -j${CORE_COUNT} > /dev/null || echo "Running make again to see errors..." && make > /tmp/makelog || echo "displaying last N lines..." && tail -n 500 /tmp/makelog && exit 2; \ else \ make -j${CORE_COUNT}; \ fi; diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index f695919..4b6c29c 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -5,8 +5,8 @@ CORE_COUNT=$1 # adding compatible ssl version git clone https://github.com/openssl/openssl.git cd openssl -git checkout OpenSSL_1_0_2-stable -LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout OpenSSL_1_0_1-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_1[a-z]*" --abbrev=0) git checkout $LATEST_TAG ./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT From 8226a2c460964e0ba470be95b2b5af93a3247353 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Thu, 23 May 2019 01:58:10 +0200 Subject: [PATCH 17/75] trying with system ssl 1.0 --- Dockerfile | 2 +- buildconfig/configure-5.6.0.sh | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 03b5f46..12e1755 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme build-essential \ pkg-config \ libgl1-mesa-dev \ - libssl-dev \ + libssl1.0-dev \ # git is needed to build openssl in older versions git \ # xcb dependencies diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index 4b6c29c..b8af3ca 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -1,16 +1,17 @@ #!/bin/sh -set -e -set -x -CORE_COUNT=$1 -# adding compatible ssl version -git clone https://github.com/openssl/openssl.git -cd openssl -git checkout OpenSSL_1_0_1-stable -LATEST_TAG=$(git describe --match "OpenSSL_1_0_1[a-z]*" --abbrev=0) -git checkout $LATEST_TAG -./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared -make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT -make -j$CORE_COUNT test > /dev/null 2>&1 || make -j$CORE_COUNT test -make install > /dev/null 2>&1 || make install -cd .. -OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include/openssl -L /opt/openssl_build_stable/lib \ No newline at end of file +# set -e +# set -x +# CORE_COUNT=$1 +# # adding compatible ssl version +# git clone https://github.com/openssl/openssl.git +# cd openssl +# git checkout OpenSSL_1_0_1-stable +# LATEST_TAG=$(git describe --match "OpenSSL_1_0_1[a-z]*" --abbrev=0) +# git checkout $LATEST_TAG +# ./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +# make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +# make -j$CORE_COUNT test > /dev/null 2>&1 || make -j$CORE_COUNT test +# make install > /dev/null 2>&1 || make install +# cd .. +# OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include/openssl -L /opt/openssl_build_stable/lib +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file From 61a68f7f02cf13b22a4fcd388db25d299ac3790f Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Mon, 27 May 2019 13:43:12 +0200 Subject: [PATCH 18/75] added working ssl build scripts, adding libicu-dev, introducing build script --- Dockerfile | 26 +++++++++++++------------ README.md | 4 ++++ build-dockerfile-local.sh | 14 ++++++++++++++ buildconfig/build.sh | 22 +++++++++++++++++++++ buildconfig/configure-5.6.0.sh | 33 ++++++++++++++++---------------- buildconfig/configure-5.6.1-1.sh | 18 ++++++++++++++++- buildconfig/configure-5.6.2.sh | 18 ++++++++++++++++- buildconfig/configure-5.6.3.sh | 18 ++++++++++++++++- buildconfig/configure-5.9.0.sh | 18 ++++++++++++++++- buildconfig/configure-5.9.1.sh | 18 ++++++++++++++++- buildconfig/configure-5.9.2.sh | 18 ++++++++++++++++- buildconfig/configure-5.9.3.sh | 18 ++++++++++++++++- buildconfig/configure-5.9.4.sh | 18 ++++++++++++++++- buildconfig/configure-5.9.5.sh | 18 ++++++++++++++++- buildconfig/configure-5.9.6.sh | 18 ++++++++++++++++- 15 files changed, 241 insertions(+), 38 deletions(-) create mode 100755 build-dockerfile-local.sh create mode 100755 buildconfig/build.sh diff --git a/Dockerfile b/Dockerfile index 12e1755..9632b0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,11 @@ LABEL stage=qt-build-base ARG USER_UID= ARG USER_GID= +# In case you have to build behind a proxy +ARG PROXY= +ENV http_proxy=$PROXY +ENV https_proxy=$PROXY + # Name of the regular user. Does not look useful but can save a bit time when changing ENV QT_USERNAME=qt @@ -24,7 +29,10 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme build-essential \ pkg-config \ libgl1-mesa-dev \ - libssl1.0-dev \ + libicu-dev \ + # bc suggested for openssl tests + bc \ + libssl-dev \ # git is needed to build openssl in older versions git \ # xcb dependencies @@ -91,18 +99,11 @@ ENV CORE_COUNT=${CORE_COUNT} # Configure, make, install ADD buildconfig/configure-${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}.sh configure.sh +# before running the configuration, adding a directory to copy additional contents to the final image +RUN mkdir /opt/extra-dependencies && chmod +x ./configure.sh && ./configure.sh ${CORE_COUNT} ${CI_BUILD} -RUN chmod +x ./configure.sh && ./configure.sh ${CORE_COUNT} ${CI_BUILD} - -RUN if [ $CI_BUILD = 2 ]; then \ - echo "Suppressing all make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null 2>&1 || echo "Running make again to see errors..." && make > /tmp/makelog 2>&1 || echo "displaying last N lines..." && tail -n 500 /tmp/makelog && exit 2; \ - elif [ $CI_BUILD ]; then \ - echo "Suppressing regular make output for CI environments to decrease log size..."; \ - make -j${CORE_COUNT} > /dev/null || echo "Running make again to see errors..." && make > /tmp/makelog || echo "displaying last N lines..." && tail -n 500 /tmp/makelog && exit 2; \ - else \ - make -j${CORE_COUNT}; \ - fi; +COPY buildconfig/build.sh build.sh +RUN ./build.sh ${CI_BUILD} ${CORE_COUNT} # install it RUN make install @@ -117,6 +118,7 @@ ENV ENTRYPOINT_DIR=/usr/local/bin ENV APP_BUILDDIR=/var/build COPY --from=builder ${QT_PREFIX} ${QT_PREFIX} +COPY --from=builder /opt/extra-dependencies/ / COPY entrypoint.sh ${ENTRYPOINT_DIR} RUN chmod +x ${ENTRYPOINT_DIR}/entrypoint.sh diff --git a/README.md b/README.md index 27f149e..64acf0f 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,10 @@ The build arguments can entirely be omitted, resulting in a build with some defa * `CI_BUILD` -- will suppress regular `make` output. If set to `2` it will stay silent, if set to `1` (or anything else) only warnings will show up. When the compiling fails, `make` is run again regularly to give you the whole output, skipping everything that has been built before, to give you the possibility to see the actual behaviour. When left undefined, all output is visible and the second run of make is *not* performed * `CORE_COUNT` -- determines the number of parallel make jobs. Adjust it to fit your machine +### Convenience local build script + +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 All currently supported versions of `Qt` should be available as tags. It was nice to make the archived versions, too, but I did not yet start to adjust the download method as archived versions are taken from a different location. This is no hard work though, so might be a nice ![first contribution](https://img.shields.io/badge/-first_contribution-006b75.svg) diff --git a/build-dockerfile-local.sh b/build-dockerfile-local.sh new file mode 100755 index 0000000..9628dd7 --- /dev/null +++ b/build-dockerfile-local.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# Call this script like so: +#./build-dockerfile-local.sh 5 6 0 everywhere-opensource 2 8 +QT_VERSION_MAJOR=$1 +QT_VERSION_MINOR=$2 +QT_VERSION_PATCH=$3 +QT_TARBALL_NAMING_SCHEME=$4 +CI_BUILD=$5 +CORE_COUNT=$6 +PROXY=$7 +# builder +docker build --pull --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_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_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 diff --git a/buildconfig/build.sh b/buildconfig/build.sh new file mode 100755 index 0000000..fe7040c --- /dev/null +++ b/buildconfig/build.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -x +CI_BUILD=$1 +CORE_COUNT=$2 +TAIL_LINECOUNT=500 +if [ "$CI_BUILD" = 2 ]; then + echo "Suppressing all make output for CI environments to decrease log size..." + make -j${CORE_COUNT} > /dev/null 2>&1 + RESULT=$? + if [ $RESULT -ne 0 ]; then + echo "Running make again to see errors with less output..." + make > /tmp/makelog 2>&1 + echo "displaying last $TAIL_LINECOUNT lines..." + tail -n $TAIL_LINECOUNT /tmp/makelog + exit $RESULT + fi +elif [ "$CI_BUILD" ]; then + echo "Suppressing regular make output for CI environments to decrease log size..." + make -j${CORE_COUNT} > /dev/null +else + make -j${CORE_COUNT} +fi diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index b8af3ca..93490c1 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -1,17 +1,18 @@ #!/bin/sh -# set -e -# set -x -# CORE_COUNT=$1 -# # adding compatible ssl version -# git clone https://github.com/openssl/openssl.git -# cd openssl -# git checkout OpenSSL_1_0_1-stable -# LATEST_TAG=$(git describe --match "OpenSSL_1_0_1[a-z]*" --abbrev=0) -# git checkout $LATEST_TAG -# ./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared -# make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT -# make -j$CORE_COUNT test > /dev/null 2>&1 || make -j$CORE_COUNT test -# make install > /dev/null 2>&1 || make install -# cd .. -# OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include/openssl -L /opt/openssl_build_stable/lib -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.6.1-1.sh b/buildconfig/configure-5.6.1-1.sh index 691bc96..97ba562 100644 --- a/buildconfig/configure-5.6.1-1.sh +++ b/buildconfig/configure-5.6.1-1.sh @@ -1,4 +1,20 @@ #!/bin/sh # this config is so weird looking because there was a bug in the original 5.6.1 that has been hotfixed. # To get the ci scheme work with this, I have to tweak it that way... -../../qt-everywhere-opensource-src-5.6.1/configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../../qt-everywhere-opensource-src-5.6.1/configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.6.2.sh b/buildconfig/configure-5.6.2.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.6.2.sh +++ b/buildconfig/configure-5.6.2.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.6.3.sh b/buildconfig/configure-5.6.3.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.6.3.sh +++ b/buildconfig/configure-5.6.3.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.0.sh b/buildconfig/configure-5.9.0.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.9.0.sh +++ b/buildconfig/configure-5.9.0.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.1.sh b/buildconfig/configure-5.9.1.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.9.1.sh +++ b/buildconfig/configure-5.9.1.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.2.sh b/buildconfig/configure-5.9.2.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.9.2.sh +++ b/buildconfig/configure-5.9.2.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.3.sh b/buildconfig/configure-5.9.3.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.9.3.sh +++ b/buildconfig/configure-5.9.3.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.4.sh b/buildconfig/configure-5.9.4.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.9.4.sh +++ b/buildconfig/configure-5.9.4.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.5.sh b/buildconfig/configure-5.9.5.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.9.5.sh +++ b/buildconfig/configure-5.9.5.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.6.sh b/buildconfig/configure-5.9.6.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.9.6.sh +++ b/buildconfig/configure-5.9.6.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file From 3e9c636fc9f8a74bd5357fc024cb31e7dfb74899 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 28 May 2019 08:27:17 +0200 Subject: [PATCH 19/75] added empty run statement to workaround issue https://github.com/moby/moby/issues/37965 --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9632b0d..efb3153 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,6 +119,9 @@ ENV APP_BUILDDIR=/var/build COPY --from=builder ${QT_PREFIX} ${QT_PREFIX} COPY --from=builder /opt/extra-dependencies/ / +# the next copy statement failed often. My only guess is, that the extra dependencies are not existent and somehow that +# triggers a failure here.... A workaround for similar issues is to put an empty run statement in between: https://github.com/moby/moby/issues/37965 +RUN true COPY entrypoint.sh ${ENTRYPOINT_DIR} RUN chmod +x ${ENTRYPOINT_DIR}/entrypoint.sh From a4ed15ba88dc8f81da2171b9b786bfdc91f08a18 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 18 Jun 2019 08:59:32 +0200 Subject: [PATCH 20/75] added ssl test, added qstring to hello world test --- tests/qt-hello-world/main.cpp | 5 +++-- tests/qt-ssl/main.cpp | 7 +++++++ tests/qt-ssl/qt-ssl.pro | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 tests/qt-ssl/main.cpp create mode 100644 tests/qt-ssl/qt-ssl.pro diff --git a/tests/qt-hello-world/main.cpp b/tests/qt-hello-world/main.cpp index 9af104c..29e0769 100644 --- a/tests/qt-hello-world/main.cpp +++ b/tests/qt-hello-world/main.cpp @@ -1,6 +1,7 @@ -#include +#include int main() { - std::cout << "\nHello World!\n"; + QString hello("Hello World!"); + qDebug() << hello; } diff --git a/tests/qt-ssl/main.cpp b/tests/qt-ssl/main.cpp new file mode 100644 index 0000000..547803b --- /dev/null +++ b/tests/qt-ssl/main.cpp @@ -0,0 +1,7 @@ +#include + +int main(int argc, char *argv[]) +{ + QSslConfiguration configuration; + return 0; +} \ No newline at end of file diff --git a/tests/qt-ssl/qt-ssl.pro b/tests/qt-ssl/qt-ssl.pro new file mode 100644 index 0000000..2264e21 --- /dev/null +++ b/tests/qt-ssl/qt-ssl.pro @@ -0,0 +1,7 @@ +QT += core network +QT -= gui +TARGET = ssltest +CONFIG += console +CONFIG -= app_bundle +TEMPLATE = app +SOURCES += main.cpp From 4f50f565d1b6b09fb133a0f9b23608e5d1e60b50 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 18 Jun 2019 09:05:47 +0200 Subject: [PATCH 21/75] added qt 5.12.4 --- .travis.yml | 45 +++++++++++++++++---------------- README.md | 7 ++++- buildconfig/configure-5.12.4.sh | 2 ++ ci/tags.yml | 1 + 4 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 buildconfig/configure-5.12.4.sh diff --git a/.travis.yml b/.travis.yml index a518c12..b6b41ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,29 +16,30 @@ 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=6 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=1 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=1-1 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=3 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=4 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=5 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=4 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=5 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=4 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=0 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=1 stages: - test - merge diff --git a/README.md b/README.md index 64acf0f..557aae5 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,8 @@ All currently supported versions of `Qt` should be available as tags. It was nic | Tags | Size | | ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | -| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![imgVerInfo][ver_img_5.12.3]][lnk_5.12.3] | [![imgSizeInfo][size_img_5.12.3]][lnk_5.12.3] | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![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.2]][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] | @@ -100,6 +101,10 @@ All currently supported versions of `Qt` should be available as tags. It was nic [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.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 +[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 [lnk_5.12.3]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.3 diff --git a/buildconfig/configure-5.12.4.sh b/buildconfig/configure-5.12.4.sh new file mode 100644 index 0000000..f330655 --- /dev/null +++ b/buildconfig/configure-5.12.4.sh @@ -0,0 +1,2 @@ +#!/bin/sh +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 6c99911..04dd238 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -27,5 +27,6 @@ 5.12.1: 5.12.2: 5.12.3: +5.12.4: - "5.12" - latest \ No newline at end of file From f4a1324cc76296c9ff067ac9e71f0e0e36b71f8c Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 18 Jun 2019 16:52:12 +0200 Subject: [PATCH 22/75] conditional test compiling for ssl test --- tests/qt-ssl/qt-ssl.pro | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qt-ssl/qt-ssl.pro b/tests/qt-ssl/qt-ssl.pro index 2264e21..dde61be 100644 --- a/tests/qt-ssl/qt-ssl.pro +++ b/tests/qt-ssl/qt-ssl.pro @@ -5,3 +5,8 @@ CONFIG += console CONFIG -= app_bundle TEMPLATE = app SOURCES += main.cpp + +lessThan(10, QT_MINOR_VERSION){ +INCLUDEPATH += /opt/openssl_build_stable/include +LIBS += -L/opt/openssl_build_stable/lib -lcrypto -lssl +} \ No newline at end of file From 09de82785a06420e26b2418f2c2d7aa9f51bc6cf Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 18 Jun 2019 22:32:44 +0200 Subject: [PATCH 23/75] added custom ssl for 5.9.7 and 5.9.8 --- buildconfig/configure-5.9.7.sh | 18 +++++++++++++++++- buildconfig/configure-5.9.8.sh | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/buildconfig/configure-5.9.7.sh b/buildconfig/configure-5.9.7.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.9.7.sh +++ b/buildconfig/configure-5.9.7.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.8.sh b/buildconfig/configure-5.9.8.sh index 12061d5..93490c1 100644 --- a/buildconfig/configure-5.9.8.sh +++ b/buildconfig/configure-5.9.8.sh @@ -1,2 +1,18 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb \ No newline at end of file +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir /opt/extra-dependencies/opt +cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file From ac3018b590368ae7544d6744a2a2227bf2c115cc Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Wed, 19 Jun 2019 12:15:30 +0200 Subject: [PATCH 24/75] added archived versions by adding a build argument for them --- .travis.yml | 48 ++++++++++++++++++++++++------------------------ Dockerfile | 4 +++- README.md | 3 ++- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6b41ac..ce8408b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,30 +16,30 @@ 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=12 QT_VERSION_PATCH=4 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=2 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=11 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=1 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=10 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=8 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=5 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=4 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=3 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=2 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=0 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=2 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_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 - - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=6 QT_VERSION_PATCH=0 QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=1 + - 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 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 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=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=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 + - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 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=5 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=4 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=3 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=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 stages: - test - merge diff --git a/Dockerfile b/Dockerfile index efb3153..0e2a5ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,6 +78,8 @@ ENV QT_BUILD_ROOT=/tmp/qt_build # They switched the tarball naming scheme from 5.9 to 5.10. This ARG shall provide a possibility to reflect that ARG QT_TARBALL_NAMING_SCHEME=everywhere +# Providing flag for archived or stable versions +ARG QT_DOWNLOAD_BRANCH=official_releases ENV QT_BUILD_DIR=${QT_BUILD_ROOT}/qt-${QT_TARBALL_NAMING_SCHEME}-src-${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}/build @@ -85,7 +87,7 @@ ENV QT_BUILD_DIR=${QT_BUILD_ROOT}/qt-${QT_TARBALL_NAMING_SCHEME}-src-${QT_VERSIO WORKDIR ${QT_BUILD_ROOT} # Download sources -RUN curl -sSL https://download.qt.io/official_releases/qt/${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}/${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}/single/qt-${QT_TARBALL_NAMING_SCHEME}-src-${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}.tar.xz | tar xJ +RUN curl -sSL https://download.qt.io/${QT_DOWNLOAD_BRANCH}/qt/${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}/${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}/single/qt-${QT_TARBALL_NAMING_SCHEME}-src-${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}.tar.xz | tar xJ WORKDIR ${QT_BUILD_DIR} diff --git a/README.md b/README.md index 557aae5..6551174 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,7 @@ The build arguments can entirely be omitted, resulting in a build with some defa * `QT_VERSION_MAJOR` * `QT_VERSION_MINOR` * `QT_VERSION_PATCH` +* `QT_DOWNLOAD_BRANCH` -- gives you the possibility to address different versions for download. Should e.g. read `official_releases` or `archive`. * `QT_TARBALL_NAMING_SCHEME` -- gives you the possibility to alter the naming scheme. `Qt` changed that between `5.9`and `5.10` ftom `qt-everywhere-opensource-src` to `qt-everywhere-src`. The `qt-` and `-src` parts are hardcoded, `QT_TARBALL_NAMING_SCHEME` is inserted between * `CI_BUILD` -- will suppress regular `make` output. If set to `2` it will stay silent, if set to `1` (or anything else) only warnings will show up. When the compiling fails, `make` is run again regularly to give you the whole output, skipping everything that has been built before, to give you the possibility to see the actual behaviour. When left undefined, all output is visible and the second run of make is *not* performed * `CORE_COUNT` -- determines the number of parallel make jobs. Adjust it to fit your machine @@ -64,7 +65,7 @@ In case you want to do a quick, customised build like I do it in the automated b ## Available tags -All currently supported versions of `Qt` should be available as tags. It was nice to make the archived versions, too, but I did not yet start to adjust the download method as archived versions are taken from a different location. This is no hard work though, so might be a nice ![first contribution](https://img.shields.io/badge/-first_contribution-006b75.svg) +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 | | ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- | From 4fa20f0e2ad4824ea24435acac3d630c35786b11 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Fri, 21 Jun 2019 23:52:38 +0200 Subject: [PATCH 25/75] added download branch finally also to travis.yml in the right spot to build --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce8408b..e2634b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,8 +47,8 @@ script: - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin || travis_terminate 1; fi' - docker pull darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - docker pull darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - - travis_wait 180 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_TARBALL_NAMING_SCHEME=$QT_TARBALL_NAMING_SCHEME --build-arg CI_BUILD=$CI_BUILD --build-arg CORE_COUNT=$CORE_COUNT --target=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; - - travis_wait 180 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_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 . || travis_terminate 1; + - travis_wait 180 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=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; + - travis_wait 180 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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' From 2e8f4218edc3b96c8ac71a400b51bd7b82190ad6 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Sat, 22 Jun 2019 10:43:25 +0200 Subject: [PATCH 26/75] added qt 5.13.0 --- .travis.yml | 1 + README.md | 12 ++++++++++-- buildconfig/configure-5.13.0.sh | 2 ++ ci/tags.yml | 4 +++- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 buildconfig/configure-5.13.0.sh diff --git a/.travis.yml b/.travis.yml index e2634b5..73d3328 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,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=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=4 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=3 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=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 6551174..3cd435e 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,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.12]][lnk_5.12] [![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.2]][lnk_5.12.3] | [![imgSizeInfo][size_img_5.12.3]][lnk_5.12.3] | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![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.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] | @@ -98,6 +98,14 @@ All currently supported versions of `Qt` should be available as tags. I added al [size_img_latest]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:latest.svg [lnk_latest]: https://microbadger.com/images/darkmattercoder/qt-build:latest +[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 +[lnk_5.13]: https://microbadger.com/images/darkmattercoder/qt-build:5.13 + +[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 +[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 [lnk_5.12]: https://microbadger.com/images/darkmattercoder/qt-build:5.12 diff --git a/buildconfig/configure-5.13.0.sh b/buildconfig/configure-5.13.0.sh new file mode 100644 index 0000000..f330655 --- /dev/null +++ b/buildconfig/configure-5.13.0.sh @@ -0,0 +1,2 @@ +#!/bin/sh +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 04dd238..9451b3f 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -12,7 +12,7 @@ 5.9.4: 5.9.5: 5.9.6: -5.9.7: +5.9.7: 5.9.8: - "5.9" 5.10.0: @@ -29,4 +29,6 @@ 5.12.3: 5.12.4: - "5.12" +5.13.0: + - "5.13" - latest \ No newline at end of file From 39f9f80bfdebbd621aef58aee9c7c6f6fd6dc941 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Mon, 5 Aug 2019 12:51:16 +0200 Subject: [PATCH 27/75] added 5.12.4 to readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3cd435e..75f0322 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,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.13]][lnk_5.13] [![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.3]][lnk_5.12.3] | [![imgSizeInfo][size_img_5.12.3]][lnk_5.12.3] | +| [![imgVerInfo][ver_img_5.12]][lnk_5.12] [![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] | From cb1e749a645596f164ccca31cea0214b91775f7f Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 17 Sep 2019 22:37:19 +0200 Subject: [PATCH 28/75] added home dir for user --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0e2a5ae..e661ca1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,7 +62,7 @@ RUN if [ ${USER_GID} ]; then \ useradd -u ${USER_UID} -g ${QT_USERNAME} ${QT_USERNAME}; \ else \ useradd -g ${QT_USERNAME} ${QT_USERNAME}; \ - fi + fi && mkdir /home/${QT_USERNAME} # build stage FROM base as builder From 78d8740be72e34b7095293874b0a55beb019f12e Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 17 Sep 2019 22:39:11 +0200 Subject: [PATCH 29/75] added qt 5.12.5 and 5.13.1 --- .travis.yml | 2 ++ README.md | 14 ++++++++++++-- buildconfig/configure-5.12.5.sh | 2 ++ buildconfig/configure-5.13.1.sh | 2 ++ ci/tags.yml | 2 ++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 buildconfig/configure-5.12.5.sh create mode 100644 buildconfig/configure-5.13.1.sh diff --git a/.travis.yml b/.travis.yml index 73d3328..ed2c46b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,9 @@ 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=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=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 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 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=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 75f0322..a430ecd 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,10 @@ 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.13]][lnk_5.13] [![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.4]][lnk_5.12.4] | [![imgSizeInfo][size_img_5.12.4]][lnk_5.12.4] | +| [![imgVerInfo][ver_img_latest]][lnk_latest] [![imgVerInfo][ver_img_5.13]][lnk_5.13] [![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.5]][lnk_5.12.5] | [![imgSizeInfo][size_img_5.12.4]][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] | @@ -103,6 +105,10 @@ All currently supported versions of `Qt` should be available as tags. I added al [size_img_5.13]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.13.svg [lnk_5.13]: https://microbadger.com/images/darkmattercoder/qt-build:5.13 +[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 +[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 [lnk_5.13.0]: https://microbadger.com/images/darkmattercoder/qt-build:5.13.0 @@ -111,6 +117,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.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 +[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 [lnk_5.12.4]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.4 diff --git a/buildconfig/configure-5.12.5.sh b/buildconfig/configure-5.12.5.sh new file mode 100644 index 0000000..f330655 --- /dev/null +++ b/buildconfig/configure-5.12.5.sh @@ -0,0 +1,2 @@ +#!/bin/sh +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.13.1.sh b/buildconfig/configure-5.13.1.sh new file mode 100644 index 0000000..f330655 --- /dev/null +++ b/buildconfig/configure-5.13.1.sh @@ -0,0 +1,2 @@ +#!/bin/sh +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/ci/tags.yml b/ci/tags.yml index 9451b3f..7361262 100644 --- a/ci/tags.yml +++ b/ci/tags.yml @@ -28,7 +28,9 @@ 5.12.2: 5.12.3: 5.12.4: +5.12.5: - "5.12" 5.13.0: +5.13.1: - "5.13" - latest \ No newline at end of file From bf965b873529e4be316b1bbfdba2f7d0e2373c91 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt Date: Sat, 21 Sep 2019 18:18:32 +1000 Subject: [PATCH 30/75] Enable MySQL, Postgresql and Interbase drivers --- Dockerfile | 3 +++ buildconfig/configure-5.12.5.sh | 5 ++++- buildconfig/configure-5.13.1.sh | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e661ca1..d81f280 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,9 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme pkg-config \ libgl1-mesa-dev \ libicu-dev \ + firebird-dev \ + libmysqlclient-dev \ + libpq-dev \ # bc suggested for openssl tests bc \ libssl-dev \ diff --git a/buildconfig/configure-5.12.5.sh b/buildconfig/configure-5.12.5.sh index f330655..dab2087 100644 --- a/buildconfig/configure-5.12.5.sh +++ b/buildconfig/configure-5.12.5.sh @@ -1,2 +1,5 @@ #!/bin/sh -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file +# Patch Qt to find Firebird library +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json + +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests diff --git a/buildconfig/configure-5.13.1.sh b/buildconfig/configure-5.13.1.sh index f330655..00fd4b1 100644 --- a/buildconfig/configure-5.13.1.sh +++ b/buildconfig/configure-5.13.1.sh @@ -1,2 +1,5 @@ #!/bin/sh +# Patch Qt to find Firebird library +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json + ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file From ec87d72c1a638d54bab9dd9bbde4ad1434a62afb Mon Sep 17 00:00:00 2001 From: Hamish Moffatt Date: Thu, 3 Oct 2019 12:16:56 +1000 Subject: [PATCH 31/75] add Firebird patch to all versions back to 5.9.0 --- buildconfig/configure-5.10.0.sh | 1 + buildconfig/configure-5.10.1.sh | 1 + buildconfig/configure-5.11.0.sh | 1 + buildconfig/configure-5.11.1.sh | 1 + buildconfig/configure-5.11.2.sh | 1 + buildconfig/configure-5.11.3.sh | 1 + buildconfig/configure-5.12.0.sh | 1 + buildconfig/configure-5.12.1.sh | 1 + buildconfig/configure-5.12.2.sh | 1 + buildconfig/configure-5.12.3.sh | 1 + buildconfig/configure-5.12.4.sh | 1 + buildconfig/configure-5.12.5.sh | 4 +--- buildconfig/configure-5.13.0.sh | 1 + buildconfig/configure-5.13.1.sh | 2 -- buildconfig/configure-5.9.0.sh | 1 + buildconfig/configure-5.9.1.sh | 1 + buildconfig/configure-5.9.2.sh | 1 + buildconfig/configure-5.9.3.sh | 1 + buildconfig/configure-5.9.4.sh | 1 + buildconfig/configure-5.9.5.sh | 1 + buildconfig/configure-5.9.6.sh | 1 + buildconfig/configure-5.9.7.sh | 1 + buildconfig/configure-5.9.8.sh | 1 + 23 files changed, 22 insertions(+), 5 deletions(-) diff --git a/buildconfig/configure-5.10.0.sh b/buildconfig/configure-5.10.0.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.10.0.sh +++ b/buildconfig/configure-5.10.0.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.10.1.sh b/buildconfig/configure-5.10.1.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.10.1.sh +++ b/buildconfig/configure-5.10.1.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.11.0.sh b/buildconfig/configure-5.11.0.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.11.0.sh +++ b/buildconfig/configure-5.11.0.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.11.1.sh b/buildconfig/configure-5.11.1.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.11.1.sh +++ b/buildconfig/configure-5.11.1.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.11.2.sh b/buildconfig/configure-5.11.2.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.11.2.sh +++ b/buildconfig/configure-5.11.2.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.11.3.sh b/buildconfig/configure-5.11.3.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.11.3.sh +++ b/buildconfig/configure-5.11.3.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.12.0.sh b/buildconfig/configure-5.12.0.sh index 12061d5..fba221a 100644 --- a/buildconfig/configure-5.12.0.sh +++ b/buildconfig/configure-5.12.0.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.12.1.sh b/buildconfig/configure-5.12.1.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.12.1.sh +++ b/buildconfig/configure-5.12.1.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.12.2.sh b/buildconfig/configure-5.12.2.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.12.2.sh +++ b/buildconfig/configure-5.12.2.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.12.3.sh b/buildconfig/configure-5.12.3.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.12.3.sh +++ b/buildconfig/configure-5.12.3.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.12.4.sh b/buildconfig/configure-5.12.4.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.12.4.sh +++ b/buildconfig/configure-5.12.4.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.12.5.sh b/buildconfig/configure-5.12.5.sh index dab2087..8708c02 100644 --- a/buildconfig/configure-5.12.5.sh +++ b/buildconfig/configure-5.12.5.sh @@ -1,5 +1,3 @@ #!/bin/sh -# Patch Qt to find Firebird library sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json - -../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests +../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.13.0.sh b/buildconfig/configure-5.13.0.sh index f330655..8708c02 100644 --- a/buildconfig/configure-5.13.0.sh +++ b/buildconfig/configure-5.13.0.sh @@ -1,2 +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 \ No newline at end of file diff --git a/buildconfig/configure-5.13.1.sh b/buildconfig/configure-5.13.1.sh index 00fd4b1..8708c02 100644 --- a/buildconfig/configure-5.13.1.sh +++ b/buildconfig/configure-5.13.1.sh @@ -1,5 +1,3 @@ #!/bin/sh -# Patch Qt to find Firebird library sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json - ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests \ No newline at end of file diff --git a/buildconfig/configure-5.9.0.sh b/buildconfig/configure-5.9.0.sh index 93490c1..fc7ef5f 100644 --- a/buildconfig/configure-5.9.0.sh +++ b/buildconfig/configure-5.9.0.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir /opt/extra-dependencies/opt cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.1.sh b/buildconfig/configure-5.9.1.sh index 93490c1..fc7ef5f 100644 --- a/buildconfig/configure-5.9.1.sh +++ b/buildconfig/configure-5.9.1.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir /opt/extra-dependencies/opt cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.2.sh b/buildconfig/configure-5.9.2.sh index 93490c1..fc7ef5f 100644 --- a/buildconfig/configure-5.9.2.sh +++ b/buildconfig/configure-5.9.2.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir /opt/extra-dependencies/opt cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.3.sh b/buildconfig/configure-5.9.3.sh index 93490c1..fc7ef5f 100644 --- a/buildconfig/configure-5.9.3.sh +++ b/buildconfig/configure-5.9.3.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir /opt/extra-dependencies/opt cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.4.sh b/buildconfig/configure-5.9.4.sh index 93490c1..fc7ef5f 100644 --- a/buildconfig/configure-5.9.4.sh +++ b/buildconfig/configure-5.9.4.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir /opt/extra-dependencies/opt cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.5.sh b/buildconfig/configure-5.9.5.sh index 93490c1..fc7ef5f 100644 --- a/buildconfig/configure-5.9.5.sh +++ b/buildconfig/configure-5.9.5.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir /opt/extra-dependencies/opt cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.6.sh b/buildconfig/configure-5.9.6.sh index 93490c1..fc7ef5f 100644 --- a/buildconfig/configure-5.9.6.sh +++ b/buildconfig/configure-5.9.6.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir /opt/extra-dependencies/opt cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.7.sh b/buildconfig/configure-5.9.7.sh index 93490c1..fc7ef5f 100644 --- a/buildconfig/configure-5.9.7.sh +++ b/buildconfig/configure-5.9.7.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir /opt/extra-dependencies/opt cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file diff --git a/buildconfig/configure-5.9.8.sh b/buildconfig/configure-5.9.8.sh index 93490c1..fc7ef5f 100644 --- a/buildconfig/configure-5.9.8.sh +++ b/buildconfig/configure-5.9.8.sh @@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir /opt/extra-dependencies/opt cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file From bacee81c8e3d8e1db622252a14ac5e8043382362 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Sat, 5 Oct 2019 02:20:11 +0200 Subject: [PATCH 32/75] Update dockerimage.yml --- .github/workflows/dockerimage.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/dockerimage.yml diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml new file mode 100644 index 0000000..caab161 --- /dev/null +++ b/.github/workflows/dockerimage.yml @@ -0,0 +1,14 @@ +name: Docker Image CI + +on: [push] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Build the Docker image + - run: docker build --pull --cache-from darkmattercoder/qt-build:builder-5.12.4 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 --target=builder -t darkmattercoder/qt-build:builder-5.12.4 . From 4faf07862d9c2c5478eaa7800d6834777d94a228 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sat, 5 Oct 2019 02:26:13 +0200 Subject: [PATCH 33/75] actionstowork --- .github/workflows/dockerimage.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index caab161..509f902 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -5,10 +5,9 @@ on: [push] jobs: build: - + runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v1 - - name: Build the Docker image - run: docker build --pull --cache-from darkmattercoder/qt-build:builder-5.12.4 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 --target=builder -t darkmattercoder/qt-build:builder-5.12.4 . From 7830fbaa351db6e521b23e198da68a38e1fad515 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sat, 5 Oct 2019 10:18:30 +0200 Subject: [PATCH 34/75] make tests run automagically instead of only building them --- .gitignore | 18 +++++++++++++ tests/generate_tests.py | 27 ++++++++++++++----- .../helloworld.pro} | 0 tests/{qt-hello-world => helloworld}/main.cpp | 1 + tests/{qt-ssl => ssltest}/main.cpp | 0 .../qt-ssl.pro => ssltest/ssltest.pro} | 0 6 files changed, 40 insertions(+), 6 deletions(-) rename tests/{qt-hello-world/qt-hello-world.pro => helloworld/helloworld.pro} (100%) rename tests/{qt-hello-world => helloworld}/main.cpp (88%) rename tests/{qt-ssl => ssltest}/main.cpp (100%) rename tests/{qt-ssl/qt-ssl.pro => ssltest/ssltest.pro} (100%) diff --git a/.gitignore b/.gitignore index 85dbcb4..71e9088 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,21 @@ +# Ignore all +* + +# Unignore all with extensions +!*.* + +# Unignore all dirs +!*/ + tests/*/build tests/build tests/tests.pro +Makefile +.qmake.stash +*.qmake.stash +*qmake.stash +/.qmake.stash +*.o +run-tests.sh +tests.pro +/.qmake.stash diff --git a/tests/generate_tests.py b/tests/generate_tests.py index da2af1f..c234eeb 100755 --- a/tests/generate_tests.py +++ b/tests/generate_tests.py @@ -1,13 +1,28 @@ #!/usr/bin/env python3 ''' generates a tests.pro file by crawling the directory and generating a subdirs - entry for each subdirectory ''' + entry for each subdirectory. Additionally it generates a run script for the tests to get executed, + assuming the binary produced is named like the directory''' import os with open(os.path.dirname(os.path.realpath(__file__)) + "/tests.pro", "w") as projectfile: - projectfile.write("TEMPLATE=subdirs\nSUBDIRS= \\\n") - PATH = os.path.dirname(os.path.realpath(__file__)) - for item in os.listdir(PATH): - if os.path.isdir(os.path.join(PATH, item)): - projectfile.write(item + " \\\n") + with open(os.path.dirname(os.path.realpath(__file__)) + "/run-tests.sh", "w") as runscript: + projectfile.write("TEMPLATE=subdirs\nSUBDIRS= \\\n") + runscriptContent = "\ + #!/bin/sh\n\ + set -e\n\ + set -x\n\ + if [ ! -z $1 ]; then\n\ + TEST_ROOT=$1\n\ + else\n\ + TEST_ROOT=.\n\ + fi\n" + runscript.write(runscriptContent) + PATH = os.path.dirname(os.path.realpath(__file__)) + for item in os.listdir(PATH): + if os.path.isdir(os.path.join(PATH, item)): + projectfile.write(item + " \\\n") + runscript.write("timeout 10s $TEST_ROOT/" + + item + "/" + item + "\n") +os.chmod(os.path.dirname(os.path.realpath(__file__)) + "/run-tests.sh", 0o744) diff --git a/tests/qt-hello-world/qt-hello-world.pro b/tests/helloworld/helloworld.pro similarity index 100% rename from tests/qt-hello-world/qt-hello-world.pro rename to tests/helloworld/helloworld.pro diff --git a/tests/qt-hello-world/main.cpp b/tests/helloworld/main.cpp similarity index 88% rename from tests/qt-hello-world/main.cpp rename to tests/helloworld/main.cpp index 29e0769..6d32f90 100644 --- a/tests/qt-hello-world/main.cpp +++ b/tests/helloworld/main.cpp @@ -4,4 +4,5 @@ int main() { QString hello("Hello World!"); qDebug() << hello; + return 0; } diff --git a/tests/qt-ssl/main.cpp b/tests/ssltest/main.cpp similarity index 100% rename from tests/qt-ssl/main.cpp rename to tests/ssltest/main.cpp diff --git a/tests/qt-ssl/qt-ssl.pro b/tests/ssltest/ssltest.pro similarity index 100% rename from tests/qt-ssl/qt-ssl.pro rename to tests/ssltest/ssltest.pro From 5d70659db56fafd316368ad8eaff30b953c44c33 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sat, 5 Oct 2019 10:23:58 +0200 Subject: [PATCH 35/75] actually run the tests in the ci pipeline --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ed2c46b..117f52f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,7 @@ script: - travis_wait 180 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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; + - tests/run-tests.sh - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; From aa7df4ba15e918b9dddd233781b40de558394ad5 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sat, 5 Oct 2019 15:23:15 +0200 Subject: [PATCH 36/75] run tests in correct directory --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 117f52f..11de94d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ script: - travis_wait 180 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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - - tests/run-tests.sh + - tests/run-tests.sh build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; From 0edd7aaa6831505e2244c72488d8646c7231231c Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Sat, 5 Oct 2019 18:18:39 +0200 Subject: [PATCH 37/75] Using really the correct directory to run tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 11de94d..526482b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ script: - travis_wait 180 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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - - tests/run-tests.sh build || travis_terminate 1; + - tests/run-tests.sh tests/build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; From 1b5bd58184038cc8909cf098bb27f1b97894ac7b Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Sat, 5 Oct 2019 20:35:58 +0200 Subject: [PATCH 38/75] Using the container to run the tests To be environment-independent --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 526482b..7bce29b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ script: - travis_wait 180 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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - - tests/run-tests.sh tests/build || travis_terminate 1; + - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /car/build/run-tests.sh build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; From 7282a44c3147b5cec4fa9e2d2ec7d299484f0daa Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Sat, 5 Oct 2019 21:06:28 +0200 Subject: [PATCH 39/75] Fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7bce29b..82449ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ script: - travis_wait 180 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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /car/build/run-tests.sh build || travis_terminate 1; + - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /var/build/run-tests.sh build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; From 936e7ee73c550532ae72820487e7b6270fd07b0e Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sun, 6 Oct 2019 10:59:04 +0200 Subject: [PATCH 40/75] fixed test call with absolute path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 82449ea..b55f7ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ script: - travis_wait 180 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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /var/build/run-tests.sh build || travis_terminate 1; + - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /var/build/run-tests.sh /var/build/build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; From b8468581ba9fb2d0e29936a0a5cb3ae7b18bc669 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sun, 6 Oct 2019 13:25:10 +0200 Subject: [PATCH 41/75] adding base stage for faster builds --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b55f7ac..26962ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,13 +50,16 @@ script: - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin || travis_terminate 1; fi' - docker pull darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - docker pull darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true + - docker pull darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true + - travis_wait 180 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 --target=base -t darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; - travis_wait 180 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=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; - - travis_wait 180 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 . || travis_terminate 1; + - travis_wait 180 docker build --pull --cache-from darkmattercoder/qt-build:qt-$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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /var/build/run-tests.sh /var/build/build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then python ci/push_images.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH; fi' jobs: From a223106464fa1b5088eb57b055b72c666bcbe169 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sun, 6 Oct 2019 18:43:32 +0200 Subject: [PATCH 42/75] improving external lib dependencies --- .travis.yml | 3 +-- Dockerfile | 10 +++++++++- build-dockerfile-local.sh | 18 +++++++++++------- buildconfig/configure-5.6.0.sh | 5 +++-- buildconfig/configure-5.6.1-1.sh | 5 +++-- buildconfig/configure-5.6.2.sh | 5 +++-- buildconfig/configure-5.6.3.sh | 5 +++-- buildconfig/configure-5.9.0.sh | 5 +++-- buildconfig/configure-5.9.1.sh | 5 +++-- buildconfig/configure-5.9.2.sh | 5 +++-- buildconfig/configure-5.9.3.sh | 5 +++-- buildconfig/configure-5.9.4.sh | 5 +++-- buildconfig/configure-5.9.5.sh | 5 +++-- buildconfig/configure-5.9.6.sh | 5 +++-- buildconfig/configure-5.9.7.sh | 5 +++-- buildconfig/configure-5.9.8.sh | 5 +++-- 16 files changed, 60 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26962ae..e3887b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,14 +53,13 @@ script: - docker pull darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - travis_wait 180 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 --target=base -t darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; - travis_wait 180 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=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; - - travis_wait 180 docker build --pull --cache-from darkmattercoder/qt-build:qt-$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 . || travis_terminate 1; + - travis_wait 180 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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH build || travis_terminate 1; - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /var/build/run-tests.sh /var/build/build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then python ci/push_images.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH; fi' jobs: include: diff --git a/Dockerfile b/Dockerfile index d81f280..76517b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -123,7 +123,15 @@ ENV ENTRYPOINT_DIR=/usr/local/bin ENV APP_BUILDDIR=/var/build COPY --from=builder ${QT_PREFIX} ${QT_PREFIX} -COPY --from=builder /opt/extra-dependencies/ / + +# the next copy statement failed often. My only guess is, that the extra dependencies are not existent and somehow that +# triggers a failure here.... A workaround for similar issues is to put an empty run statement in between: https://github.com/moby/moby/issues/37965 +RUN true +COPY --from=builder /opt/extra-dependencies /opt/extra-dependencies + +#for modifications during configuration +ENV LD_LIBRARY_PATH=/opt/extra-dependencies/lib:${LD_LIBRARY_PATH} + # the next copy statement failed often. My only guess is, that the extra dependencies are not existent and somehow that # triggers a failure here.... A workaround for similar issues is to put an empty run statement in between: https://github.com/moby/moby/issues/37965 RUN true diff --git a/build-dockerfile-local.sh b/build-dockerfile-local.sh index 9628dd7..53d5a9f 100755 --- a/build-dockerfile-local.sh +++ b/build-dockerfile-local.sh @@ -1,14 +1,18 @@ #!/bin/bash # Call this script like so: -#./build-dockerfile-local.sh 5 6 0 everywhere-opensource 2 8 +#./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_TARBALL_NAMING_SCHEME=$4 -CI_BUILD=$5 -CORE_COUNT=$6 -PROXY=$7 +QT_DOWNLOAD_BRANCH=$4 +QT_TARBALL_NAMING_SCHEME=$5 +CI_BUILD=$6 +CORE_COUNT=$7 +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 --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_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 . +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_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 . \ No newline at end of file diff --git a/buildconfig/configure-5.6.0.sh b/buildconfig/configure-5.6.0.sh index 93490c1..b285caf 100644 --- a/buildconfig/configure-5.6.0.sh +++ b/buildconfig/configure-5.6.0.sh @@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.6.1-1.sh b/buildconfig/configure-5.6.1-1.sh index 97ba562..4b8cf92 100644 --- a/buildconfig/configure-5.6.1-1.sh +++ b/buildconfig/configure-5.6.1-1.sh @@ -16,5 +16,6 @@ make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../../qt-everywhere-opensource-src-5.6.1/configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.6.2.sh b/buildconfig/configure-5.6.2.sh index 93490c1..b285caf 100644 --- a/buildconfig/configure-5.6.2.sh +++ b/buildconfig/configure-5.6.2.sh @@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.6.3.sh b/buildconfig/configure-5.6.3.sh index 93490c1..b285caf 100644 --- a/buildconfig/configure-5.6.3.sh +++ b/buildconfig/configure-5.6.3.sh @@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.9.0.sh b/buildconfig/configure-5.9.0.sh index fc7ef5f..cfe77d4 100644 --- a/buildconfig/configure-5.9.0.sh +++ b/buildconfig/configure-5.9.0.sh @@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install cd .. sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.9.1.sh b/buildconfig/configure-5.9.1.sh index fc7ef5f..cfe77d4 100644 --- a/buildconfig/configure-5.9.1.sh +++ b/buildconfig/configure-5.9.1.sh @@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install cd .. sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.9.2.sh b/buildconfig/configure-5.9.2.sh index fc7ef5f..cfe77d4 100644 --- a/buildconfig/configure-5.9.2.sh +++ b/buildconfig/configure-5.9.2.sh @@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install cd .. sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.9.3.sh b/buildconfig/configure-5.9.3.sh index fc7ef5f..cfe77d4 100644 --- a/buildconfig/configure-5.9.3.sh +++ b/buildconfig/configure-5.9.3.sh @@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install cd .. sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.9.4.sh b/buildconfig/configure-5.9.4.sh index fc7ef5f..cfe77d4 100644 --- a/buildconfig/configure-5.9.4.sh +++ b/buildconfig/configure-5.9.4.sh @@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install cd .. sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.9.5.sh b/buildconfig/configure-5.9.5.sh index fc7ef5f..cfe77d4 100644 --- a/buildconfig/configure-5.9.5.sh +++ b/buildconfig/configure-5.9.5.sh @@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install cd .. sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.9.6.sh b/buildconfig/configure-5.9.6.sh index fc7ef5f..cfe77d4 100644 --- a/buildconfig/configure-5.9.6.sh +++ b/buildconfig/configure-5.9.6.sh @@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install cd .. sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.9.7.sh b/buildconfig/configure-5.9.7.sh index fc7ef5f..cfe77d4 100644 --- a/buildconfig/configure-5.9.7.sh +++ b/buildconfig/configure-5.9.7.sh @@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install cd .. sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file diff --git a/buildconfig/configure-5.9.8.sh b/buildconfig/configure-5.9.8.sh index fc7ef5f..cfe77d4 100644 --- a/buildconfig/configure-5.9.8.sh +++ b/buildconfig/configure-5.9.8.sh @@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install cd .. sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib -mkdir /opt/extra-dependencies/opt -cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt \ No newline at end of file +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file From e7029cfeabfef1f4d90d05a949fbccb7d26d8675 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sun, 6 Oct 2019 19:00:49 +0200 Subject: [PATCH 43/75] re-inserted tagging mechanism for images --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e3887b9..756d643 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,7 @@ script: - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' + - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then python ci/push_images.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH; fi' jobs: include: From 85893f9cb15220c0129f0aa14daa7ecf8fd4bd24 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt Date: Mon, 7 Oct 2019 10:31:31 +1100 Subject: [PATCH 44/75] add tests for SQL driver plugins being available --- tests/sqldrivers/main.cpp | 13 +++++++++++++ tests/sqldrivers/sqldrivers.pro | 8 ++++++++ 2 files changed, 21 insertions(+) create mode 100644 tests/sqldrivers/main.cpp create mode 100644 tests/sqldrivers/sqldrivers.pro diff --git a/tests/sqldrivers/main.cpp b/tests/sqldrivers/main.cpp new file mode 100644 index 0000000..cc4ab4f --- /dev/null +++ b/tests/sqldrivers/main.cpp @@ -0,0 +1,13 @@ +#include +#include + +int main() +{ + auto drivers = QSqlDatabase::drivers(); + qDebug() << "Available drivers:" << drivers; + + if (!drivers.contains("QMYSQL") || !drivers.contains("QPSQL")) + return 1; + + return 0; +} diff --git a/tests/sqldrivers/sqldrivers.pro b/tests/sqldrivers/sqldrivers.pro new file mode 100644 index 0000000..2f997f6 --- /dev/null +++ b/tests/sqldrivers/sqldrivers.pro @@ -0,0 +1,8 @@ +QT += core +QT -= gui +QT += sql +TARGET = sqldrivers +CONFIG += console +CONFIG -= app_bundle +TEMPLATE = app +SOURCES += main.cpp From da2fa0266f3a10a0b5ee7528665a8b1d00d48fde Mon Sep 17 00:00:00 2001 From: Hamish Moffatt Date: Tue, 8 Oct 2019 19:10:12 +1100 Subject: [PATCH 45/75] Remove Firebird patch for Qt 5.9.0 --- buildconfig/configure-5.9.0.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/buildconfig/configure-5.9.0.sh b/buildconfig/configure-5.9.0.sh index cfe77d4..b285caf 100644 --- a/buildconfig/configure-5.9.0.sh +++ b/buildconfig/configure-5.9.0.sh @@ -13,7 +13,6 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT make test > /dev/null 2>&1 || make test make install > /dev/null 2>&1 || make install cd .. -sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib mkdir -p /opt/extra-dependencies/lib cp -r /opt/openssl_build_stable /opt/extra-dependencies From 52b97d35d5a45e42caf2959957efe882b85b2283 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 10 Oct 2019 01:05:31 +0200 Subject: [PATCH 46/75] pushing base right after build, hoping to save some minutes through that in the ci.... --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 756d643..085b9fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,7 @@ script: - docker pull darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - docker pull darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true - travis_wait 180 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 --target=base -t darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - travis_wait 180 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=builder -t darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH . || travis_terminate 1; - travis_wait 180 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 . || travis_terminate 1; - tests/generate_tests.py || travis_terminate 1; @@ -59,7 +60,6 @@ script: - docker run --rm -u $UID -v $PWD/tests:/var/build darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH /var/build/run-tests.sh /var/build/build || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi' - python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then python ci/push_images.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH; fi' jobs: From 03e7768e92e7ca821f9b2199d5ab9bb64fa4f99c Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Fri, 11 Oct 2019 02:01:48 +0200 Subject: [PATCH 47/75] switched to bionic, hoping to get rid of the build errors --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 085b9fd..4e432b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ -language: python -python: - - 3.6 +dist: bionic services: - docker branches: From 69e97397f9d10ab89f360f624b0adf6f75532eba Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Fri, 11 Oct 2019 02:13:38 +0200 Subject: [PATCH 48/75] re-added python --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e432b3..8397b3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ dist: bionic +language: python +python: + - 3.6 services: -- docker + - docker branches: only: - deploy From 160cb0aef50e1a8e62b8b4f67784d81e10e5dd66 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Tue, 15 Oct 2019 22:46:12 +0200 Subject: [PATCH 49/75] Add github sponsor button --- FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 FUNDING.yml diff --git a/FUNDING.yml b/FUNDING.yml new file mode 100644 index 0000000..a2295b9 --- /dev/null +++ b/FUNDING.yml @@ -0,0 +1 @@ +custom: ["https://www.paypal.me/bjpay", Paypal] From 2a89f4b05a71a45c8495944f9c6cd66459e70772 Mon Sep 17 00:00:00 2001 From: Jochen Bauer Date: Sat, 5 Oct 2019 02:20:11 +0200 Subject: [PATCH 50/75] Update dockerimage.yml --- .github/workflows/dockerimage.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 509f902..caab161 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -5,9 +5,10 @@ on: [push] jobs: build: - + runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v1 + - name: Build the Docker image - run: docker build --pull --cache-from darkmattercoder/qt-build:builder-5.12.4 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 --target=builder -t darkmattercoder/qt-build:builder-5.12.4 . From 6e51929163eb9fd34a567da6453a28fb5b4d21c1 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sat, 5 Oct 2019 02:26:13 +0200 Subject: [PATCH 51/75] actionstowork --- .github/workflows/dockerimage.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index caab161..509f902 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -5,10 +5,9 @@ on: [push] jobs: build: - + runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v1 - - name: Build the Docker image - run: docker build --pull --cache-from darkmattercoder/qt-build:builder-5.12.4 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 --target=builder -t darkmattercoder/qt-build:builder-5.12.4 . From 05e55ccf4c24576f90046a95bf856a86bc866425 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:04:56 +0100 Subject: [PATCH 52/75] playing with matrix --- .github/workflows/dockerimage.yml | 42 ++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 509f902..ebad054 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -3,11 +3,45 @@ name: Docker Image CI on: [push] jobs: - build: - runs-on: ubuntu-latest + strategy: + matrix: + major: [maja, majb] + minor: + [mina, minb] + # [ + # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # -5.12.5 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # ] + # , + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=8--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=7--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=6--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=1-1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=1 + # ] steps: - - uses: actions/checkout@v1 - - run: docker build --pull --cache-from darkmattercoder/qt-build:builder-5.12.4 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 --target=builder -t darkmattercoder/qt-build:builder-5.12.4 . + - uses: actions/checkout@v1 + - run: echo ${{ matrix.major }} ${{ matrix.minor }} From 37534748d85c71b03820929dc296edd39ea93e77 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:09:25 +0100 Subject: [PATCH 53/75] playing with matrix --- .github/workflows/dockerimage.yml | 70 +++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index ebad054..504aac0 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -7,41 +7,41 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - major: [maja, majb] - minor: - [mina, minb] - # [ - # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # -5.12.5 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # ] - # , - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=8--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=7--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=6--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=1-1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=1 - # ] + env: + - "bla: blubb" + - "bla: bla" + # [ + # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # -5.12.5 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # ] + # , + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=8--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=7--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=6--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=1-1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=1 + # ] steps: - uses: actions/checkout@v1 - - run: echo ${{ matrix.major }} ${{ matrix.minor }} + - run: echo ${{ matrix.env }} From a6563fd3a3813a39201b2a6478f42d06f9517b24 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:14:23 +0100 Subject: [PATCH 54/75] playing with matrix --- .github/workflows/dockerimage.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 504aac0..d0b8b0e 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -44,4 +44,6 @@ jobs: steps: - uses: actions/checkout@v1 - - run: echo ${{ matrix.env }} + - run: | + echo env + env: ${{ matrix.env }} From a8a2a7675f0396d17938a363c63b9bf2e49c3c80 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:16:19 +0100 Subject: [PATCH 55/75] playing with matrix --- .github/workflows/dockerimage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index d0b8b0e..ab536f2 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -8,8 +8,8 @@ jobs: strategy: matrix: env: - - "bla: blubb" - - "bla: bla" + - "bla=blubb" + - "bla=bla" # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, From 7264f30164672199265a90fee4bb3d93bf172169 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:25:19 +0100 Subject: [PATCH 56/75] playing with matrix --- .github/workflows/dockerimage.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index ab536f2..53d1eb2 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -1,15 +1,17 @@ name: Docker Image CI on: [push] - +jobs: + job1: + env: + FIRST_NAME: Mona jobs: build: runs-on: ubuntu-latest strategy: matrix: - env: - - "bla=blubb" - - "bla=bla" + env: [BLA: blubb, BLA: blablubb] + # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, From 637d1dc607e622af555e7f0978cdd87b96561241 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:25:56 +0100 Subject: [PATCH 57/75] playing with matrix --- .github/workflows/dockerimage.yml | 71 +++++++++++++++---------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 53d1eb2..0e7e929 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -1,48 +1,45 @@ name: Docker Image CI on: [push] -jobs: - job1: - env: - FIRST_NAME: Mona + jobs: build: runs-on: ubuntu-latest strategy: matrix: - env: [BLA: blubb, BLA: blablubb] - - # [ - # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # -5.12.5 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # ] - # , - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=8--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=7--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=6--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=1-1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=1 - # ] + env: + [BLA: blubb, BLA: blablubb] + # [ + # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # -5.12.5 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # ] + # , + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=8--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=7--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=6--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=1-1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, + # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=1 + # ] steps: - uses: actions/checkout@v1 From 848b2cfc5e9a91565e634d0cfc21b71a722c277e Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:26:54 +0100 Subject: [PATCH 58/75] playing with matrix --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 0e7e929..9b6a32b 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -44,5 +44,5 @@ jobs: steps: - uses: actions/checkout@v1 - run: | - echo env + echo $BLA env: ${{ matrix.env }} From 58a8a09931fd95155aeb43e58eb15618f18663f3 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:33:04 +0100 Subject: [PATCH 59/75] playing with matrix --- .github/workflows/dockerimage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 9b6a32b..dcc842b 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: env: - [BLA: blubb, BLA: blablubb] + [BLA: blubb BLUBB: bla, BLA: blablubb BLUBB: blubb] # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, @@ -44,5 +44,5 @@ jobs: steps: - uses: actions/checkout@v1 - run: | - echo $BLA + echo $BLA $BLUBB env: ${{ matrix.env }} From c728d6f7d1c355da2973f65ceebc56176e0a29e6 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:34:22 +0100 Subject: [PATCH 60/75] playing with matrix --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index dcc842b..d9b7c69 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: env: - [BLA: blubb BLUBB: bla, BLA: blablubb BLUBB: blubb] + [[BLA: blubb, BLUBB: bla], [BLA: blablubb, BLUBB: blubb]] # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, From 41fb4caf76bdae3f6c33cc8166618b2beed12892 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:44:55 +0100 Subject: [PATCH 61/75] playing with matrix --- .github/workflows/dockerimage.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index d9b7c69..f14b72b 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -8,7 +8,10 @@ jobs: strategy: matrix: env: - [[BLA: blubb, BLUBB: bla], [BLA: blablubb, BLUBB: blubb]] + - BLA: BLUBB + BLUBB: BLA + - BLA: BLA + BLUBB: BLUBB # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, From a68565ce630a27ed6b27201b0edf2c40c944c616 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:46:13 +0100 Subject: [PATCH 62/75] playing with matrix --- .github/workflows/dockerimage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index f14b72b..b187abc 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -9,9 +9,9 @@ jobs: matrix: env: - BLA: BLUBB - BLUBB: BLA + BLUBB: BLA - BLA: BLA - BLUBB: BLUBB + BLUBB: BLUBB # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, From 67920abed18d2cfc3af635ad1f87488cef36c127 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:47:47 +0100 Subject: [PATCH 63/75] playing with matrix --- .github/workflows/dockerimage.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index b187abc..21e3a61 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -8,10 +8,8 @@ jobs: strategy: matrix: env: - - BLA: BLUBB - BLUBB: BLA - - BLA: BLA - BLUBB: BLUBB + - BLA: BLUBB BLUBB: BLA + - BLA: BLA BLUBB: BLUBB # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, From 4e2dbe88752d2d7cb175677a7b535fe2efee03a1 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:48:19 +0100 Subject: [PATCH 64/75] playing with matrix --- .github/workflows/dockerimage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 21e3a61..0bf5d06 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -8,8 +8,8 @@ jobs: strategy: matrix: env: - - BLA: BLUBB BLUBB: BLA - - BLA: BLA BLUBB: BLUBB + - [BLA: BLUBB, BLUBB: BLA] + - [BLA: BLA, BLUBB: BLUBB] # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, From 5c59626265e11af4f9c70df9263ab887f461dc8b Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:53:40 +0100 Subject: [PATCH 65/75] playing with matrix --- .github/workflows/dockerimage.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 0bf5d06..7d66725 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -8,8 +8,10 @@ jobs: strategy: matrix: env: - - [BLA: BLUBB, BLUBB: BLA] - - [BLA: BLA, BLUBB: BLUBB] + - VERSION: 5.13.1 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.13.0 + ARGS: --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, @@ -45,5 +47,5 @@ jobs: steps: - uses: actions/checkout@v1 - run: | - echo $BLA $BLUBB + docker build --pull --cache-from darkmattercoder/qt-build:builder-$VERSION $ARGS --target=builder -t darkmattercoder/qt-build:builder-$VERSION . env: ${{ matrix.env }} From 99ea6da522103b80673bd9eab9061a98e612e859 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:55:23 +0100 Subject: [PATCH 66/75] playing with matrix --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 7d66725..51e8b88 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -47,5 +47,5 @@ jobs: steps: - uses: actions/checkout@v1 - run: | - docker build --pull --cache-from darkmattercoder/qt-build:builder-$VERSION $ARGS --target=builder -t darkmattercoder/qt-build:builder-$VERSION . + echo $VERSION $ARGS #docker build --pull --cache-from darkmattercoder/qt-build:builder-$VERSION $ARGS --target=builder -t darkmattercoder/qt-build:builder-$VERSION . env: ${{ matrix.env }} From 69d793928903d76028ceaf23a665282760e9a33f Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:58:11 +0100 Subject: [PATCH 67/75] playing with matrix --- .github/workflows/dockerimage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 51e8b88..5c21586 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -6,6 +6,7 @@ jobs: build: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: env: - VERSION: 5.13.1 From d6b5d41bde80be3aa467c835d306643eb31ef73a Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 00:58:38 +0100 Subject: [PATCH 68/75] playing with matrix --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 5c21586..724d64d 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -48,5 +48,5 @@ jobs: steps: - uses: actions/checkout@v1 - run: | - echo $VERSION $ARGS #docker build --pull --cache-from darkmattercoder/qt-build:builder-$VERSION $ARGS --target=builder -t darkmattercoder/qt-build:builder-$VERSION . + docker build --pull --cache-from darkmattercoder/qt-build:builder-$VERSION $ARGS --target=builder -t darkmattercoder/qt-build:builder-$VERSION . env: ${{ matrix.env }} From c3356ebd0d154eb8e3e89d178a98a66084db0a50 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 01:00:31 +0100 Subject: [PATCH 69/75] playing with matrix --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 724d64d..dbeaf47 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -12,7 +12,7 @@ jobs: - VERSION: 5.13.1 ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.13.0 - ARGS: --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 # [ # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, From 7e288a53bccd64429ecd0a12790ffdda0852fc01 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 22:39:11 +0100 Subject: [PATCH 70/75] playing with matrix --- .github/workflows/dockerimage.yml | 83 +++++++++++++++++++------------ 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index dbeaf47..445644d 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -13,40 +13,59 @@ jobs: ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.13.0 ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - # [ - # -5.13.1 --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # -5.13.0 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=13--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # -5.12.5 --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # ] - # , - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=12--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=11--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=10--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=8--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=7--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=6--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=5--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=4--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=1--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=9--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=3--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=2--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=1-1--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2, - # - --build-arg QT_VERSION_MAJOR=5--build-arg QT_VERSION_MINOR=6--build-arg QT_VERSION_PATCH=0--build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=1 - # ] + - VERSION: 5.12.5 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=5 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.12.4 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.12.3 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.12.2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.12.1 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.12.0 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.11.3 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.11.2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.11.1 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.11.0 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.10.1 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=10 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.10.0 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=10 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.8 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=8 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.7 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=7 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.6 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=6 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.5 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=5 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.4 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.3 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.1 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.0 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.6.3 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.6.2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.6.1-1 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=1-1 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.6.0 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=1 steps: - uses: actions/checkout@v1 - run: | - docker build --pull --cache-from darkmattercoder/qt-build:builder-$VERSION $ARGS --target=builder -t darkmattercoder/qt-build:builder-$VERSION . + docker build --pull --cache-from darkmattercoder/qt-build:base-$VERSION $ARGS --target=base -t darkmattercoder/qt-build:base-$VERSION . env: ${{ matrix.env }} From 3537c2e326533b30384b94c20d834c5d04fa6dbb Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 14 Nov 2019 22:42:27 +0100 Subject: [PATCH 71/75] playing with matrix --- .github/workflows/dockerimage.yml | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 445644d..2a8ab08 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -16,53 +16,53 @@ jobs: - VERSION: 5.12.5 ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=5 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.12.4 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.12.3 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.12.2 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.12.1 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.12.0 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.11.3 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.11.2 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.11.1 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.11.0 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=11 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.10.1 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=10 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=10 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.10.0 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=10 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=10 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.8 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=8 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=8 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.7 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=7 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=7 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.6 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=6 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=6 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.5 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=5 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=5 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.4 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=4 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.3 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.2 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.1 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.0 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.6.3 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=3 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.6.2 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.6.1-1 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=1-1 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=1-1 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.6.0 - ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive--build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=1 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=6 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=1 steps: - uses: actions/checkout@v1 From 5f2848dd1bbd0ae781bd3c3f52e1de2b6369a390 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Thu, 2 Jan 2020 21:42:52 +0100 Subject: [PATCH 72/75] add 5.14.0, 5.9.9, 5.13.2, 5.12.6 --- .travis.yml | 4 ++++ README.md | 30 +++++++++++++++++++++++++++--- buildconfig/configure-5.12.6.sh | 3 +++ buildconfig/configure-5.13.2.sh | 3 +++ buildconfig/configure-5.14.0.sh | 3 +++ buildconfig/configure-5.9.9.sh | 20 ++++++++++++++++++++ 6 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 buildconfig/configure-5.12.6.sh create mode 100644 buildconfig/configure-5.13.2.sh create mode 100644 buildconfig/configure-5.14.0.sh create mode 100644 buildconfig/configure-5.9.9.sh diff --git a/.travis.yml b/.travis.yml index 8397b3c..dbedabc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,11 @@ 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=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=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 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=12 QT_VERSION_PATCH=3 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere CI_BUILD=2 CORE_COUNT=2 @@ -31,6 +34,7 @@ env: - 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=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 - QT_VERSION_MAJOR=5 QT_VERSION_MINOR=9 QT_VERSION_PATCH=6 QT_DOWNLOAD_BRANCH=official_releases QT_TARBALL_NAMING_SCHEME=everywhere-opensource CI_BUILD=2 CORE_COUNT=2 diff --git a/README.md b/README.md index a430ecd..061210c 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,12 @@ 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.13]][lnk_5.13] [![imgVerInfo][ver_img_5.13.1]][lnk_5.13.1] | [![imgSizeInfo][size_img_5.13.1]][lnk_5.13.1] | +| [![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_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.5]][lnk_5.12.5] | [![imgSizeInfo][size_img_5.12.4]][lnk_5.12.5] | +| [![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.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] | @@ -83,7 +86,8 @@ All currently supported versions of `Qt` should be available as tags. I added al | [![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.8]][lnk_5.9.8] | [![imgSizeInfo][size_img_5.9.8]][lnk_5.9.8] | +| [![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] | @@ -101,10 +105,22 @@ All currently supported versions of `Qt` should be available as tags. I added al [size_img_latest]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:latest.svg [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 +[lnk_5.14]: https://microbadger.com/images/darkmattercoder/qt-build:5.14 + +[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 + [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 [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 +[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 [lnk_5.13.1]: https://microbadger.com/images/darkmattercoder/qt-build:5.13.1 @@ -117,6 +133,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.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 + [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 [lnk_5.12.5]: https://microbadger.com/images/darkmattercoder/qt-build:5.12.5 @@ -177,6 +197,10 @@ All currently supported versions of `Qt` should be available as tags. I added al [size_img_5.9]: https://images.microbadger.com/badges/image/darkmattercoder/qt-build:5.9.svg [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 +[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 [lnk_5.9.8]: https://microbadger.com/images/darkmattercoder/qt-build:5.9.8 diff --git a/buildconfig/configure-5.12.6.sh b/buildconfig/configure-5.12.6.sh new file mode 100644 index 0000000..8708c02 --- /dev/null +++ b/buildconfig/configure-5.12.6.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 \ No newline at end of file diff --git a/buildconfig/configure-5.13.2.sh b/buildconfig/configure-5.13.2.sh new file mode 100644 index 0000000..8708c02 --- /dev/null +++ b/buildconfig/configure-5.13.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 \ No newline at end of file diff --git a/buildconfig/configure-5.14.0.sh b/buildconfig/configure-5.14.0.sh new file mode 100644 index 0000000..8708c02 --- /dev/null +++ b/buildconfig/configure-5.14.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 \ No newline at end of file diff --git a/buildconfig/configure-5.9.9.sh b/buildconfig/configure-5.9.9.sh new file mode 100644 index 0000000..cfe77d4 --- /dev/null +++ b/buildconfig/configure-5.9.9.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -e +set -x +CORE_COUNT=$1 +# adding compatible ssl version +git clone https://github.com/openssl/openssl.git +cd openssl +git checkout OpenSSL_1_0_2-stable +LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0) +git checkout $LATEST_TAG +./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared +make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT +make test > /dev/null 2>&1 || make test +make install > /dev/null 2>&1 || make install +cd .. +sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json +OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib +mkdir -p /opt/extra-dependencies/lib +cp -r /opt/openssl_build_stable /opt/extra-dependencies +ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib \ No newline at end of file From 8fbaf464612f6a7a32d01590514da9c6f7a6ccf7 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sat, 4 Jan 2020 16:39:19 +0100 Subject: [PATCH 73/75] add libdbus-1-dev and libnss3-dev to build 5.14.0 --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 76517b4..aad3d7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,9 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme libxcb-glx0-dev \ # bash needed for argument substitution in entrypoint bash \ + # since 5.14.0 we apparently need libdbus-1-dev and libnss3-dev + libnss3-dev \ + libdbus-1-dev \ && apt-get -qq clean \ && rm -rf /var/lib/apt/lists/* \ && printf "#!/bin/sh\nls -lah" > /usr/local/bin/ll && chmod +x /usr/local/bin/ll From 81de6a795f8e0fee79db7b688fc9a1ba5c5f52b3 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sat, 4 Jan 2020 17:23:17 +0100 Subject: [PATCH 74/75] updating workflow for new versions --- .github/workflows/dockerimage.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 2a8ab08..faaedcf 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -9,10 +9,16 @@ jobs: fail-fast: false matrix: env: + - VERSION: 5.14.0 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=14 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.13.2 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=2 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.13.1 ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.13.0 ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=13 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.12.6 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=6 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.12.5 ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=12 --build-arg QT_VERSION_PATCH=5 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.12.4 @@ -37,6 +43,8 @@ jobs: ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=10 --build-arg QT_VERSION_PATCH=1 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.10.0 ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=10 --build-arg QT_VERSION_PATCH=0 --build-arg QT_DOWNLOAD_BRANCH=archive --build-arg QT_TARBALL_NAMING_SCHEME=everywhere --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 + - VERSION: 5.9.9 + ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=9 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.8 ARGS: --build-arg QT_VERSION_MAJOR=5 --build-arg QT_VERSION_MINOR=9 --build-arg QT_VERSION_PATCH=8 --build-arg QT_DOWNLOAD_BRANCH=official_releases --build-arg QT_TARBALL_NAMING_SCHEME=everywhere-opensource --build-arg CI_BUILD=2 --build-arg CORE_COUNT=2 - VERSION: 5.9.7 From 62b8bc0f94c51a26e8817ca3ead3d72842556517 Mon Sep 17 00:00:00 2001 From: "devel@jochenbauer.net" Date: Sat, 4 Jan 2020 17:56:21 +0100 Subject: [PATCH 75/75] trying the next build stage --- .github/workflows/dockerimage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index faaedcf..e5e8cca 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -76,4 +76,5 @@ jobs: - uses: actions/checkout@v1 - run: | docker build --pull --cache-from darkmattercoder/qt-build:base-$VERSION $ARGS --target=base -t darkmattercoder/qt-build:base-$VERSION . + docker build --pull --cache-from darkmattercoder/qt-build:builder-$VERSION $ARGS --target=builder -t darkmattercoder/qt-build:builder-$VERSION . env: ${{ matrix.env }}