Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Commit 1d3a2e6

Browse files
author
1138-4EB
authored
fix: build errors (#18)
1 parent c5a06e1 commit 1d3a2e6

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ stages:
1010
- lint
1111
- test
1212
env:
13-
- CMD="docker run --rm -itv $(pwd):/src -w /src filebrowser/dev sh -c"
13+
- CMD="docker run --rm -itv $(pwd):/go/src/github.com/filebrowser/caddy -w /go/src/github.com/filebrowser/caddy filebrowser/dev sh -c"
1414
jobs:
1515
include:
1616
- stage: lint

build.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,8 @@
22

33
set -e
44

5-
# Check if filebrowser exists but is empty (i.e., we are inside filebrowser/dev)
6-
if [[ ! -d ../filebrowser/.git ]]; then
7-
cd ..
8-
rm -rf filebrowser
9-
cd caddy
10-
fi
11-
125
go get -v ./...
13-
cd ../../mholt/caddy/caddy
6+
cd /go/src/github.com/mholt/caddy/caddy
147
go get -v ./...
158
go get -v github.com/caddyserver/builds
169
sed -i.bak 's#// This is where other plugins get plugged in (imported)#_ "github.com/filebrowser/caddy"#' caddymain/run.go

rice-box.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package http
1+
package caddy
22

33
import (
44
"time"

0 commit comments

Comments
 (0)