Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
b28b3f60
Commit
b28b3f60
authored
Feb 20, 2016
by
Josh Haberman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Configure ccache directory.
parent
d08c39c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
build_and_run_docker.sh
tools/jenkins/build_and_run_docker.sh
+6
-0
tests.sh
tools/run_tests/tests.sh
+2
-2
No files found.
tools/jenkins/build_and_run_docker.sh
View file @
b28b3f60
...
...
@@ -52,12 +52,18 @@ docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR
# Choose random name for docker container
CONTAINER_NAME
=
"build_and_run_docker_
$(
uuidgen
)
"
# Ensure existence of ccache directory
CCACHE_DIR
=
/tmp/protobuf-ccache
mkdir
-p
$CCACHE_DIR
# Run command inside docker
docker run
\
"
$@
"
\
-e
CCACHE_DIR
=
$CCACHE_DIR
\
-e
EXTERNAL_GIT_ROOT
=
"/var/local/jenkins/protobuf"
\
-e
THIS_IS_REALLY_NEEDED
=
'see https://github.com/docker/docker/issues/14203 for why docker is awful'
\
-v
"
$git_root
:/var/local/jenkins/protobuf:ro"
\
-v
$CCACHE_DIR
:
$CCACHE_DIR
\
-w
/var/local/git/protobuf
\
--name
=
$CONTAINER_NAME
\
$DOCKER_IMAGE_NAME
\
...
...
tools/run_tests/tests.sh
View file @
b28b3f60
...
...
@@ -103,7 +103,7 @@ use_java() {
}
# --batch-mode supresses download progress output that spams the logs.
MVN
=
mvn
--batch-mode
MVN
=
"mvn --batch-mode"
build_java
()
{
# Java build needs `protoc`.
...
...
@@ -125,7 +125,7 @@ build_java_with_conformance_tests() {
build_javanano
()
{
# Java build needs `protoc`.
internal_build_cpp
cd
javanano
&&
mvn
test
&&
cd
..
cd
javanano
&&
$MVN
test
&&
cd
..
}
build_java_jdk6
()
{
...
...
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