Remove build flag (#117)

canonical · Jul 9, 2024 · 69db51f · 69db51f
1 parent e31d7e7
commit 69db51f
Show file tree

Hide file tree

Showing 28 changed files with 855 additions and 926 deletions.
diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
@@ -38,8 +38,8 @@ jobs:
       - name: go vet
         run: make go.vet
 
-  tests-sqlite:
-    name: Test sqlite
+  tests:
+    name: Run Tests
     runs-on: ubuntu-latest
 
     steps:
@@ -57,27 +57,8 @@ jobs:
       - name: Run tests
         run: make go.test
 
-  tests-dqlite:
-    name: Test dqlite
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out Code
-        uses: actions/checkout@v4
-
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.21"
-
-      - name: go mod download
-        run: go mod download
-
-      - name: Run tests
-        run: make go.test.dqlite
-
   benchmarks:
-    name: Benchmark sqlite
+    name: Run Benchmarks
     runs-on: ubuntu-latest
 
     steps:
@@ -95,25 +76,6 @@ jobs:
       - name: Run benchmarks
         run: make go.bench
 
-  benchmarks-dqlite:
-    name: Benchmark dqlite
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out Code
-        uses: actions/checkout@v4
-
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.21"
-
-      - name: go mod download
-        run: go mod download
-
-      - name: Run benchmarks
-        run: make go.bench.dqlite
-
   build:
     name: Build k8s-dqlite
     runs-on: ubuntu-latest

diff --git a/Makefile b/Makefile
@@ -10,16 +10,10 @@ go.vet:
 	$(DQLITE_BUILD_SCRIPTS_DIR)/static-go-vet.sh ./...
 
 go.test:
-	go test -v -p 1 ./...
-
-go.test.dqlite:
-	$(DQLITE_BUILD_SCRIPTS_DIR)/static-go-test.sh -v ./...
+	$(DQLITE_BUILD_SCRIPTS_DIR)/static-go-test.sh -v -p 1 ./...
 
 go.bench:
-	go test -tags=libsqlite3 -v ./... -run "^$$" -bench "Benchmark" -benchmem
-
-go.bench.dqlite:
-	$(DQLITE_BUILD_SCRIPTS_DIR)/static-go-test.sh -v ./... -run "^$$" -bench "Benchmark" -benchmem
+	$(DQLITE_BUILD_SCRIPTS_DIR)/static-go-test.sh -v -p 1 ./... -run "^$$" -bench "Benchmark" -benchmem
 
 ## Static Builds
 static: bin/static/k8s-dqlite bin/static/dqlite

diff --git a/cmd/version.go b/cmd/version.go
@@ -1,5 +1,3 @@
-//go:build dqlite
-
 package cmd
 
 import (

diff --git a/cmd/version_no_dqlite.go b/cmd/version_no_dqlite.go
diff --git a/hack/dynamic-go-build.sh b/hack/dynamic-go-build.sh
@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
 . "${DIR}/dynamic-dqlite.sh"
 
 go build \
-  -tags dqlite,libsqlite3 \
+  -tags libsqlite3 \
   -ldflags '-s -w -extldflags "-Wl,-rpath,$ORIGIN/lib -Wl,-rpath,$ORIGIN/../lib"' \
   "${@}"
diff --git a/hack/dynamic-go-install.sh b/hack/dynamic-go-install.sh
@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
 . "${DIR}/dynamic-dqlite.sh"
 
 go install \
-  -tags dqlite,libsqlite3 \
+  -tags libsqlite3 \
   -ldflags '-s -w -extldflags "-Wl,-rpath,$ORIGIN/lib -Wl,-rpath,$ORIGIN/../lib"' \
   "${@}"
diff --git a/hack/dynamic-go-test.sh b/hack/dynamic-go-test.sh
@@ -5,5 +5,5 @@ DIR="$(realpath `dirname "${0}"`)"
 . "${DIR}/dynamic-dqlite.sh"
 
 go test \
-  -tags dqlite,libsqlite3 \
+  -tags libsqlite3 \
   "${@}"
diff --git a/hack/dynamic-go-vet.sh b/hack/dynamic-go-vet.sh
@@ -5,5 +5,5 @@ DIR="$(realpath `dirname "${0}"`)"
 . "${DIR}/static-dqlite.sh"
 
 go vet \
-  -tags dqlite,libsqlite3 \
+  -tags libsqlite3 \
   "${@}"
diff --git a/hack/static-go-build.sh b/hack/static-go-build.sh
@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
 . "${DIR}/static-dqlite.sh"
 
 go build \
-  -tags dqlite,libsqlite3 \
+  -tags libsqlite3 \
   -ldflags '-s -w -linkmode "external" -extldflags "-static"' \
   "${@}"
diff --git a/hack/static-go-install.sh b/hack/static-go-install.sh
@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
 . "${DIR}/static-dqlite.sh"
 
 go install \
-  -tags dqlite,libsqlite3 \
+  -tags libsqlite3 \
   -ldflags '-s -w -linkmode "external" -extldflags "-static"' \
   "${@}"
diff --git a/hack/static-go-test.sh b/hack/static-go-test.sh
@@ -5,6 +5,6 @@ DIR="$(realpath `dirname "${0}"`)"
 . "${DIR}/static-dqlite.sh"
 
 go test \
-  -tags dqlite,libsqlite3 \
+  -tags libsqlite3 \
   -ldflags '-linkmode "external" -extldflags "-static"' \
   "${@}"
diff --git a/hack/static-go-vet.sh b/hack/static-go-vet.sh
@@ -5,5 +5,5 @@ DIR="$(realpath `dirname "${0}"`)"
 . "${DIR}/static-dqlite.sh"
 
 go vet \
-  -tags dqlite,libsqlite3 \
+  -tags libsqlite3 \
   "${@}"
diff --git a/pkg/kine/drivers/dqlite/dqlite.go b/pkg/kine/drivers/dqlite/dqlite.go
@@ -1,5 +1,3 @@
-//go:build dqlite
-
 package dqlite
 
 import (

diff --git a/pkg/kine/drivers/dqlite/no_dqlite.go b/pkg/kine/drivers/dqlite/no_dqlite.go
diff --git a/pkg/kine/drivers/dqlite_test.go b/pkg/kine/drivers/dqlite_test.go
@@ -1,5 +1,3 @@
-//go:build dqlite
-
 package drivers_test
 
 import (
@@ -31,10 +29,10 @@ func newDqliteBackend(ctx context.Context, tb testing.TB) (server.Backend, *gene
 	dir := tb.TempDir()
 	app, err := app.New(dir, app.WithAddress(fmt.Sprintf("127.0.0.1:%d", 59090+nextIdx)))
 	if err != nil {
-		panic(fmt.Errorf("failed to create dqlite app: %w", err))
+		tb.Fatal(fmt.Errorf("failed to create dqlite app: %w", err))
 	}
 	if err := app.Ready(ctx); err != nil {
-		panic(fmt.Errorf("failed to initialize dqlite: %w", err))
+		tb.Fatal(fmt.Errorf("failed to initialize dqlite: %w", err))
 	}
 	tb.Cleanup(func() {
 		app.Close()

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -1,5 +1,3 @@
-//go:build dqlite
-
 package server
 
 import (

diff --git a/pkg/server/server_no_dqlite.go b/pkg/server/server_no_dqlite.go