Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8d79656

Browse files
authored
Support go 1.17 (#311)
* Support go 1.17* Updated shas
1 parentb5389a9 commit8d79656

File tree

6 files changed

+76
-45
lines changed

6 files changed

+76
-45
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
linter:
55
working_directory:/go/src/github.com/gaia-pipeline/gaia
66
docker:
7-
-image:circleci/golang:1.16
7+
-image:circleci/golang:1.17
88
environment:
99
GO111MODULE:"on"
1010
steps:
@@ -20,7 +20,7 @@ jobs:
2020
test_and_coverage:
2121
working_directory:/go/src/github.com/gaia-pipeline/gaia
2222
docker:
23-
-image:circleci/golang:1.16
23+
-image:circleci/golang:1.17
2424
environment:
2525
GO111MODULE:"on"
2626
steps:
@@ -64,7 +64,7 @@ jobs:
6464
compile:
6565
working_directory:/go/src/github.com/gaia-pipeline/gaia
6666
docker:
67-
-image:circleci/golang:1.16
67+
-image:circleci/golang:1.17
6868
environment:
6969
GO111MODULE:"on"
7070
steps:

‎.circleci/images/primary/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1919
pkg-config \
2020
&& rm -rf /var/lib/apt/lists/*
2121

22-
ENV GOLANG_VERSION 1.16
22+
ENV GOLANG_VERSION 1.17
2323

2424
RUN set -eux; \
2525
\
2626
# this "case" statement is generated via "update.sh"
2727
dpkgArch="$(dpkg --print-architecture)"; \
2828
case"${dpkgArch##*-}" in \
29-
amd64) goRelArch='linux-amd64'; goRelSha256='013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2' ;; \
30-
armhf) goRelArch='linux-armv6l'; goRelSha256='d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd' ;; \
31-
arm64) goRelArch='linux-arm64'; goRelSha256='3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098' ;; \
32-
i386) goRelArch='linux-386'; goRelSha256='ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa' ;; \
33-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6' ;; \
34-
s390x) goRelArch='linux-s390x'; goRelSha256='be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe' ;; \
35-
*) goRelArch='src'; goRelSha256='7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a'; \
29+
amd64) goRelArch='linux-amd64'; goRelSha256='6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d' ;; \
30+
armhf) goRelArch='linux-armv6l'; goRelSha256='ae89d33f4e4acc222bdb04331933d5ece4ae71039812f6ccd7493cb3e8ddfb4e' ;; \
31+
arm64) goRelArch='linux-arm64'; goRelSha256='01a9af009ada22122d3fcb9816049c1d21842524b38ef5d5a0e2ee4b26d7c3e7' ;; \
32+
i386) goRelArch='linux-386'; goRelSha256='c19e3227a6ac6329db91d1af77bbf239ccd760a259c16e6b9c932d527ff14848' ;; \
33+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='ee84350114d532bf15f096198c675aafae9ff091dc4cc69eb49e1817ff94dbd7' ;; \
34+
s390x) goRelArch='linux-s390x'; goRelSha256='a50aaecf054f393575f969a9105d5c6864dd91afc5287d772449033fbafcf7e3' ;; \
35+
*) goRelArch='src'; goRelSha256='3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d'; \
3636
echo >&2; echo >&2"warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
3737
esac; \
3838
\

‎docker/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1414
pkg-config \
1515
&& rm -rf /var/lib/apt/lists/*
1616

17-
ENV GOLANG_VERSION 1.16
17+
ENV GOLANG_VERSION 1.17
1818

1919
RUN set -eux; \
2020
\
2121
# this "case" statement is generated via "update.sh"
2222
dpkgArch="$(dpkg --print-architecture)"; \
2323
case"${dpkgArch##*-}" in \
24-
amd64) goRelArch='linux-amd64'; goRelSha256='013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2' ;; \
25-
armhf) goRelArch='linux-armv6l'; goRelSha256='d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd' ;; \
26-
arm64) goRelArch='linux-arm64'; goRelSha256='3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098' ;; \
27-
i386) goRelArch='linux-386'; goRelSha256='ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa' ;; \
28-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6' ;; \
29-
s390x) goRelArch='linux-s390x'; goRelSha256='be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe' ;; \
30-
*) goRelArch='src'; goRelSha256='7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a'; \
24+
amd64) goRelArch='linux-amd64'; goRelSha256='6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d' ;; \
25+
armhf) goRelArch='linux-armv6l'; goRelSha256='ae89d33f4e4acc222bdb04331933d5ece4ae71039812f6ccd7493cb3e8ddfb4e' ;; \
26+
arm64) goRelArch='linux-arm64'; goRelSha256='01a9af009ada22122d3fcb9816049c1d21842524b38ef5d5a0e2ee4b26d7c3e7' ;; \
27+
i386) goRelArch='linux-386'; goRelSha256='c19e3227a6ac6329db91d1af77bbf239ccd760a259c16e6b9c932d527ff14848' ;; \
28+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='ee84350114d532bf15f096198c675aafae9ff091dc4cc69eb49e1817ff94dbd7' ;; \
29+
s390x) goRelArch='linux-s390x'; goRelSha256='a50aaecf054f393575f969a9105d5c6864dd91afc5287d772449033fbafcf7e3' ;; \
30+
*) goRelArch='src'; goRelSha256='3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d'; \
3131
echo >&2; echo >&2"warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
3232
esac; \
3333
\

‎docker/Dockerfile.golang‎

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

33
# Version and other variables which can be changed.
44
ENV GAIA_PORT=8080 \

‎go.mod‎

Lines changed: 56 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,59 +5,91 @@ require (
55
github.com/Pallinder/go-randomdatav1.2.0
66
github.com/alecthomas/templatev0.0.0-20190718012654-fb15b899a751
77
github.com/casbin/casbin/v2v2.37.0
8+
github.com/docker/dockerv20.10.8+incompatible
9+
github.com/gaia-pipeline/flagv1.7.4-pre
10+
github.com/gaia-pipeline/protobufv0.0.0-20180812091451-7be8a901b55a
11+
github.com/gofrs/uuidv4.0.0+incompatible
12+
github.com/golang-jwt/jwtv3.2.2+incompatible
13+
github.com/golang/protobufv1.5.2
14+
github.com/google/go-githubv17.0.0+incompatible
15+
github.com/hashicorp/go-hclogv0.16.2
16+
github.com/hashicorp/go-memdbv1.3.2
17+
github.com/hashicorp/go-pluginv1.4.3
18+
github.com/labstack/echo/v4v4.5.0
19+
github.com/pkg/errorsv0.9.1
20+
github.com/robfig/cronv1.2.0
21+
github.com/speza/casbin-bolt-adapterv0.0.0-20200919192425-e2008c12e733
22+
github.com/stretchr/testifyv1.6.1
23+
github.com/swaggo/echo-swaggerv1.1.3
24+
github.com/swaggo/swagv1.7.1
25+
go.etcd.io/bboltv1.3.6
26+
golang.org/x/cryptov0.0.0-20210817164053-32db794688a5
27+
golang.org/x/oauth2v0.0.0-20210819190943-2bc19b11175f
28+
google.golang.org/grpcv1.40.0
29+
gopkg.in/src-d/go-git.v4v4.13.1
30+
gopkg.in/yaml.v2v2.4.0
31+
)
32+
33+
require (
34+
github.com/Knetic/govaluatev3.0.1-0.20171022003610-9aa49832a739+incompatible// indirect
35+
github.com/KyleBanks/depthv1.2.1// indirect
36+
github.com/Microsoft/go-winiov0.5.0// indirect
37+
github.com/PuerkitoBio/purellv1.1.1// indirect
38+
github.com/PuerkitoBio/urlescv0.0.0-20170810143723-de5bf2ad4578// indirect
839
github.com/containerd/containerdv1.5.5// indirect
940
github.com/daaku/go.zipexev1.0.1// indirect
10-
github.com/docker/dockerv20.10.8+incompatible
41+
github.com/davecgh/go-spewv1.1.1// indirect
42+
github.com/docker/distributionv2.7.1+incompatible// indirect
1143
github.com/docker/go-connectionsv0.4.0// indirect
44+
github.com/docker/go-unitsv0.4.0// indirect
45+
github.com/emirpasic/godsv1.12.0// indirect
1246
github.com/fatih/colorv1.12.0// indirect
13-
github.com/gaia-pipeline/flagv1.7.4-pre
14-
github.com/gaia-pipeline/protobufv0.0.0-20180812091451-7be8a901b55a
47+
github.com/go-openapi/jsonpointerv0.19.5// indirect
1548
github.com/go-openapi/jsonreferencev0.19.6// indirect
1649
github.com/go-openapi/specv0.20.3// indirect
1750
github.com/go-openapi/swagv0.19.15// indirect
18-
github.com/gofrs/uuidv4.0.0+incompatible
19-
github.com/golang-jwt/jwtv3.2.2+incompatible
20-
github.com/golang/protobufv1.5.2
51+
github.com/gogo/protobufv1.3.2// indirect
2152
github.com/google/go-cmpv0.5.6// indirect
22-
github.com/google/go-githubv17.0.0+incompatible
2353
github.com/google/go-querystringv1.1.0// indirect
2454
github.com/gorilla/muxv1.7.3// indirect
25-
github.com/hashicorp/go-hclogv0.16.2
2655
github.com/hashicorp/go-immutable-radixv1.3.1// indirect
27-
github.com/hashicorp/go-memdbv1.3.2
28-
github.com/hashicorp/go-pluginv1.4.3
56+
github.com/hashicorp/golang-lruv0.5.4// indirect
2957
github.com/hashicorp/yamuxv0.0.0-20210826001029-26ff87cf9493// indirect
58+
github.com/jbenet/go-contextv0.0.0-20150711004518-d14ea06fba99// indirect
59+
github.com/josharian/internv1.0.0// indirect
3060
github.com/kevinburke/ssh_configv1.1.0// indirect
31-
github.com/labstack/echo/v4v4.5.0
61+
github.com/labstack/gommonv0.3.0// indirect
3262
github.com/mailru/easyjsonv0.7.7// indirect
63+
github.com/mattn/go-colorablev0.1.8// indirect
3364
github.com/mattn/go-isattyv0.0.14// indirect
65+
github.com/mitchellh/go-homedirv1.1.0// indirect
3466
github.com/mitchellh/go-testing-interfacev1.14.1// indirect
3567
github.com/morikuni/aecv1.0.0// indirect
3668
github.com/oklog/runv1.1.0// indirect
37-
github.com/pkg/errorsv0.9.1
38-
github.com/robfig/cronv1.2.0
69+
github.com/opencontainers/go-digestv1.0.0// indirect
70+
github.com/opencontainers/image-specv1.0.1// indirect
71+
github.com/pmezard/go-difflibv1.0.0// indirect
3972
github.com/sergi/go-diffv1.2.0// indirect
40-
github.com/speza/casbin-bolt-adapterv0.0.0-20200919192425-e2008c12e733
41-
github.com/stretchr/testifyv1.6.1
42-
github.com/swaggo/echo-swaggerv1.1.3
73+
github.com/sirupsen/logrusv1.8.1// indirect
74+
github.com/src-d/gcfgv1.4.0// indirect
4375
github.com/swaggo/filesv0.0.0-20210815190702-a29dd2bc99b2// indirect
44-
github.com/swaggo/swagv1.7.1
76+
github.com/valyala/bytebufferpoolv1.0.0// indirect
77+
github.com/valyala/fasttemplatev1.2.1// indirect
4578
github.com/xanzy/ssh-agentv0.3.1// indirect
46-
go.etcd.io/bboltv1.3.6
47-
golang.org/x/cryptov0.0.0-20210817164053-32db794688a5
4879
golang.org/x/netv0.0.0-20210913180222-943fd674d43e// indirect
49-
golang.org/x/oauth2v0.0.0-20210819190943-2bc19b11175f
5080
golang.org/x/sysv0.0.0-20210910150752-751e447fb3d0// indirect
5181
golang.org/x/textv0.3.7// indirect
5282
golang.org/x/timev0.0.0-20210723032227-1f47c861a9ac// indirect
83+
golang.org/x/toolsv0.1.5// indirect
5384
google.golang.org/appenginev1.6.7// indirect
5485
google.golang.org/genprotov0.0.0-20210909211513-a8c4777a87af// indirect
55-
google.golang.org/grpcv1.40.0
56-
gopkg.in/src-d/go-git.v4v4.13.1
57-
gopkg.in/yaml.v2v2.4.0
86+
google.golang.org/protobufv1.27.1// indirect
87+
gopkg.in/src-d/go-billy.v4v4.3.2// indirect
88+
gopkg.in/warnings.v0v0.1.2// indirect
89+
gopkg.in/yaml.v3v3.0.0-20200615113413-eeeca48fe776// indirect
5890
)
5991

60-
go1.16
92+
go1.17
6193

6294
replacegithub.com/swaggo/swag =>github.com/swaggo/swagv1.6.10-0.20201104153820-3f47d68f8872
6395

‎go.sum‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
288288
github.com/fatih/colorv1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
289289
github.com/fatih/colorv1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=
290290
github.com/fatih/colorv1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
291-
github.com/flynn/go-shlexv0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
292291
github.com/flynn/go-shlexv0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
293292
github.com/form3tech-oss/jwt-gov3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
294293
github.com/frankban/quicktestv1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp