Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mike Perry
Tor
Commits
3c884bc9
Commit
3c884bc9
authored
Aug 26, 2020
by
Alexander Færøy
🍍
Browse files
Merge remote-tracking branch 'tor-gitlab/mr/136'
parents
511730db
20a990ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
3c884bc9
...
...
@@ -92,6 +92,7 @@ variables:
-
if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
# TODO: This next line should not be debian-only.
-
if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi
-
if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi
# Minmal check on debian: just make, make check.
#
...
...
@@ -155,3 +156,14 @@ debian-integration:
STEM
:
"
yes"
script
:
-
./scripts/ci/ci-driver.sh
#####
# Tracing build on Debian stable.
debian-tracing
:
image
:
debian:stable
<<
:
*debian-template
variables
:
TRACING
:
"
yes"
CHECK
:
"
no"
script
:
-
./scripts/ci/ci-driver.sh
changes/ticket40038
0 → 100644
View file @
3c884bc9
o Testing (CI):
- Build tracing configure option into our CI. Closes ticket 40038.
scripts/ci/ci-driver.sh
View file @
3c884bc9
...
...
@@ -33,6 +33,7 @@ COVERAGE="${COVERAGE:-no}"
RUST
=
"
${
RUST
:-
no
}
"
DOXYGEN
=
"
${
DOXYGEN
:-
no
}
"
ASCIIDOC
=
"
${
ASCIIDOC
:-
no
}
"
TRACING
=
"
${
TRACING
:-
no
}
"
# Options for which tests to run. All should be yes/no.
CHECK
=
"
${
CHECK
:-
yes
}
"
...
...
@@ -191,6 +192,7 @@ yes_or_no COVERAGE
yes_or_no RUST
yes_or_no DOXYGEN
yes_or_no ASCIIDOC
yes_or_no TRACING
yes_or_no RUN_STAGE_CONFIGURE
yes_or_no RUN_STAGE_BUILD
...
...
@@ -241,6 +243,9 @@ fi
if
[[
"
$ASCIIDOC
"
!=
"yes"
]]
;
then
configure_options+
=(
"--disable-asciidoc"
)
fi
if
[[
"
$TRACING
"
==
"yes"
]]
;
then
configure_options+
=(
"--enable-tracing-instrumentation-lttng"
)
fi
#############################################################################
# Tell the user about our versions of different tools and packages.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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