Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
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
FSL
fslpy
Commits
78b20075
Commit
78b20075
authored
4 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
CI: Migrate to gitlab pages
parent
c016f0de
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.ci/build_doc.sh
+2
-1
2 additions, 1 deletion
.ci/build_doc.sh
.gitlab-ci.yml
+24
-23
24 additions, 23 deletions
.gitlab-ci.yml
with
26 additions
and
24 deletions
.ci/build_doc.sh
+
2
−
1
View file @
78b20075
...
...
@@ -4,4 +4,5 @@ set -e
pip
install
-r
requirements-dev.txt
python setup.py doc
mv
doc/html doc/
"
$CI_COMMIT_REF_NAME
"
mkdir
-p
public
mv
doc/html/
*
public/
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
24
−
23
View file @
78b20075
...
...
@@ -9,12 +9,12 @@
#
# 2. style: Check coding style
#
# 3. doc: Building API documentation
# 3. doc: Building
and upload
API documentation
using GitLab Pages.
#
# 4. build: Building source and wheel distributions
#
# 5. deploy: Uploading the build outputs to pypi/hosting servers
, and the
#
documentation to a hosting server.
# 5. deploy: Uploading the build outputs to pypi/hosting servers
.
#
#
# Custom docker images are used for several jobs - these images are
# available at:
...
...
@@ -24,13 +24,10 @@
# The test and style stages are executed on all branches of upstream and fork
# repositories.
#
# The doc stage, and the deploy-doc job, is executed on all branches of the
# upstream repository.
#
# The build stage, and the remaining jobs in the deploy stage, are only
# executed on the upstream repository, and only for release tags.
# The doc stage is executed on release branches of the upstream repository.
#
# The deploy stages are manually instantiated.
# The build and deploy stages are executed on tags on the upstream
# repository, and the deploy stage must be manually instantiated.
#
# Most of the logic for each job is defined in shell scripts in the .ci
# sub-directory.
...
...
@@ -61,16 +58,10 @@ stages:
# - SSH_PRIVATE_KEY_FSL_DOWNLOAD - private key for downloading some FSL
# files from a remote server (FSL_HOST)
#
# - SSH_PRIVATE_KEY_DOC_DEPLOY - private key for rsyncing documentation
# to remote host (DOC_HOST)
#
# - SSH_SERVER_HOSTKEYS - List of trusted SSH hosts
#
# - DOC_HOST: - Username@host to upload documentation to
# (e.g. "paulmc@jalapeno.fmrib.ox.ac.uk")
#
# - FSL_HOST: - Username@host to download FSL data from
# (
e.g. "paulmc@jalapeno.fmrib.ox.ac.uk
")
# (
most likely "paulmc@localhost
")
#
# - FSL_ATLAS_DIR: - Location of the FSL atlas data on
# FSL_HOST.
...
...
@@ -110,6 +101,11 @@ variables:
-
master@fsl/fslpy
.only_release_branches
:
&only_release_branches
only
:
-
/^v.+$/@fsl/fslpy
.only_releases
:
&only_releases
only
:
-
tags@fsl/fslpy
...
...
@@ -201,12 +197,18 @@ style:
TEST_STYLE
:
"
true"
###########
# Doc stage
###########
#############
# Pages stage
#############
# I would like to have separate doc deploys for
# both the master and latest release branches,
# but this is awkward with gitlab pages. So
# currently the most recently executed pages
# job is the one that gets deployed.
build-doc
:
<<
:
*only_
upstream
pages
:
<<
:
*only_
release_branches
tags
:
-
docker
...
...
@@ -218,9 +220,8 @@ build-doc:
-
bash ./.ci/build_doc.sh
artifacts
:
expire_in
:
1 day
paths
:
-
doc/$CI_COMMIT_REF_NAME
-
public
#############
...
...
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