cloud/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis.git synced 2025-04-18 23:44:07 +03:00
Code

ugrade to GO 1.17

Browse Source
This commit is contained in:
Willy Kloucek 2021-10-11 14:48:26 +02:00
parent 06b22b424a
commit d6adbb3068
No known key found for this signature in database
GPG Key ID: 2608F609B3631910
22 changed files with 203 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bingo/bingo.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/bwplotka/bingo v0.5.1

2
.bingo/buf.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/bufbuild/buf v0.56.0 // cmd/buf

2
.bingo/buildifier.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/bazelbuild/buildtools v0.0.0-20210920153738-d6daef01a1a2 // buildifier

2
.bingo/calens.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/restic/calens v0.2.0

2
.bingo/fileb0x.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/UnnoTed/fileb0x v1.1.4

2
.bingo/flaex.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/owncloud/flaex v0.2.1-0.20210701123229-9d7dceed124f

2
.bingo/golangci-lint.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/golangci/golangci-lint v1.42.1 // cmd/golangci-lint

2
.bingo/gox.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/mitchellh/gox v1.0.1

2
.bingo/hugo.mod
View File

@ -1,6 +1,6 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
replace github.com/markbates/inflect => github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6

2
.bingo/mutagen.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/mutagen-io/mutagen v0.11.8 // cmd/mutagen

2
.bingo/protoc-gen-doc.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/pseudomuto/protoc-gen-doc v1.5.0 // cmd/protoc-gen-doc

2
.bingo/protoc-gen-go.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require google.golang.org/protobuf v1.27.1 // cmd/protoc-gen-go

2
.bingo/protoc-gen-micro.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/asim/go-micro/cmd/protoc-gen-micro/v3 v3.0.0-20210924081004-8c39b1e1204d

2
.bingo/protoc-gen-microweb.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/owncloud/protoc-gen-microweb v0.0.0-20210824101557-828409dbfbf9

2
.bingo/protoc-gen-openapiv2.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 // protoc-gen-openapiv2

2
.bingo/reflex.mod
View File

@ -1,5 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.16
go 1.17
require github.com/cespare/reflex v0.3.1

24
.drone.star
View File

