Skip to content
This repository has been archived by the owner on Jun 12, 2021. It is now read-only.

Commit

Permalink
Merge pull request #124 from gliptak/goversion1
Browse files Browse the repository at this point in the history
Bring Go version to 1.12.5
  • Loading branch information
radekg authored Jun 2, 2019
2 parents c21e94b + 0123323 commit 8a169d6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .circleci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.11.6
FROM golang:1.12.5

ARG ANSIBLE_VERSION=2.6.5

Expand All @@ -19,4 +19,4 @@ RUN apt update \
&& go get -u github.com/Masterminds/glide \
&& locale-gen C.UTF-8 || true

CMD ["/bin/sh", "-c", "make lint && make test-verbose"]
CMD ["/bin/sh", "-c", "make lint && make test-verbose"]
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
build:
docker:
# specify the version
- image: radekg/terraform-provisioner-ansible-ci:ansible-2.6.5-go-1.11.6
- image: radekg/terraform-provisioner-ansible-ci:ansible-2.6.5-go-1.12.5
working_directory: /go/src/github.com/radekg/terraform-provisioner-ansible
steps:
- checkout
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PLUGINS_DIR=~/.terraform.d/plugins
CURRENT_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))

CI_ANSIBLE_VERSION=2.6.5
CI_GOLANG_VERSION=1.11.6
CI_GOLANG_VERSION=1.12.5
CI_PROJECT_PATH=/go/src/github.com/radekg/terraform-provisioner-ansible

.PHONY: plugins-dir
Expand Down Expand Up @@ -72,4 +72,4 @@ test:
.PHONY: test-verbose
test-verbose:
go clean -testcache
go test -cover -v ./...
go test -cover -v ./...
2 changes: 1 addition & 1 deletion bin/env.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
REQUIRED_GO_MAJOR=1
REQUIRED_GO_MINOR=11
REQUIRED_GO_MINOR=12

0 comments on commit 8a169d6

Please sign in to comment.