Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove Dockerfile, use only pure go dabase backends #135

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
70b8371
bump golang and pebble
faddat Feb 15, 2024
fb07b15
Merge remote-tracking branch 'origin/main' into faddat/bump-go-and-pe…
faddat Feb 15, 2024
3527278
update Dockerfile
faddat Feb 15, 2024
9a5a53d
use go 1.22 for govulncheck
faddat Feb 15, 2024
d9bc320
bump go
faddat Feb 15, 2024
02faef3
use Dockerfile for the linter same as we do for tests
faddat Feb 15, 2024
905c8ba
remove unused databses.
faddat Feb 15, 2024
afaa74f
both cometbft-db and cometbft no longer need convoluted docker setups
faddat Feb 15, 2024
4558892
remove the build tags from pebble
faddat Feb 15, 2024
25d25ca
no longer need to run the linter in Docker
faddat Feb 15, 2024
c85030e
change the "ci" action
faddat Feb 15, 2024
b420fc4
lint
faddat Feb 15, 2024
7db5d19
add tests for pebble
faddat Feb 15, 2024
ea8b555
lint
faddat Feb 15, 2024
f2e95c6
remove docker.yml from github actions
faddat Feb 15, 2024
a4cc91a
enhance pebble tests
faddat Feb 15, 2024
03fc996
make the pebble iterator tests match the goleveldb iterator tests
faddat Feb 15, 2024
56a2845
run govulncheck all the time, fix yaml lint issues in stale.yml
faddat Feb 15, 2024
2aa29ce
give pebble stats
faddat Feb 16, 2024
5082e30
tweak goleveldb
faddat Feb 16, 2024
f9b6458
don't make .db a constant
faddat Feb 17, 2024
86ebdb9
Update README.md
faddat Feb 20, 2024
307fc9b
change module path so celestia can use this
faddat Feb 21, 2024
fc0fbd3
Merge branch 'faddat/bump-go-and-pebble' of https://github.com/faddat…
faddat Feb 21, 2024
6bfa31a
Revert "change module path so celestia can use this"
faddat Feb 21, 2024
a567a38
Merge remote-tracking branch 'origin/main' into faddat/bump-go-and-pe…
faddat Mar 4, 2024
97605b8
Merge branch 'main' into faddat/bump-go-and-pebble
lasarojc Mar 13, 2024
a017b25
Update go.mod
faddat Mar 14, 2024
78700e9
Merge remote-tracking branch 'origin/main' into faddat/bump-go-and-pe…
faddat Mar 16, 2024
fe1ac3a
Update pebble.go
faddat Mar 18, 2024
9f2c007
Update Makefile
faddat Mar 18, 2024
7192c39
remove master branch from linter runs
faddat Mar 18, 2024
166e417
Merge branch 'faddat/bump-go-and-pebble' of https://github.com/faddat…
faddat Mar 18, 2024
9257552
use mains pebble.go
faddat Mar 18, 2024
0fce561
use mains goleveldb
faddat Mar 18, 2024
afa953c
remove build tags`
faddat Mar 18, 2024
9561c5f
fix lint
faddat Mar 18, 2024
79ad382
add badger again.
faddat Mar 23, 2024
1f4cf54
revert changes to pebble in comparison to main
faddat Mar 23, 2024
747e9e3
use the v4 series of badger
faddat Mar 23, 2024
7e25ac4
lint
faddat Mar 23, 2024
e3118b3
clean up ci
faddat Mar 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/govulncheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
faddat marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
28 changes: 22 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,27 @@ jobs:
# We need to run the linter on the same image we use for building, since it
# needs the C libraries installed for the dependencies to typecheck.
runs-on: ubuntu-latest
container: cometbft/cometbft-db-testing
steps:
- uses: actions/checkout@v4
- uses: golangci/golangci-lint-action@v4.0.0
with:
args: --timeout 10m
version: latest
github-token: ${{ secrets.github_token }}
runs-on: ubuntu-latest
faddat marked this conversation as resolved.
Show resolved Hide resolved
steps:
- uses: actions/checkout@v4

- name: Set up Docker Build
uses: docker/setup-buildx-action@v3.0.0
with:
driver: docker

- name: Build Docker image
uses: docker/build-push-action@v5
with:
context: ./tools
file: ./tools/Dockerfile
tags: "cometbft/cometbft-db-testing:latest"
load: true


- name: Run golangci-lint
run: make docker-lint


10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,16 @@ docker-test:
make test-all-with-coverage
.PHONY: docker-test

docker-lint:
@echo "--> Running all tests with all databases with Docker (interactive flags: \"$(DOCKER_TEST_INTERACTIVE_FLAGS)\")"
@docker run $(DOCKER_TEST_INTERACTIVE_FLAGS) --rm --name cometbft-db-test \
-v `pwd`:/cometbft \
-w /cometbft \
--entrypoint "" \
$(DOCKER_TEST_IMAGE):$(DOCKER_TEST_IMAGE_VERSION) \
golangci-lint run ./...
.PHONY: docker-test

tools:
go get -v $(GOTOOLS)
.PHONY: tools
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cometbft/cometbft-db

go 1.21
go 1.22

require (
github.com/cockroachdb/pebble v1.1.0
Expand Down
2 changes: 1 addition & 1 deletion tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# updates here, merge the changes here first and let the image get updated (or
# push a new version manually) before PRs that depend on them.

FROM golang:1.21 AS build
FROM golang:latest AS build

ENV LD_LIBRARY_PATH=/usr/local/lib

Expand Down
Loading