added archived versions by adding a build argument for them

Author: Jochen Bauer

.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

Dockerfile

@@ -78,14 +78,16 @@ 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
 
 # Installing from here
 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}
 

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                                          |
 | ------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------- |