Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
50b7bd24
Commit
50b7bd24
authored
4 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
Try disabling "make all" when checking docs.
parent
fe0e62dd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Makefile.am
+2
-0
2 additions, 0 deletions
Makefile.am
scripts/ci/ci-driver.sh
+20
-34
20 additions, 34 deletions
scripts/ci/ci-driver.sh
with
23 additions
and
35 deletions
.gitlab-ci.yml
+
1
−
1
View file @
50b7bd24
...
...
@@ -111,7 +111,6 @@ debian-distcheck:
script
:
-
./scripts/ci/ci-driver.sh
# TODO: it would be neat to disable the "make all" part of this one.
debian-docs
:
image
:
debian:stable
<<
:
*debian-template
...
...
@@ -119,6 +118,7 @@ debian-docs:
DOXYGEN
:
"
yes"
ASCIIDOC
:
"
yes"
CHECK
:
"
no"
RUN_STAGE_BUILD
:
"
no"
script
:
-
./scripts/ci/ci-driver.sh
...
...
This diff is collapsed.
Click to expand it.
Makefile.am
+
2
−
0
View file @
50b7bd24
...
...
@@ -149,6 +149,8 @@ include src/include.am
include
doc/include.am
include
contrib/include.am
manpages
:
$(nodist_man1_MANS)
EXTRA_DIST
+=
\
ChangeLog
\
CONTRIBUTING
\
...
...
This diff is collapsed.
Click to expand it.
scripts/ci/ci-driver.sh
+
20
−
34
View file @
50b7bd24
...
...
@@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}"
# Options for which CI system this is.
ON_GITLAB
=
"
${
ON_GITLAB
:-
yes
}
"
# Options for things we usually won't want to skip.
RUN_STAGE_CONFIGURE
=
"
${
RUN_STAGE_CONFIGURE
:-
yes
}
"
RUN_STAGE_BUILD
=
"
${
RUN_STAGE_BUILD
:-
yes
}
"
RUN_STAGE_TEST
=
"
${
RUN_STAGE_TEST
:-
yes
}
"
# Options for how to build Tor. All should be yes/no.
FATAL_WARNINGS
=
"
${
FATAL_WARNINGS
:-
yes
}
"
HARDENING
=
"
${
HARDENING
:-
no
}
"
...
...
@@ -165,33 +170,6 @@ else
}
fi
if
[[
"
$*
"
==
""
]]
;
then
RUN_STAGE_CONFIGURE
=
"yes"
RUN_STAGE_BUILD
=
"yes"
RUN_STAGE_TEST
=
"yes"
else
RUN_STAGE_CONFIGURE
=
"no"
RUN_STAGE_BUILD
=
"no"
RUN_STAGE_TEST
=
"no"
for
stage
in
"
$@
"
;
do
case
"
$stage
"
in
configure
)
RUN_STAGE_CONFIGURE
=
"yes"
;;
build
)
RUN_STAGE_BUILD
=
"yes"
;;
test
)
RUN_STAGE_TEST
=
"yes"
;;
*
)
error
"Unknown stage
$stage
"
;;
esac
done
fi
#############################################################################
# Validate inputs.
...
...
@@ -206,6 +184,10 @@ yes_or_no RUST
yes_or_no DOXYGEN
yes_or_no ASCIIDOC
yes_or_no RUN_STAGE_CONFIGURE
yes_or_no RUN_STAGE_BUILD
yes_or_no RUN_STAGE_TEST
yes_or_no CHECK
yes_or_no STEM
yes_or_no DISTCHECK
...
...
@@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
end_section Distcheck
fi
fi
##############################
# Run tests.
...
...
@@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then
exit
0
fi
if
[[
"
$RUN_STAGE_BUILD
"
=
"no"
]]
;
then
debug
"Skipped build stage. Making sure that ./src/app/tor exists."
if
[[
!
-f
"./src/app/tor"
]]
;
then
die
"
$(
pwd
)
/src/app/tor does not exist"
fi
fi
FAILED_TESTS
=
""
if
[[
"
${
DOXYGEN
}
"
=
'yes'
&&
"
${
TOR_VER_AT_LEAST_043
}
"
=
'yes'
]]
;
then
...
...
@@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
end_section Doxygen
fi
if
[[
"
${
ASCIIDOC
}
"
=
'yes'
]]
;
then
start_section Asciidoc
if
runcmd make manpages
;
then
hooray
"make manpages has succeeded."
else
FAILED_TESTS
=
"
${
FAILED_TESTS
}
asciidoc"
fi
end_section Asciidoc
fi
if
[[
"
${
CHECK
}
"
=
"yes"
]]
;
then
start_section
"Check"
if
runcmd make
"
${
make_options
[@]
}
"
check
;
then
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment