Use einride/build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "build"]
+	path = build
+	url = [email protected]:einride/build

Makefile

@@ -1,88 +1,25 @@
-# -------------
-# Makefile
-# -------------
-#
-# This Makefile is designed to run reproducible builds locally (on macOS and
-# Linux) and on a CI server. Windows builds are not supported.
 .PHONY: all
-all: lint-go test
-Uname := $(shell uname -s)
-uname := $(shell uname -s | tr '[:upper:]' '[:lower:]')
+all: go-test test
 
-ifeq ($(Uname),Linux)
-else ifeq ($(Uname),Darwin)
-else
-$(error This Makefile only supports Linux and OSX build agents)
-endif
-
-ifneq ($(shell uname -m),x86_64)
-$(error This Makefile only supports x86_64 build agents)
-endif
-
-# -------------------------------------
-# Download vendor dependencies with dep
-# -------------------------------------
-
-dep_version := 0.5.0
-dep_dir := build/dep/$(dep_version)
-dep := $(dep_dir)/dep
-
-$(dep):
-	mkdir -p $(dep_dir)
-	curl -s -L https://github.com/golang/dep/releases/download/v$(dep_version)/dep-$(uname)-amd64 -o $(dep_dir)/dep
-	chmod +x $(dep_dir)/dep
+include build/rules.mk
+build/rules.mk:
+	git submodule update --init
 
-vendor: $(dep) Gopkg.toml Gopkg.lock
-	$(dep) ensure
+.PHONY: dep-ensure
+dep-ensure: $(DEP)
+	$(DEP) ensure -v
 
-# -------------------------------
-# Lint Go code with GolangCI-Lint
-# -------------------------------
-golangci_lint_version := 1.10.2
-golangci_lint_dir := build/golangci-lint/$(golangci_lint_version)
-golangci_lint := $(golangci_lint_dir)/golangci-lint
+.PHONY: dep-check
+dep-check: $(DEP)
+	$(DEP) check
 
-$(golangci_lint):
-	mkdir -p $(golangci_lint_dir)
-	curl -s -L https://github.com/golangci/golangci-lint/releases/download/v$(golangci_lint_version)/golangci-lint-$(golangci_lint_version)-$(uname)-amd64.tar.gz -o $(golangci_lint_dir)/archive.tar.gz
-	tar xzf $(golangci_lint_dir)/archive.tar.gz -C $(golangci_lint_dir) --strip 1
-
-.PHONY: default
-	echo "Enter run-vlp16"
-
-# Check linting
-# Maligned disabled in golangci-lint since structs are so large anyway.
-# Might want to look at optimising structs in the future.
-.PHONY: lint-go
-lint-go: vendor $(golangci_lint)
-	$(golangci_lint) run ./... --enable-all --disable=gas,dupl
-
-# -------------------------------------
-# Test
-# -------------------------------------
+.PHONY: go-test
+go-test: $(GOLANGCI_LINT) dep-ensure
+	$(GOLANGCI_LINT) run --enable-all --disable=dupl
 
 .PHONY: test
-test: lint-go
+test:
 	go test -race ./...
-# -------------------------------------
-# Build
-# -------------------------------------
-
-.PHONY: build-vlp16
-build-vlp16:
-	go build ./cmd/vlp16
-
-# -------------------------------------
-# Run
-# -------------------------------------
-
-.PHONY: run-vlp16
-run-vlp16: build-vlp16
-	./vlp16
-
-# -------------------------------------
-# Docs
-# -------------------------------------
 
 .PHONY: doc
 doc:

cmd/vlp16/main.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"net"
 
-	"github.com/einride/vlp-16-go/pkg/vlp16"
+	"github.com/einride/vlp-16-go"
 )
 
 const (

pkg/vlp16/packet_test.go → packet_test.go

@@ -7,11 +7,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/einride/vlp-16-go/pkg/vlp16"
+	"github.com/einride/vlp-16-go"
 	"github.com/stretchr/testify/require"
 )
 
-const testDataFile = "../../test/testdata"
+const (
+	testDataFile = "test/testdata"
+)
 
 func TestPacket_ReadFrom_TestData(t *testing.T) {
 	testData, err := os.Open(testDataFile)

pkg/vlp16/spherical_point_cloud.go → spherical_point_cloud.go

@@ -1,8 +1,9 @@
 package vlp16
 
 import (
-	"github.com/pkg/errors"
 	"time"
+
+	"github.com/pkg/errors"
 )
 
 type SphericalPointCloud struct {
@@ -21,7 +22,7 @@ type SphericalPoint struct {
 func (cloud *SphericalPointCloud) UnmarshalPacket(packet *Packet) error {
 	for i := 0; i < len(packet.Blocks); i++ {
 		if err := cloud.parseBlock(i, packet); err != nil {
-			return errors.Wrap(err, "Error parsing Block")
+			return errors.Wrap(err, "error parsing Block")
 		}
 		// Duration is in nanoseconds and Velodyne timestamp in microseconds
 		cloud.Timestamp = time.Duration(packet.Timestamp) * time.Microsecond

pkg/vlp16/spherical_point_cloud_test.go → spherical_point_cloud_test.go

@@ -37,15 +37,15 @@ func TestLastReflection(t *testing.T) {
 	test := assert.New(t)
 
 	cloud := SphericalPointCloud{}
-	err := cloud.UnmarshalPacket(&examplePacket)
+	err := cloud.UnmarshalPacket(&examplePacketLastReflection)
 	if err != nil {
 		test.Error(err)
 	}
 	test.Equal(cloud.SphericalPoints[0].LastReflection, true)
 	test.Equal(cloud.SphericalPoints[24].LastReflection, false)
 }
 
-var examplePacket = Packet{
+var examplePacketLastReflection = Packet{
 	Blocks: [12]Block{
 		{
 			Azimuth: 0x2866,

pkg/vlp16/vlp16_test.go → vlp16_test.go

@@ -6,13 +6,12 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 const (
-	testDataFile = "../../test/testdata"
+	testDataFile = "test/testdata"
 )
 
 func TestInterpolateAzimuth(t *testing.T) {
@@ -70,4 +69,3 @@ func TestDeg2Rad(t *testing.T) {
 	test.Equal(deg2Rad(90), math.Pi/2)
 	test.Equal(deg2Rad(180), math.Pi)
 }
-