From a5efb34fa05d34faede1c44613f19431c87afcf5 Mon Sep 17 00:00:00 2001 From: Joel Unzain Date: Tue, 8 Dec 2020 13:51:09 -0800 Subject: [PATCH 1/2] Keep build time consistent for spec and dockerfile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21a9d8ab..3b81782e 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ DOCKER_ORG := xmidt VERSION ?= $(shell git describe --tag --always --dirty) PROGVER ?= $(shell git describe --tags `git rev-list --tags --max-count=1` | tail -1 | sed 's/v\(.*\)/\1/') -BUILDTIME = $(shell date -u '+%Y-%m-%d %H:%M:%S') +BUILDTIME = $(shell date -u '+%c') GITCOMMIT = $(shell git rev-parse --short HEAD) GOBUILDFLAGS = -a -ldflags "-w -s -X 'main.BuildTime=$(BUILDTIME)' -X main.GitCommit=$(GITCOMMIT) -X main.Version=$(VERSION)" -o $(APP) From 7a96bc7462304785e551c12f4641b22c80b6c980 Mon Sep 17 00:00:00 2001 From: Joel Unzain Date: Thu, 10 Dec 2020 13:56:45 -0800 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd7c8105..f7b3818e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fix bug in which Tr1d1um was not capturing partnerIDs correctly due to casting error. [#182](https://github.com/xmidt-org/tr1d1um/pull/182) +### Changed +- Update buildtime format in Makefile to match RPM spec file. [#185](https://github.com/xmidt-org/tr1d1um/pull/185) + ## [v0.5.3] ### Fixed - Bug in which only mTLS was allowed as valid config for a webpa server. [#181](https://github.com/xmidt-org/tr1d1um/pull/181)