Skip to content

Commit 6c3bc7d

Browse files
authored
Merge pull request #154 from chenrui333/go-1.13.3
golang v1.13.3
2 parents 2a83c83 + 4e5bdbd commit 6c3bc7d

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/golang:1.13
5+
- image: circleci/golang:1.13.3
66
working_directory: /go/src/github.com/databus23/helm-diff
77
steps:
88
- checkout
@@ -20,4 +20,3 @@ jobs:
2020
mkdir -p helmhome
2121
make install HELM_HOME=helmhome
2222
helmhome/plugins/helm-diff/bin/diff version
23-

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ docker-run-release: export pkg=/go/src/github.com/databus23/helm-diff
4949
docker-run-release:
5050
git checkout master
5151
git push
52-
docker run -it --rm -e GITHUB_TOKEN -v $(shell pwd):$(pkg) -w $(pkg) golang:1.12.5 make bootstrap release
52+
docker run -it --rm -e GITHUB_TOKEN -v $(shell pwd):$(pkg) -w $(pkg) golang:1.13.3 make bootstrap release
5353

5454
.PHONY: dist
5555
dist: export COPYFILE_DISABLE=1 #teach OSX tar to not put ._* files in tar archive
@@ -69,7 +69,7 @@ dist:
6969
tar -C build/ -zcvf $(CURDIR)/release/helm-diff-windows.tgz diff/
7070

7171
.PHONY: release
72-
release: lint dist
72+
release: lint dist
7373
ifndef GITHUB_TOKEN
7474
$(error GITHUB_TOKEN is undefined)
7575
endif

0 commit comments

Comments
 (0)