Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
FSL
fsleyes
fsleyes-widgets
Commits
8c4f81e7
Commit
8c4f81e7
authored
May 31, 2018
by
Paul McCarthy
🚵
Browse files
Merge branch 'maint/conda_index' into 'master'
MAINT: Run conda index after deploy See merge request fsl/fsleyes/widgets!21
parents
889fe8fe
43439285
Changes
3
Hide whitespace changes
Inline
Side-by-side
.ci/deploy_conda.sh
View file @
8c4f81e7
...
...
@@ -3,3 +3,4 @@
set
-e
rsync
-rv
dist/conda-bld/
--exclude
'repodata*'
--exclude
"*json"
"condadeploy:"
ssh condaindex
.ci/setup_ssh.sh
View file @
8c4f81e7
...
...
@@ -32,6 +32,7 @@ if [[ -f /.dockerenv ]]; then
if
[[
"
$CI_PROJECT_PATH
"
==
"
$UPSTREAM_PROJECT
"
]]
;
then
echo
"
$SSH_PRIVATE_KEY_DOC_DEPLOY
"
>
$HOME
/.ssh/id_doc_deploy
;
echo
"
$SSH_PRIVATE_KEY_CONDA_DEPLOY
"
>
$HOME
/.ssh/id_conda_deploy
;
echo
"
$SSH_PRIVATE_KEY_CONDA_INDEX
"
>
$HOME
/.ssh/id_conda_index
;
fi
;
chmod
go-rwx
$HOME
/.ssh/id_
*
;
...
...
@@ -56,10 +57,15 @@ if [[ -f /.dockerenv ]]; then
echo
" User
${
DOC_HOST
%@*
}
"
>>
$HOME
/.ssh/config
;
echo
" IdentityFile
$HOME
/.ssh/id_doc_deploy"
>>
$HOME
/.ssh/config
;
echo
"Host condadeploy"
>>
$HOME
/.ssh/config
;
echo
" HostName
${
CONDA_HOST
##*@
}
"
>>
$HOME
/.ssh/config
;
echo
" User
${
CONDA_HOST
%@*
}
"
>>
$HOME
/.ssh/config
;
echo
" IdentityFile
$HOME
/.ssh/id_conda_deploy"
>>
$HOME
/.ssh/config
;
echo
"Host condadeploy"
>>
$HOME
/.ssh/config
;
echo
" HostName
${
CONDA_HOST
##*@
}
"
>>
$HOME
/.ssh/config
;
echo
" User
${
CONDA_HOST
%@*
}
"
>>
$HOME
/.ssh/config
;
echo
" IdentityFile
$HOME
/.ssh/id_conda_deploy"
>>
$HOME
/.ssh/config
;
echo
"Host condaindex"
>>
$HOME
/.ssh/config
;
echo
" HostName
${
CONDA_HOST
##*@
}
"
>>
$HOME
/.ssh/config
;
echo
" User
${
CONDA_HOST
%@*
}
"
>>
$HOME
/.ssh/config
;
echo
" IdentityFile
$HOME
/.ssh/id_conda_index"
>>
$HOME
/.ssh/config
;
echo
"Host *"
>>
$HOME
/.ssh/config
;
echo
" IdentitiesOnly yes"
>>
$HOME
/.ssh/config
;
...
...
.gitlab-ci.yml
View file @
8c4f81e7
...
...
@@ -64,6 +64,9 @@ stages:
# - SSH_PRIVATE_KEY_CONDA_DEPLOY - private key for rsyncing conda builds
# to remote host (CONDA_HOST)
#
# - SSH_PRIVATE_KEY_CONDA_INDEX - private key for updating conda channel
# (on CONDA_HOST)
#
# - SSH_SERVER_HOSTKEYS - List of trusted SSH hosts
#
# - DOC_HOST: - Username@host to upload documentation to
...
...
Write
Preview
Supports
Markdown
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