Skip to content

Commit f5d7b11

Browse files
hmoffatthmoffatt
committed
Merge remote-tracking branch 'upstream/deploy' into sqldrivers
2 parents cbfa33b + 6abca6f commit f5d7b11

22 files changed

+103
-40
lines changed

‎.gitignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# Ignore all
2+
*
3+
4+
# Unignore all with extensions
5+
!*.*
6+
7+
# Unignore all dirs
8+
!*/
9+
110
tests/*/build
211
tests/build
312
tests/tests.pro
13+
Makefile
14+
.qmake.stash
15+
*.qmake.stash
16+
*qmake.stash
17+
/.qmake.stash
18+
*.o
19+
run-tests.sh
20+
tests.pro
21+
/.qmake.stash

‎.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,16 @@ script:
5050
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin || travis_terminate 1; fi'
5151
- docker pull darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true
5252
- docker pull darkmattercoder/qt-build:builder-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true
53+
- docker pull darkmattercoder/qt-build:base-$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || true
54+
- 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;
5355
- 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;
5456
- 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;
5557
- tests/generate_tests.py || travis_terminate 1;
5658
- 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;
59+
- 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;
5760
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker push darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1; fi'
5861
- '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'
62+
- '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'
5963
- python ci/tag_image.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH || travis_terminate 1;
6064
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then python ci/push_images.py darkmattercoder/qt-build:$QT_VERSION_MAJOR.$QT_VERSION_MINOR.$QT_VERSION_PATCH; fi'
6165
jobs:

‎Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,15 @@ ENV ENTRYPOINT_DIR=/usr/local/bin
123123
ENV APP_BUILDDIR=/var/build
124124

125125
COPY --from=builder ${QT_PREFIX} ${QT_PREFIX}
126-
COPY --from=builder /opt/extra-dependencies/ /
126+
127+
# the next copy statement failed often. My only guess is, that the extra dependencies are not existent and somehow that
128+
# 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
129+
RUN true
130+
COPY --from=builder /opt/extra-dependencies /opt/extra-dependencies
131+
132+
#for modifications during configuration
133+
ENV LD_LIBRARY_PATH=/opt/extra-dependencies/lib:${LD_LIBRARY_PATH}
134+
127135
# the next copy statement failed often. My only guess is, that the extra dependencies are not existent and somehow that
128136
# 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
129137
RUN true

‎build-dockerfile-local.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
#!/bin/bash
22
# Call this script like so:
3-
#./build-dockerfile-local.sh 5 6 0 everywhere-opensource 2 8
3+
#./build-dockerfile-local.sh 5 6 0 official_releases everywhere-opensource 2 8
4+
set -e
45
QT_VERSION_MAJOR=$1
56
QT_VERSION_MINOR=$2
67
QT_VERSION_PATCH=$3
7-
QT_TARBALL_NAMING_SCHEME=$4
8-
CI_BUILD=$5
9-
CORE_COUNT=$6
10-
PROXY=$7
8+
QT_DOWNLOAD_BRANCH=$4
9+
QT_TARBALL_NAMING_SCHEME=$5
10+
CI_BUILD=$6
11+
CORE_COUNT=$7
12+
PROXY=$8
13+
# base
14+
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 .
1115
# builder
12-
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 .
16+
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 .
1317
# qt
14-
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 .
18+
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 .

‎buildconfig/configure-5.6.0.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test
1414
make install > /dev/null 2>&1 || make install
1515
cd ..
1616
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
17-
mkdir /opt/extra-dependencies/opt
18-
cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
17+
mkdir -p /opt/extra-dependencies/lib
18+
cp -r /opt/openssl_build_stable /opt/extra-dependencies
19+
ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

‎buildconfig/configure-5.6.1-1.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ make test > /dev/null 2>&1 || make test
1616
make install > /dev/null 2>&1 || make install
1717
cd ..
1818
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
19-
mkdir /opt/extra-dependencies/opt
20-
cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
19+
mkdir -p /opt/extra-dependencies/lib
20+
cp -r /opt/openssl_build_stable /opt/extra-dependencies
21+
ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

‎buildconfig/configure-5.6.2.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test
1414
make install > /dev/null 2>&1 || make install
1515
cd ..
1616
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
17-
mkdir /opt/extra-dependencies/opt
18-
cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
17+
mkdir -p /opt/extra-dependencies/lib
18+
cp -r /opt/openssl_build_stable /opt/extra-dependencies
19+
ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

‎buildconfig/configure-5.6.3.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ make test > /dev/null 2>&1 || make test
1414
make install > /dev/null 2>&1 || make install
1515
cd ..
1616
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
17-
mkdir /opt/extra-dependencies/opt
18-
cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
17+
mkdir -p /opt/extra-dependencies/lib
18+
cp -r /opt/openssl_build_stable /opt/extra-dependencies
19+
ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

‎buildconfig/configure-5.9.0.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install
1515
cd ..
1616
sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
1717
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
18-
mkdir /opt/extra-dependencies/opt
19-
cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
18+
mkdir -p /opt/extra-dependencies/lib
19+
cp -r /opt/openssl_build_stable /opt/extra-dependencies
20+
ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

‎buildconfig/configure-5.9.1.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ make install > /dev/null 2>&1 || make install
1515
cd ..
1616
sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
1717
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
18-
mkdir /opt/extra-dependencies/opt
19-
cp -r /opt/openssl_build_stable /opt/extra-dependencies/opt
18+
mkdir -p /opt/extra-dependencies/lib
19+
cp -r /opt/openssl_build_stable /opt/extra-dependencies
20+
ln -s /opt/extra-dependencies/openssl_build_stable/lib/* /opt/extra-dependencies/lib

0 commit comments

Comments
 (0)