Skip to content

Commit 67e708a

Browse files
Golang 1.15 (#138)
* Use golang 1.15 * Include 1.15 in regex * Fix docker image
1 parent a028184 commit 67e708a

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Set up Go
1919
uses: actions/setup-go@v2
2020
with:
21-
go-version: 1.14
21+
go-version: 1.15
2222
-
2323
name: Run GoReleaser
2424
uses: goreleaser/goreleaser-action@v2

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# http://docs.travis-ci.com/user/languages/go/
22
language: go
33

4-
go: 1.14.x
4+
go: 1.15.x
55

66
os:
77
- linux

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14-alpine
1+
FROM golang:1.15-alpine
22

33
COPY . /go/src/github.com/github/freno
44
WORKDIR /go/src/github.com/github/freno

Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14-stretch
1+
FROM golang:1.15-buster
22
LABEL maintainer="[email protected]"
33

44
RUN useradd -m testuser

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/github/freno
22

3-
go 1.14
3+
go 1.15
44

55
require (
66
github.com/DATA-DOG/go-sqlmock v1.4.1

script/bootstrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
readonly supportedGo="go1.1[234]"
5+
readonly supportedGo="go1.1[2345]"
66

77
# Ensure go is installed
88
if ! command -v go ; then

script/build-deploy-tarball

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mkdir -p "$BUILD_ARTIFACT_DIR"/freno
2929
cp ${tarball}.gz "$BUILD_ARTIFACT_DIR"/freno/
3030

3131
### HACK HACK HACK ###
32-
# blame @carlosmn and @mattr-
33-
# Allow builds on stretch to also be used for jessie
34-
jessie_tarball_name=$(echo $(basename "${tarball}") | sed s/-stretch-/-jessie-/)
35-
cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/freno/${jessie_tarball_name}.gz"
32+
# blame @carlosmn, @mattr and @timvaillancourt-
33+
# Allow builds on buster to also be used for stretch
34+
stretch_tarball_name=$(echo $(basename "${tarball}") | sed s/-buster-/-stretch-/)
35+
cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/freno/${stretch_tarball_name}.gz"

0 commit comments

Comments
 (0)