From fc14121f66fe971371219602d96a159c0c7acf32 Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Tue, 7 Aug 2018 19:02:59 -0400 Subject: [PATCH] Bump version for procfs to include compatability fix for older kernels. Add trivial smoke test to makefile/travis to try to avoid this kind of failure in future. --- .travis.yml | 4 ++-- Gopkg.lock | 6 +++--- Gopkg.toml | 4 ---- Makefile | 8 ++++++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8208ec2..19918b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,8 @@ install: - dep ensure script: - - make style vet test + - make style vet test build integ after_success: - docker login -u $DOCKER_USER -p "$DOCKER_PASSWORD" - - test -n "$TRAVIS_TAG" && curl -sL http://git.io/goreleaser | bash \ No newline at end of file + - test -n "$TRAVIS_TAG" && curl -sL http://git.io/goreleaser | bash diff --git a/Gopkg.lock b/Gopkg.lock index cb1cc0b..32a021d 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -69,11 +69,11 @@ name = "github.com/ncabatoff/go-seq" packages = ["seq"] pruneopts = "UT" - revision = "f685b1aeb089d74c6fb02336d96dfa3ff4dab0ac" + revision = "b08ef85ed83364cba413c98a94bbd4169a0ce70b" [[projects]] branch = "add-proc-status" - digest = "1:aa1e48912e44fa6999deaf151cd45e11d31fe78fe575e07a43c23a01ca207d52" + digest = "1:130e937b98280a56fbc62cd75110c6025d242e12e8494d0bba486b6bd18cb129" name = "github.com/ncabatoff/procfs" packages = [ ".", @@ -82,7 +82,7 @@ "xfs", ] pruneopts = "UT" - revision = "a06a8780a11fd2ea6093f22b889a02d2f5f53b17" + revision = "d7a0c834ba19e55c3637b3c45821048e502bf9eb" [[projects]] digest = "1:b6221ec0f8903b556e127c449e7106b63e6867170c2d10a7c058623d086f2081" diff --git a/Gopkg.toml b/Gopkg.toml index 236f053..e800ee3 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -25,10 +25,6 @@ # unused-packages = true -[[constraint]] - name = "github.com/fatih/structs" - version = "1.0.0" - [[constraint]] name = "github.com/google/go-cmp" version = "0.2.0" diff --git a/Makefile b/Makefile index 0d994d8..6e8967c 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ BIN_DIR ?= $(shell pwd) DOCKER_IMAGE_NAME ?= ncabatoff/process-exporter DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD)) -all: format vet test build +all: format vet test build integ style: @echo ">> checking code style" @@ -27,8 +27,12 @@ build: @echo ">> building code" cd cmd/process-exporter; go build -o ../../process-exporter -a -tags netgo +integ: + @echo ">> smoke testing process-exporter" + ./process-exporter -config.path packaging/conf/all.yaml -once-to-stdout |grep -q namedprocess_namegroup_write_bytes_total + docker: @echo ">> building docker image" @docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" . -.PHONY: all style format test vet build docker +.PHONY: all style format test vet build integ docker