Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/disable-select-on-icons
This commit is contained in:
commit
4cba955fca
1 changed files with 1 additions and 3 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue