Skip to content
Permalink
Browse files

move to go1.13 and go mod

  • Loading branch information
Collin Mulliner
Collin Mulliner committed Nov 18, 2019
1 parent b31e8b5 commit aa60d32ed743eacf84cd0c49b8a7a69e58effff0
Showing with 23 additions and 60 deletions.
  1. +2 −5 Dockerfile
  2. +0 −42 Gopkg.lock
  3. +0 −11 Gopkg.toml
  4. +6 −2 Makefile
  5. +9 −0 go.mod
  6. +6 −0 go.sum
@@ -1,9 +1,6 @@
FROM golang:1.11
FROM golang:1.13

ADD https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 /usr/bin/dep
RUN chmod +x /usr/bin/dep

RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.15.0
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.21.0

RUN apt update && apt -y install e2tools mtools file squashfs-tools unzip python-setuptools python-lzo
RUN wget https://github.com/crmulliner/ubi_reader/archive/master.zip -O ubireader.zip && unzip ubireader.zip && cd ubi_reader-master && python setup.py install

This file was deleted.

This file was deleted.

@@ -8,7 +8,7 @@ all: build

.PHONY: build
build:
dep check
go mod verify
mkdir -p build
GOOS=$(GOOS) go build -a -ldflags '-w -s' -o build/fwanalyzer ./cmd/fwanalyzer

@@ -20,6 +20,10 @@ test: lint build
PATH=./test:$(PATH):./scripts:./build ./test/test.py


.PHONY: modules
modules:
go mod tidy

.PHONY: lint
lint:
golangci-lint run
@@ -37,4 +41,4 @@ distclean: clean

.PHONY: deps
deps:
dep ensure
go mod download
9 go.mod
@@ -0,0 +1,9 @@
module github.com/cruise-automation/fwanalyzer

go 1.13

require (
github.com/BurntSushi/toml v0.3.1
github.com/bmatcuk/doublestar v1.1.4
github.com/google/go-cmp v0.2.0
)
6 go.sum
@@ -0,0 +1,6 @@
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/bmatcuk/doublestar v1.1.4 h1:OiC5vFUceSTlgPeJdxVJGNIXTLxCBVPO7ozqJjXbE9M=
github.com/bmatcuk/doublestar v1.1.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=

0 comments on commit aa60d32

Please sign in to comment.
You can’t perform that action at this time.