Use os/gh actions lint, normal sqlite build

lstoll · May 30, 2022 · f532c83 · f532c83
1 parent 139a2a1
commit f532c83
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 54 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -21,6 +21,8 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v1
 
-    - name: Make
-      run: |
-        make
+    - name: Test
+      run: go test ./...
+
+    - name: golangci-lint
+      uses: golangci/golangci-lint-action@v3
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ GOPATH=$(shell go env GOPATH)
 
 .PHONY: all $(GOPATH)/bin/wherewasi test lint proto
 
-go_build_flags=-tags="libsqlite3 sqlite3_unlock_notify"
+go_build_flags=
 
 all: $(GOPATH)/bin/wherewasi test lint
 
@@ -12,8 +12,5 @@ $(GOPATH)/bin/wherewasi:
 test:
 	go test $(go_build_flags) -v .
 
-lint: bin/golangci-lint-1.23.8
-	./bin/golangci-lint-1.23.8 run ./...
-
-bin/golangci-lint-1.23.8:
-	./hack/fetch-golangci-lint.sh
+lint:
+	golangci-lint run ./...
diff --git a/hack/fetch-golangci-lint.sh b/hack/fetch-golangci-lint.sh