@ -260,7 +260,7 @@ def testOcisModule(ctx, module):
steps = makeGenerate(module) + [
{
"name": "golangci-lint",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"pull": "always",
"commands": [
"mkdir -p cache/checkstyle",
@ -271,7 +271,7 @@ def testOcisModule(ctx, module):
},
{
"name": "test",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"pull": "always",
"commands": [
"mkdir -p cache/coverage",
@ -915,7 +915,7 @@ def dockerRelease(ctx, arch):
"steps": makeGenerate("") + [
{
"name": "build",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"pull": "always",
"commands": [
"make -C ocis release-linux-docker",
@ -1089,7 +1089,7 @@ def binaryRelease(ctx, name):
"steps": makeGenerate("") + [
{
"name": "build",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"pull": "always",
"commands": [
"make -C ocis release-%s" % (name),
@ -1097,7 +1097,7 @@ def binaryRelease(ctx, name):
},
{
"name": "finish",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"pull": "always",
"commands": [
"make -C ocis release-finish",
@ -1123,7 +1123,7 @@ def binaryRelease(ctx, name):
},
{
"name": "changelog",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"pull": "always",
"commands": [
"make changelog CHANGELOG_VERSION=%s" % ctx.build.ref.replace("refs/tags/v", "").split("-")[0],
@ -1259,7 +1259,7 @@ def changelog(ctx):
"steps": [
{
"name": "generate",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"pull": "always",
"commands": [
"make -C ocis changelog",
@ -1366,19 +1366,19 @@ def docs(ctx):
"steps": [
{
"name": "docs-generate",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"commands": ["make -C %s docs-generate" % (module) for module in config["modules"]],
},
{
"name": "prepare",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"commands": [
"make -C docs docs-copy",
],
},
{
"name": "test",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"commands": [
"make -C docs test",
],
@ -1459,7 +1459,7 @@ def makeGenerate(module):
},
{
"name": "generate go",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"pull": "always",
"commands": [
"%s ci-go-generate" % (make),
@ -1598,7 +1598,7 @@ def build():
return [
{
"name": "build",
"image": "owncloudci/golang:1.16",
"image": "owncloudci/golang:1.17",
"pull": "always",
"commands": [
"make -C ocis build",

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM owncloudci/golang:1.16 as build
FROM owncloudci/golang:1.17 as build
COPY ./ /ocis/

5
changelog/unreleased/go-1-17.md Normal file
View File

@ -0,0 +1,5 @@
Enhancement: Upgrade to GO 1.17
We've upgraded the used GO version from 1.16 to 1.17.
https://github.com/owncloud/ocis/pull/2605

2
docs/ocis/development/getting-started.md
View File

@ -16,7 +16,7 @@ So we are trying to reflect this in the tooling. It should be kept simple and qu
Besides standard development tools like git and a text editor, you need the following software for development:
- Go >= v1.16 ([install instructions](https://golang.org/doc/install))
- Go >= v1.17 ([install instructions](https://golang.org/doc/install))
- Yarn ([install instructions](https://classic.yarnpkg.com/en/docs/install))
- docker ([install instructions](https://docs.docker.com/get-docker/))
- docker-compose ([install instructions](https://docs.docker.com/compose/install/))

168
go.mod
View File

@ -1,6 +1,6 @@
module github.com/owncloud/ocis
go 1.16
go 1.17
require (
github.com/CiscoM31/godata v1.0.4
@ -75,5 +75,171 @@ require (
stash.kopano.io/kgol/rndm v1.1.1
)
require (
contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
github.com/ReneKroon/ttlcache/v2 v2.8.1 // indirect
github.com/RoaringBitmap/roaring v0.7.3 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/aws/aws-sdk-go v1.40.46 // indirect
github.com/beevik/etree v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bitly/go-simplejson v0.5.0 // indirect
github.com/bits-and-blooms/bitset v1.2.0 // indirect
github.com/blevesearch/bleve_index_api v1.0.1 // indirect
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
github.com/blevesearch/mmap-go v1.0.2 // indirect
github.com/blevesearch/scorch_segment_api/v2 v2.0.1 // indirect
github.com/blevesearch/segment v0.9.0 // indirect
github.com/blevesearch/snowballstem v0.9.0 // indirect
github.com/blevesearch/upsidedown_store_api v1.0.1 // indirect
github.com/blevesearch/vellum v1.0.5 // indirect
github.com/blevesearch/zapx/v11 v11.2.2 // indirect
github.com/blevesearch/zapx/v12 v12.2.2 // indirect
github.com/blevesearch/zapx/v13 v13.2.2 // indirect
github.com/blevesearch/zapx/v14 v14.2.2 // indirect
github.com/blevesearch/zapx/v15 v15.2.2 // indirect
github.com/bluele/gcache v0.0.2 // indirect
github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
github.com/boombuler/barcode v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/crewjam/httperr v0.2.0 // indirect
github.com/crewjam/saml v0.4.3 // indirect
github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.7.1 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/eternnoir/gncp v0.0.0-20170707042257-c70df2d0cd68 // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gdexlab/go-render v1.0.1 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.1 // indirect
github.com/go-git/go-git/v5 v5.4.2 // indirect
github.com/go-kit/log v0.1.0 // indirect
github.com/go-ldap/ldap/v3 v3.4.1 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/go-sql-driver/mysql v1.6.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/gomodule/redigo v1.8.5 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/schema v1.1.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/hashicorp/go-hclog v0.16.2 // indirect
github.com/hashicorp/go-plugin v1.4.3 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jonboulle/clockwork v0.2.1 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
github.com/klauspost/cpuid v1.3.1 // indirect
github.com/longsleep/go-metrics v0.0.0-20191013204616-cddea569b0ea // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattermost/xml-roundtrip-validator v0.0.0-20201213122252-bcd7e1b9601e // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mattn/go-sqlite3 v1.14.8 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 // indirect
github.com/miekg/dns v1.1.43 // indirect
github.com/mileusna/useragent v1.0.2 // indirect
github.com/minio/md5-simd v1.1.0 // indirect
github.com/minio/minio-go/v7 v7.0.14 // indirect
github.com/minio/sha256-simd v0.1.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/mschoch/smat v0.2.0 // indirect
github.com/nats-io/jwt v1.1.0 // indirect
github.com/nats-io/nats.go v1.10.0 // indirect
github.com/nats-io/nkeys v0.1.4 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pelletier/go-toml v1.9.3 // indirect
github.com/pkg/xattr v0.4.3 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/pquerna/otp v1.3.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/prometheus/statsd_exporter v0.21.0 // indirect
github.com/rickb777/date v1.12.4 // indirect
github.com/rickb777/plural v1.2.0 // indirect
github.com/rs/cors v1.8.0 // indirect
github.com/rs/xid v1.3.0 // indirect
github.com/russellhaering/goxmldsig v1.1.0 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
github.com/sciencemesh/meshdirectory-web v1.0.4 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/sethvargo/go-password v0.2.0 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/sony/gobreaker v0.4.1 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/steveyen/gtreap v0.1.0 // indirect
github.com/studio-b12/gowebdav v0.0.0-20210917133250-a3a86976a1df // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/tus/tusd v1.6.0 // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
go.etcd.io/bbolt v1.3.5 // indirect
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210921065528-437939a70204 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
golang.org/x/tools v0.1.5 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
stash.kopano.io/kgol/kcc-go/v5 v5.0.1 // indirect
stash.kopano.io/kgol/oidc-go v0.3.1 // indirect
)
// this is a transitive replace. See https://github.com/libregraph/lico/blob/master/go.mod#L38
replace github.com/crewjam/saml => github.com/crewjam/saml v0.4.5

2
ocis/docker/eos-ocis/Dockerfile
View File

@ -9,7 +9,7 @@ RUN rpm --rebuilddb && yum -y install \
make \
gcc \
git
RUN wget -q https://dl.google.com/go/go1.16.2.linux-amd64.tar.gz
RUN wget -q https://dl.google.com/go/go1.17.2.linux-amd64.tar.gz
RUN mkdir -p /usr/local/bin
RUN tar xf go1.16.2.linux-amd64.tar.gz -C /usr/local
RUN ln -s /usr/local/go/bin/* /usr/local/bin