diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21f0298d..abb90994 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,61 +1,49 @@ name: ci -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: [push] jobs: - build: - name: Build + runs-on: ubuntu-latest - env: - GOPATH: ${{ github.workspace }} - GO111MODULE: off + steps: + - uses: actions/checkout@v3 - - name: Set up Go - uses: actions/setup-go@v2 - with: - go-version: ^1.14.x - id: go + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.18 - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - with: - path: ./src/github.com/maputnik/desktop/ + - name: Make + run: make - - name: Get style - run: wget https://maputnik.github.io/osm-liberty/style.json + - name: Test --help + run: ./bin/linux/maputnik --help - - name: Make - run: cd src/github.com/maputnik/desktop/ && make + - name: Test --version + run: ./bin/linux/maputnik --version - - name: Test --help - run: ./src/github.com/maputnik/desktop/bin/linux/maputnik --help + - name: Get style + run: wget https://maputnik.github.io/osm-liberty/style.json - - name: Test --version - run: ./src/github.com/maputnik/desktop/bin/linux/maputnik --version + - name: Test --watch + run: ./bin/linux/maputnik --watch --file style.json & sleep 5; kill $! - - name: Test --watch - run: ./src/github.com/maputnik/desktop/bin/linux/maputnik --watch --file style.json & sleep 5; kill $! + - name: Artifacts/linux + uses: actions/upload-artifact@v3 + with: + name: maputnik-linux + path: bin/linux/ - - name: Artifacts/linux - uses: actions/upload-artifact@v1 - with: - name: maputnik-linux - path: ./src/github.com/maputnik/desktop/bin/linux/ + - name: Artifacts/darwin + uses: actions/upload-artifact@v3 + with: + name: maputnik-darwin + path: bin/darwin/ - - name: Artifacts/darwin - uses: actions/upload-artifact@v1 - with: - name: maputnik-darwin - path: ./src/github.com/maputnik/desktop/bin/darwin/ - - - name: Artifacts/windows - uses: actions/upload-artifact@v1 - with: - name: maputnik-windows - path: ./src/github.com/maputnik/desktop/bin/windows/ + - name: Artifacts/windows + uses: actions/upload-artifact@v3 + with: + name: maputnik-windows + path: bin/windows/ diff --git a/.gitignore b/.gitignore index 5a236cd6..a8e1971d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,9 +24,8 @@ _testmain.go *.test *.prof -# Bindata -bindata_assetfs.go -bindata.go +# Binary version of pubilic/editor +rice-box.go # Built binary maputnik diff --git a/Makefile b/Makefile index 113d93c6..140d9d6b 100644 --- a/Makefile +++ b/Makefile @@ -2,33 +2,30 @@ SOURCEDIR=. SOURCES := $(shell find $(SOURCEDIR) -name '*.go') BINARY=maputnik EDITOR_VERSION ?= v1.7.0 +GOPATH := $(if $(GOPATH),$(GOPATH),$(HOME)/go) +GOBIN := $(if $(GOBIN),$(GOBIN),$(HOME)/go/bin) all: $(BINARY) -dependencies: - go get -u golang.org/x/sys/... - go get github.com/gorilla/handlers - go get github.com/gorilla/mux - go get github.com/gorilla/websocket - go get github.com/fsnotify/fsnotify - go get github.com/urfave/cli - go get github.com/elazarl/go-bindata-assetfs/... - go get github.com/jteeuwen/go-bindata/... - go get github.com/mitchellh/gox +$(BINARY): $(GOBIN)/gox $(SOURCES) rice-box.go + $(GOBIN)/gox -osarch "windows/amd64 linux/amd64 darwin/amd64" -output "bin/{{.OS}}/${BINARY}" -$(BINARY): $(SOURCES) bindata_assetfs.go - gox -osarch "windows/amd64 linux/amd64 darwin/amd64" -output "bin/{{.OS}}/${BINARY}" - -editor/create_folder: dependencies +editor/create_folder: mkdir -p editor editor/pull_release: editor/create_folder # if the directory /home/runner/work/editor/editor/build/build exists, we assume that we are are running the makefile within the editor ci workflow test -d /home/runner/work/editor/editor/build/build && echo "exists" && cd editor && cp -R /home/runner/work/editor/editor/build/build public/ || (echo "does not exist" && 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/pull_release - go-bindata-assetfs --prefix "editor/" editor/public/... +$(GOBIN)/gox: + go install github.com/mitchellh/gox@v1.0.1 + +$(GOBIN)/rice: + go install github.com/GeertJohan/go.rice/rice@v1.0.3 + +rice-box.go: $(GOBIN)/rice editor/pull_release + $(GOBIN)/rice embed-go .PHONY: clean clean: - rm -rf editor/public && rm -f bindata.go && rm -f bindata_assetfs.go && rm -rf bin + rm -rf editor/public && rm -f rice-box.go && rm -rf bin diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..2ef268ab --- /dev/null +++ b/go.mod @@ -0,0 +1,27 @@ +module maputnik/desktop + +go 1.19 + +require ( + github.com/GeertJohan/go.rice v1.0.3 + github.com/fsnotify/fsnotify v1.6.0 + github.com/gorilla/handlers v1.5.1 + github.com/gorilla/mux v1.8.0 + github.com/gorilla/websocket v1.5.0 + github.com/maputnik/desktop v1.0.7 + github.com/urfave/cli v1.22.12 +) + +require ( + github.com/GeertJohan/go.incremental v1.0.0 // indirect + github.com/akavel/rsrc v0.8.0 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/daaku/go.zipexe v1.0.2 // indirect + github.com/felixge/httpsnoop v1.0.1 // indirect + github.com/jessevdk/go-flags v1.4.0 // indirect + github.com/nkovacs/streamquote v1.0.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.0.1 // indirect + golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..da1a3d5d --- /dev/null +++ b/go.sum @@ -0,0 +1,54 @@ +github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/jt0CW30vsg= +github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= +github.com/GeertJohan/go.rice v1.0.3 h1:k5viR+xGtIhF61125vCE1cmJ5957RQGXG6dmbaWZSmI= +github.com/GeertJohan/go.rice v1.0.3/go.mod h1:XVdrU4pW00M4ikZed5q56tPf1v2KwnIKeIdc9CBYNt4= +github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw= +github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/daaku/go.zipexe v1.0.2 h1:Zg55YLYTr7M9wjKn8SY/WcpuuEi+kR2u4E8RhvpyXmk= +github.com/daaku/go.zipexe v1.0.2/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= +github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= +github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/maputnik/desktop v1.0.7 h1:rdFg7emIJOT3YsZpwqSChmWtMOvu+T4h6WwVQAZP9n4= +github.com/maputnik/desktop v1.0.7/go.mod h1:wmDjHUztx9jOBz0I22589yWguAGdV/sEM57YANpN8oQ= +github.com/nkovacs/streamquote v1.0.0 h1:PmVIV08Zlx2lZK5fFZlMZ04eHcDTIFJCv/5/0twVUow= +github.com/nkovacs/streamquote v1.0.0/go.mod h1:BN+NaZ2CmdKqUuTUXUEm9j95B2TRbpOWpxbJYzzgUsc= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8= +github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/maputnik.go b/maputnik.go index 0eecee85..1442cb44 100644 --- a/maputnik.go +++ b/maputnik.go @@ -6,6 +6,7 @@ import ( "os" "path/filepath" + "github.com/GeertJohan/go.rice" "github.com/gorilla/handlers" "github.com/gorilla/mux" "github.com/maputnik/desktop/filewatch" @@ -16,7 +17,7 @@ func main() { app := cli.NewApp() app.Name = "maputnik" app.Usage = "Server for integrating Maputnik locally" - app.Version = "Editor: 1.7.0; Desktop: 1.0.7" + app.Version = "Editor: 1.7.0; Desktop: 1.1.0" app.Flags = []cli.Flag{ &cli.StringFlag{ @@ -39,7 +40,7 @@ func main() { } app.Action = func(c *cli.Context) error { - gui := http.FileServer(assetFS()) + gui := http.FileServer(rice.MustFindBox("editor/public").HTTPBox()) router := mux.NewRouter().StrictSlash(true)