Skip to content

Commit 4fa2858

Browse files
authored
Merge pull request #10 from SalesLoft/SL-60314-golang-upgrade
upgrade golang 1.21.3
2 parents 25120d4 + 5ebef74 commit 4fa2858

File tree

6 files changed

+32
-9
lines changed

6 files changed

+32
-9
lines changed

.github/workflows/go.yml

+22-7
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@ name: Go
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
67
pull_request:
7-
branches: [ master ]
8+
branches:
9+
- master
810

911
jobs:
10-
1112
build:
1213
name: Build
1314
runs-on: ubuntu-latest
1415
steps:
1516

1617
- name: Set up Go 1.x
17-
uses: actions/setup-go@v2
18+
uses: actions/setup-go@v4
1819
with:
19-
go-version: ^1.13
20+
go-version: 1.21.3
2021
id: go
2122

2223
- name: Check out code into the Go module directory
23-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2425

2526
- name: Get dependencies
2627
run: |
@@ -30,4 +31,18 @@ jobs:
3031
run: go test -race -coverprofile=coverage.txt -covermode=atomic
3132

3233
- name: Upload CodeCov
33-
uses: codecov/codecov-action@v1
34+
uses: codecov/codecov-action@v3
35+
36+
go-sec:
37+
name: Run Gosec
38+
runs-on: ubuntu-20.04
39+
env:
40+
GO111MODULE: on
41+
42+
steps:
43+
- name: Checkout Source
44+
uses: actions/checkout@v4
45+
- name: Run Gosec Security Scanner
46+
uses: securego/gosec@master
47+
with:
48+
args: ./...

.tool-versions

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
golang 1.21.3

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
44

55
Every release, along with the migration instructions, is documented on the Github [Releases page](https://github.com/SalesLoft/gorollout/releases).
66

7+
### v1.1.3
8+
9+
Security updates and updated golang to v1.21.3
10+
711
### v1.1.2
812

913
Added Dockerfile

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG go_version=1.18
1+
ARG go_version=1.21.3
22
FROM golang:${go_version}-alpine as build
33

44
WORKDIR /src

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/salesloft/gorollout
22

3-
go 1.18
3+
go 1.21
44

55
require (
66
github.com/go-redis/redis/v7 v7.4.1

go.sum

+3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
5555
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5656
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5757
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
58+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5859
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5960
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
6061
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
62+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
6163
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
6264
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
6365
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -79,6 +81,7 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
7981
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
8082
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
8183
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
84+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
8285
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
8386
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
8487
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)