Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
61a3536122
1 changed files with 3 additions and 3 deletions
6
Makefile
6
Makefile
|
@ -25,8 +25,8 @@ build:
|
|||
go build -o packaging/root/usr/local/bin/droned -ldflags "-X main.revision $(SHA)" github.com/drone/drone/server
|
||||
|
||||
install:
|
||||
install -t /usr/local/bin debian/drone/usr/local/bin/drone
|
||||
install -t /usr/local/bin debian/drone/usr/local/bin/droned
|
||||
install -t /usr/local/bin packaging/root/usr/local/bin/drone
|
||||
install -t /usr/local/bin packaging/root/usr/local/bin/droned
|
||||
|
||||
run:
|
||||
@go run server/main.go --config=$$HOME/.drone/config.toml
|
||||
|
@ -89,4 +89,4 @@ rpm:
|
|||
# DRONE_STAGING_KEY -- the identity file path (~/.ssh/id_rsa)
|
||||
deploy:
|
||||
scp -i $$DRONE_STAGING_KEY debian/drone.deb $$DRONE_STAGING_USER@$$DRONE_STAGING_HOST:/tmp
|
||||
ssh -i $$DRONE_STAGING_KEY $$DRONE_STAGING_USER@$$DRONE_STAGING_HOST -- dpkg -i /tmp/drone.deb
|
||||
ssh -i $$DRONE_STAGING_KEY $$DRONE_STAGING_USER@$$DRONE_STAGING_HOST -- dpkg -i /tmp/drone.deb
|
||||
|
|
Loading…
Reference in a new issue