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
View File
@@ -6,6 +6,7 @@
# Folders # Folders
_obj _obj
_test _test
editor
# Architecture specific extensions/prefixes # Architecture specific extensions/prefixes
*.[568vq] *.[568vq]
@@ -25,6 +26,7 @@ _testmain.go
# Bindata # Bindata
bindata_assetfs.go bindata_assetfs.go
bindata.go
# Built binary # Built binary
maputnik maputnik
-3
View File
@@ -9,8 +9,6 @@ addons:
paths: paths:
- maputnik - maputnik
install: install:
- nvm install 6
- nvm use 6
- go get -u golang.org/x/sys/... - go get -u golang.org/x/sys/...
- go get github.com/fsnotify/fsnotify - go get github.com/fsnotify/fsnotify
- go get github.com/gorilla/handlers - go get github.com/gorilla/handlers
@@ -21,7 +19,6 @@ install:
- go get github.com/jteeuwen/go-bindata/... - go get github.com/jteeuwen/go-bindata/...
- wget https://raw.githubusercontent.com/openmaptiles/klokantech-basic-gl-style/master/style.json - wget https://raw.githubusercontent.com/openmaptiles/klokantech-basic-gl-style/master/style.json
script: script:
- mkdir -p editor/public
- make - make
- ./maputnik --help - ./maputnik --help
- ./maputnik --version - ./maputnik --version
+7 -6
View File
@@ -1,21 +1,22 @@
SOURCEDIR=. SOURCEDIR=.
SOURCES := $(shell find $(SOURCEDIR) -name '*.go') SOURCES := $(shell find $(SOURCEDIR) -name '*.go')
BINARY=maputnik BINARY=maputnik
EDITOR_VERSION ?= v1.5.0
all: $(BINARY) all: $(BINARY)
$(BINARY): $(SOURCES) bindata_assetfs.go $(BINARY): $(SOURCES) bindata_assetfs.go
go build -o ${BINARY} go build -o ${BINARY}
editor/node_modules: editor/create_folder:
cd editor && npm install mkdir -p editor
editor/public: editor/node_modules editor/pull_release: editor/create_folder
cd editor && npm run build 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/... go-bindata-assetfs --prefix "editor/" editor/public/...
.PHONY: clean .PHONY: clean
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
+1 -1
View File
@@ -13,7 +13,6 @@ environment:
# scripts that run after cloning repository # scripts that run after cloning repository
install: install:
- git submodule update --init --recursive
- set PATH=%GOPATH%\bin;c:\go\bin;%PATH% - set PATH=%GOPATH%\bin;c:\go\bin;%PATH%
- go version - go version
- go env - go env
@@ -25,6 +24,7 @@ install:
- go get github.com/urfave/cli - go get github.com/urfave/cli
- go get github.com/elazarl/go-bindata-assetfs/... - go get github.com/elazarl/go-bindata-assetfs/...
- go get github.com/jteeuwen/go-bindata/... - go get github.com/jteeuwen/go-bindata/...
- make
# to run your custom scripts instead of automatic MSBuild # to run your custom scripts instead of automatic MSBuild
build_script: build_script: