moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/disable-select-on-icons

This commit is contained in:
Shpuld Shpuldson 2017-11-02 16:41:15 +02:00
parent f897c656fc 6e611f4039
commit 4cba955fca
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -11,9 +11,6 @@ before_script:
# Run ssh-agent (inside the build environment) # Run ssh-agent (inside the build environment)
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
# Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
- ssh-add <(echo "$SSH_PRIVATE_KEY")
# For Docker builds disable host key checking. Be aware that by adding that # For Docker builds disable host key checking. Be aware that by adding that
# you are suspectible to man-in-the-middle attacks. # you are suspectible to man-in-the-middle attacks.
# WARNING: Use this only with the Docker executor, if you use it with shell # WARNING: Use this only with the Docker executor, if you use it with shell
@ -62,4 +59,5 @@ deploy:
script: script:
- yarn - yarn
- npm run build - npm run build
- ssh-add <(echo "$SSH_PRIVATE_KEY")
- scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma - scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma