Skip to content

Commit

Permalink
golang 1.15
Browse files Browse the repository at this point in the history
Signed-off-by: Emily Casey <ecasey@vmware.com>
  • Loading branch information
ekcasey committed Oct 12, 2020
1 parent 72aa239 commit 46b248e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2-beta
with:
go-version: '1.14'
go-version: '1.15'
- name: Set up go env
run: |
echo "::set-env name=GOPATH::$(go env GOPATH)"
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2-beta
with:
go-version: '1.14'
go-version: '1.15'
- name: Install jq
run: choco install jq
- name: Test
Expand All @@ -84,7 +84,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2-beta
with:
go-version: '1.14'
go-version: '1.15'
- name: Set up go env
run: |
echo "::set-env name=GOPATH::$(go env GOPATH)"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ LDFLAGS+=-X 'github.com/buildpacks/lifecycle/cmd.Version=$(LIFECYCLE_VERSION)'
GOBUILD:=go build $(GOFLAGS) -ldflags "$(LDFLAGS)"
GOTEST=$(GOCMD) test $(GOFLAGS)
BUILD_DIR?=$(PWD)$/out
LINUX_COMPILATION_IMAGE?=golang:1.14-alpine
WINDOWS_COMPILATION_IMAGE?=golang:1.14-windowsservercore-1809
LINUX_COMPILATION_IMAGE?=golang:1.15-alpine
WINDOWS_COMPILATION_IMAGE?=golang:1.15-windowsservercore-1809
SOURCE_COMPILATION_IMAGE?=lifecycle-img
BUILD_CTR?=lifecycle-ctr
DOCKER_CMD?=make test
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ require (
gotest.tools/v3 v3.0.2 // indirect
)

go 1.14
go 1.15
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/buildpacks/lifecycle/tools

go 1.14
go 1.15

require (
github.com/BurntSushi/toml v0.3.1
Expand Down

0 comments on commit 46b248e

Please sign in to comment.