Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
docker-qt-tests
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
qtwaylandtests
docker-qt-tests
Commits
840e43f6
Commit
840e43f6
authored
Mar 26, 2018
by
Johan Helsing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Split cloning and checkout into two
parent
ac64eeb3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
Dockerfile
Dockerfile
+4
-0
scripts/checkout-qt.sh
scripts/checkout-qt.sh
+14
-0
scripts/run.sh
scripts/run.sh
+4
-2
No files found.
Dockerfile
View file @
840e43f6
...
...
@@ -29,5 +29,9 @@ ENV XDG_RUNTIME_DIR=/tmp
ENV
QT_QPA_PLATFORM=wayland
ENV
MAKEFLAGS=-j8
# Keep Qt source code as part of the image to avoid duplication
COPY
scripts/clone-qt.sh /home/build/scripts/clone-qt.sh
RUN
scripts/clone-qt.sh
COPY
scripts/ /home/build/scripts
CMD
"./scripts/run.sh"
scripts/checkout-qt.sh
0 → 100755
View file @
840e43f6
#!/bin/bash
set
-ex
srcdir
=
$(
pwd
)
/qt5
qt5_rev
=
${
QT_DOCKERTEST_QT5_REV
:-
5
.11
}
git fetch
--depth
1 origin
"
$qt5_rev
"
git checkout FETCH_HEAD
git submodule update
--init
--
qtbase qtxmlpatterns qtdeclarative qtwayland
if
[[
-v
QT_DOCKERTEST_QTWAYLAND_REV
]]
;
then
cd
"
$srcdir
/qtwayland"
git fetch
--depth
1 origin
"
$QT_DOCKERTEST_QTWAYLAND_REV
"
git checkout FETCH_HEAD
fi
scripts/run.sh
View file @
840e43f6
#!/bin/bash
set
-ex
time
scripts/clone-qt.sh
echo
Finished cloning
#time scripts/clone-qt.sh
#echo Finished cloning
time
scripts/update-qt.sh
echo
Finished preparing sources
time
scripts/build-qt.sh
echo
Finished building
time
scripts/build-qtbase-tests.sh
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment