scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-07 11:27:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1364 from codysoyland/lattice-submodule

Browse source 
Add git-submodule to manage UI version
This commit is contained in:
Cody Soyland 2021-01-22 16:57:57 -06:00 • committed by GitHub
commit 3da3d23b21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -5,7 +5,6 @@ vendor
.DS_Store
build
*~
lattice
release-pilosa-fsck.*.*.tar.gz
/log.*
/tourna.log.*

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "lattice"]
path = lattice
url = git@github.com:molecula/lattice.git

12
Makefile
View file

@ -1,4 +1,4 @@
.PHONY: build check-clean clean build-lattice cover cover-viz default docker docker-build docker-test docker-tag-push generate generate-protoc generate-pql generate-statik gometalinter install install-build-deps install-golangci-lint install-gometalinter install-protoc install-protoc-gen-gofast install-peg install-statik prerelease prerelease-upload release release-build test testv testv-race testvsub testvsub-race test-txstore-rbf
.PHONY: build check-clean clean build-lattice cover cover-viz default docker docker-build docker-test docker-tag-push generate generate-protoc generate-pql generate-statik gometalinter install install-build-deps install-golangci-lint install-gometalinter install-protoc install-protoc-gen-gofast install-peg install-statik prerelease prerelease-upload release release-build test testv testv-race testvsub testvsub-race test-txstore-rbf lattice
CLONE_URL=github.com/pilosa/pilosa
MOD_VERSION=v2
@ -155,11 +155,17 @@ install:
install-bench:
go install -tags='$(BUILD_TAGS)' -ldflags $(LDFLAGS) $(FLAGS) ./cmd/pilosa-bench
# Ensure lattice is cloned and the pinned version is checked out
lattice:
git clone git@github.com:molecula/lattice.git
git submodule update --init
# Build the lattice assets
build-lattice: lattice require-yarn
cd lattice && git pull && yarn install && yarn build
cd lattice && yarn install && yarn build
# Upgrade lattice to the latest version
upgrade-lattice: lattice
git submodule update --remote
# `go generate` protocol buffers
generate-protoc: require-protoc require-protoc-gen-gofast

9
README.md
View file

@ -58,6 +58,15 @@ Check out how the Pilosa [Data Model](https://www.pilosa.com/docs/data-model/) w
You can interact with Pilosa directly in the console using the [Pilosa Query Language](https://www.pilosa.com/docs/query-language/) (PQL).
## Upgrading UI
Lattice is now a submodule of Pilosa, for the purpose of keeping the frontend and backend components of the UI system synchronized. When making a change to the UI that requires changing both the backend and frontend, follow steps in this order:
1. merge frontend (Lattice) PR
2. run `make upgrade-lattice`
3. run `git add lattice`, `git commit -m"Upgrade Lattice"`, `git push`
4. merge backend (Pilosa) PR
## Client Libraries
There are supported libraries for the following languages:

1
lattice Submodule

@ -0,0 +1 @@
Subproject commit 36f453c1ea3bf86c546a8ad4a88f2a926724d683