forked from cwtch.im/cwtch-ui
Merge branch 'trunk' into fix-macos-dmg-location
This commit is contained in:
commit
86dd8d7f78
|
@ -20,7 +20,7 @@ steps:
|
||||||
# force by pass of ssh host key check, less secure
|
# force by pass of ssh host key check, less secure
|
||||||
- ssh-keyscan -H git.openprivacy.ca >> ~/.ssh/known_hosts
|
- ssh-keyscan -H git.openprivacy.ca >> ~/.ssh/known_hosts
|
||||||
# use Drone ssh var instead of hardcode to allow forks to build (gogs@git.openprivacy.ca:cwtch.im/cwtch-ui.git)
|
# use Drone ssh var instead of hardcode to allow forks to build (gogs@git.openprivacy.ca:cwtch.im/cwtch-ui.git)
|
||||||
- git clone $DRONE_GIT_SSH_URL .
|
- git clone gogs@git.openprivacy.ca:$DRONE_REPO.git .
|
||||||
- git checkout $DRONE_COMMIT
|
- git checkout $DRONE_COMMIT
|
||||||
|
|
||||||
- name: fetch
|
- name: fetch
|
||||||
|
@ -187,7 +187,7 @@ steps:
|
||||||
- git init
|
- git init
|
||||||
# -o UserKnownHostsFile=../known_hosts
|
# -o UserKnownHostsFile=../known_hosts
|
||||||
- git config core.sshCommand 'ssh -o StrictHostKeyChecking=no -i ../id_rsa'
|
- git config core.sshCommand 'ssh -o StrictHostKeyChecking=no -i ../id_rsa'
|
||||||
- git remote add origin $Env:DRONE_GIT_SSH_URL
|
- git remote add origin gogs@git.openprivacy.ca:$Env:DRONE_REPO.git
|
||||||
- git pull origin trunk
|
- git pull origin trunk
|
||||||
- git fetch --tags
|
- git fetch --tags
|
||||||
- git checkout $Env:DRONE_COMMIT
|
- git checkout $Env:DRONE_COMMIT
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
env LD_LIBRARY_PATH=./lib/ ./lib/cwtch
|
exec env LD_LIBRARY_PATH=./lib/ ./lib/cwtch
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
env LD_LIBRARY_PATH=~/.local/lib/cwtch/ ~/.local/lib/cwtch/cwtch
|
exec env LD_LIBRARY_PATH=~/.local/lib/cwtch/ ~/.local/lib/cwtch/cwtch
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
env LD_LIBRARY_PATH=/usr/lib/cwtch /usr/lib/cwtch/cwtch
|
exec env LD_LIBRARY_PATH=/usr/lib/cwtch /usr/lib/cwtch/cwtch
|
||||||
|
|
Loading…
Reference in New Issue