Download release instead of building editor from source

This commit is contained in:
Lukas Welte
2019-02-07 16:05:02 +01:00
parent c55278e7da
commit 35c0150522
4 changed files with 10 additions and 10 deletions

2
.gitignore vendored
View File

@@ -6,6 +6,7 @@
# Folders
_obj
_test
editor
# Architecture specific extensions/prefixes
*.[568vq]
@@ -25,6 +26,7 @@ _testmain.go
# Bindata
bindata_assetfs.go
bindata.go
# Built binary
maputnik

View File

@@ -9,8 +9,6 @@ addons:
paths:
- maputnik
install:
- nvm install 6
- nvm use 6
- go get -u golang.org/x/sys/...
- go get github.com/fsnotify/fsnotify
- go get github.com/gorilla/handlers
@@ -21,7 +19,6 @@ install:
- go get github.com/jteeuwen/go-bindata/...
- wget https://raw.githubusercontent.com/openmaptiles/klokantech-basic-gl-style/master/style.json
script:
- mkdir -p editor/public
- make
- ./maputnik --help
- ./maputnik --version

View File

@@ -1,21 +1,22 @@
SOURCEDIR=.
SOURCES := $(shell find $(SOURCEDIR) -name '*.go')
BINARY=maputnik
EDITOR_VERSION ?= v1.5.0
all: $(BINARY)
$(BINARY): $(SOURCES) bindata_assetfs.go
go build -o ${BINARY}
editor/node_modules:
cd editor && npm install
editor/create_folder:
mkdir -p editor
editor/public: editor/node_modules
cd editor && npm run build
editor/pull_release: editor/create_folder
cd editor && rm -rf public && curl -L https://github.com/maputnik/editor/releases/download/$(EDITOR_VERSION)/public.zip --output public.zip && unzip public.zip && rm public.zip
bindata_assetfs.go: editor/public
bindata_assetfs.go: editor/pull_release
go-bindata-assetfs --prefix "editor/" editor/public/...
.PHONY: clean
clean:
rm -rf editor/public && rm -f bindata_assetfs.go && rm -f maputnik
rm -rf editor/public && rm -f bindata.go && rm -f bindata_assetfs.go && rm -f maputnik

View File

@@ -13,7 +13,6 @@ environment:
# scripts that run after cloning repository
install:
- git submodule update --init --recursive
- set PATH=%GOPATH%\bin;c:\go\bin;%PATH%
- go version
- go env
@@ -25,6 +24,7 @@ install:
- go get github.com/urfave/cli
- go get github.com/elazarl/go-bindata-assetfs/...
- go get github.com/jteeuwen/go-bindata/...
- make
# to run your custom scripts instead of automatic MSBuild
build_script: