Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 42 additions & 30 deletions ci/build_binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,51 @@ fi
mkdir -p "${TRAVIS_BUILD_DIR}/releases"
echo "building bins into ${TRAVIS_BUILD_DIR}/releases"

for GOARCH in amd64
do
for GOOS in darwin linux windows
build_bins(){
for GOARCH in amd64
do
FILENAME="${TRAVIS_BUILD_DIR}/releases/tegola_${GOOS}_${GOARCH}"
if [[ "$CGO_ENABLED" != "0" ]]; then
echo "CGO_ENABLED: $CGO_ENABLED"
FILENAME="${FILENAME}_cgo"
fi
for GOOS in darwin linux windows
do
FILENAME="${TRAVIS_BUILD_DIR}/releases/tegola_${GOOS}_${GOARCH}"
if [[ "$CGO_ENABLED" != "0" ]]; then
echo "CGO_ENABLED: $CGO_ENABLED"
FILENAME="${FILENAME}_cgo"
fi

EXT=""
if [[ $GOOS == windows ]]; then
EXT=".exe"
fi
EXT=""
if [[ $GOOS == windows ]]; then
EXT=".exe"
fi

# use xgo for CGO builds and the normal Go toolchain for non CGO builds
if [[ "$CGO_ENABLED" != "0" ]]; then
echo "CGO_ENABLED: $CGO_ENABLED"
xgo -go 1.10.x --targets="${GOOS}/${GOARCH}" -ldflags "${LDFLAGS}" -dest "${TRAVIS_BUILD_DIR}/releases" github.com/go-spatial/tegola/cmd/tegola
mv ${TRAVIS_BUILD_DIR}/releases/tegola-${GOOS}* "${TRAVIS_BUILD_DIR}/releases/tegola${EXT}"
else
GOOS=${GOOS} GOARCH=${GOARCH} go build -ldflags "${LDFLAGS}" -o "${TRAVIS_BUILD_DIR}/releases/tegola${EXT}" github.com/go-spatial/tegola/cmd/tegola
chmod a+x "${TRAVIS_BUILD_DIR}/releases/tegola${EXT}"
fi
# use xgo for CGO builds and the normal Go toolchain for non CGO builds
if [[ "$CGO_ENABLED" != "0" ]]; then
echo "CGO_ENABLED: $CGO_ENABLED"
xgo -go 1.10.x --targets="${GOOS}/${GOARCH}" -ldflags "${LDFLAGS}" -dest "${TRAVIS_BUILD_DIR}/releases" github.com/go-spatial/tegola/cmd/tegola
mv ${TRAVIS_BUILD_DIR}/releases/tegola-${GOOS}* "${TRAVIS_BUILD_DIR}/releases/tegola${EXT}"
else
GOOS=${GOOS} GOARCH=${GOARCH} go build -ldflags "${LDFLAGS}" -o "${TRAVIS_BUILD_DIR}/releases/tegola${EXT}" github.com/go-spatial/tegola/cmd/tegola
chmod a+x "${TRAVIS_BUILD_DIR}/releases/tegola${EXT}"
fi

dir=$(dirname $FILENAME)
fn=$(basename $FILENAME)
cdir=$(pwd)
cd $dir
zip -9 -D ${fn}.zip tegola${EXT}
rm -f tegola${EXT}
cd ${cdir}
done
done
dir=$(dirname $FILENAME)
fn=$(basename $FILENAME)
cdir=$(pwd)
cd $dir
zip -9 -D ${fn}.zip tegola${EXT}
rm -f tegola${EXT}
cd ${cdir}
done
done
}

# AWS lambda has a special shim and needs to be built for linux
build_lambda() {
local filename="${TRAVIS_BUILD_DIR}/releases/tegola_${GOOS}_${GOARCH}"
GOOS="linux" GOARCH="amd64" go build -ldflags "${LDFLAGS}" -o "${TRAVIS_BUILD_DIR}/releases/tegola_lambda" github.com/go-spatial/tegola/cmd/tegola_lambda
}


build_bins
build_lambda

cd $OLD_DIR
2 changes: 1 addition & 1 deletion provider/postgis/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ func decipherFields(ctx context.Context, geoFieldname, idFieldname string, descr
}
case *pgtype.Numeric:
var num float64
values[i].(*pgtype.Numeric).AssignTo(&num)
vex.AssignTo(&num)

tags[desc.Name] = num
default:
Expand Down
25 changes: 0 additions & 25 deletions vendor/github.com/jackc/pgx/.gitignore

This file was deleted.

33 changes: 0 additions & 33 deletions vendor/github.com/jackc/pgx/.travis.yml

This file was deleted.

21 changes: 21 additions & 0 deletions vendor/github.com/jackc/pgx/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/jackc/pgx/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading