Skip to content

Golang 1.15 #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timvaillancourt merged 3 commits into from
Dec 3, 2020
Merged

Golang 1.15 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b20650
Use golang 1.15
timvaillancourt Dec 1, 2020
57a7d7c
Include 1.15 in regex
timvaillancourt Dec 1, 2020
8e0ca70
Fix docker image
timvaillancourt Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: 1.15
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# http://docs.travis-ci.com/user/languages/go/
language: go

go: 1.14.x
go: 1.15.x

os:
- linux
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14-alpine
FROM golang:1.15-alpine

COPY . /go/src/github.com/github/freno
WORKDIR /go/src/github.com/github/freno
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14-stretch
FROM golang:1.15-buster
LABEL maintainer="github@github.com"

RUN useradd -m testuser
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/github/freno

go 1.14
go 1.15

require (
github.com/DATA-DOG/go-sqlmock v1.4.1
Expand Down
2 changes: 1 addition & 1 deletion script/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

readonly supportedGo="go1.1[234]"
readonly supportedGo="go1.1[2345]"

# Ensure go is installed
if ! command -v go ; then
Expand Down
8 changes: 4 additions & 4 deletions script/build-deploy-tarball
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mkdir -p "$BUILD_ARTIFACT_DIR"/freno
cp ${tarball}.gz "$BUILD_ARTIFACT_DIR"/freno/

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