diff --git a/.circleci/config.yml b/.circleci/config.yml index 30b2ef5e4..65534faa6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -263,7 +263,7 @@ workflows: - setup matrix: parameters: - golang_version: ["1.14.15", "1.15.8", "1.16.3"] + golang_version: ["1.15.8", "1.16.10"] - test: name: << matrix.test_make_target >> resource_class: xlarge diff --git a/Makefile b/Makefile index 9878b09d8..e2f659cf2 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ BUILD_TIME := $(shell date -u +%FT%T%z) SHARD_WIDTH = 20 COMMIT := $(shell git describe --exact-match >/dev/null 2>&1 || git rev-parse --short HEAD) LDFLAGS="-X github.com/molecula/featurebase/v2.Version=$(VERSION) -X github.com/molecula/featurebase/v2.BuildTime=$(BUILD_TIME) -X github.com/molecula/featurebase/v2.Variant=$(VARIANT) -X github.com/molecula/featurebase/v2.Commit=$(COMMIT) -X github.com/molecula/featurebase/v2.TrialDeadline=$(TRIAL_DEADLINE)" -GO_VERSION=1.16.3 +GO_VERSION=1.16.10 DOCKER_BUILD= # set to 1 to use `docker-build` instead of `build` when creating a release BUILD_TAGS += shardwidth$(SHARD_WIDTH) TEST_TAGS = roaringparanoia diff --git a/cmd/roaring-migrate/main.go b/cmd/roaring-migrate/main.go index 627d56ef2..e12348e56 100644 --- a/cmd/roaring-migrate/main.go +++ b/cmd/roaring-migrate/main.go @@ -243,6 +243,9 @@ func copyFile(src, dest string) error { } func Migrate(dataDir, backupPath string) error { + if strings.HasSuffix(dataDir, "/") { + dataDir = dataDir[:len(dataDir)-1] + } err := os.MkdirAll(backupPath, 0777) if err != nil { return err diff --git a/cover-everything.sh b/cover-everything.sh index f34640cfb..500c9013b 100755 --- a/cover-everything.sh +++ b/cover-everything.sh @@ -2,7 +2,8 @@ # actually get test coverage for every single package and subpackage # very slow but oh well what are you gonna do, not test things? +# note it skips the roaring migrate echo "mode: atomic" > coverage.out -for pkg in $(go list all | grep featurebase); do +for pkg in $(go list all | grep featurebase | grep -v roaring-migrate); do go test -coverprofile=pkgcoverage.out -covermode=atomic $pkg; tail -n +2 pkgcoverage.out >> coverage.out; done