Skip to content

Commit

Permalink
Move to go 1.18
Browse files Browse the repository at this point in the history
Had to run gofmt and fix some weird typos due to tabs in the comments

Signed-off-by: Doug Davis <dug@microsoft.com>
  • Loading branch information
Doug Davis committed Oct 23, 2023
1 parent b497de9 commit 6f5984b
Show file tree
Hide file tree
Showing 80 changed files with 90 additions and 6,370 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conformance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: CloudEvents
strategy:
matrix:
go-version: [1.17.x]
go-version: [1.21.x]
platform: [ubuntu-latest]

runs-on: ${{ matrix.platform }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: Build
strategy:
matrix:
go-version: [1.17.x]
go-version: [1.21.x]
platform: [ubuntu-latest]

runs-on: ${{ matrix.platform }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go-format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Go 1.17.x
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.17.x
go-version: 1.21.x
cache-dependency-path: v2/go.sum
id: go

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Go 1.17.x
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.17.x
go-version: 1.21.x
cache-dependency-path: v2/go.sum
id: go

Expand All @@ -32,6 +32,6 @@ jobs:
if: steps.golangci_configuration.outputs.files_exists == 'true'
uses: golangci/golangci-lint-action@v3
with:
version: v1.29
version: v1.54
working-directory: v2

2 changes: 1 addition & 1 deletion .github/workflows/go-unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: Unit Test
strategy:
matrix:
go-version: [1.17.x]
go-version: [1.21.x]
platform: [ubuntu-latest]

runs-on: ${{ matrix.platform }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
# Only test one go version: the integration tests don't seem to pass if NATS runs more one running at a time.
go-version: [1.17.x]
go-version: [1.21.x]
platform: [ubuntu-latest]

runs-on: ${{ matrix.platform }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/observability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: CloudEvents
strategy:
matrix:
go-version: [1.17.x]
go-version: [1.21.x]
platform: [ubuntu-latest]

runs-on: ${{ matrix.platform }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
outputs:
next: ${{ steps.ggsv.outputs.next}}
steps:
- name: Setup Go 1.17.x
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.17.x
go-version: 1.21.x
cache-dependency-path: v2/go.sum

- name: Install Dependencies
Expand Down Expand Up @@ -56,10 +56,10 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v4

- name: Set up Go 1.17.x
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.17.x
go-version: 1.21.x
cache-dependency-path: v2/go.sum

- run: git pull
Expand Down Expand Up @@ -87,10 +87,10 @@ jobs:
env:
VERSION: ${{ needs.semver.outputs.next }}
steps:
- name: Set up Go 1.17.x
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.17.x
go-version: 1.21.x
cache-dependency-path: v2/go.sum

- name: Checkout Code
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This library will help you to:
_Note:_ Supported
[CloudEvents specification](https://github.com/cloudevents/spec): 0.3, 1.0

_Note:_ Supported go version: 1.17+
_Note:_ Supported go version: 1.18+

## Get started

Expand Down
2 changes: 1 addition & 1 deletion binding/format/protobuf/v2/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cloudevents/sdk-go/binding/format/protobuf/v2

go 1.17
go 1.18

require (
github.com/cloudevents/sdk-go/v2 v2.5.0
Expand Down
11 changes: 0 additions & 11 deletions binding/format/protobuf/v2/go.sum
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand All @@ -33,24 +26,20 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
4 changes: 2 additions & 2 deletions hack/conformance-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ pushd ./test/conformance
go test --tags=conformance -v -timeout 15s

# Remove test only deps.
go mod tidy -compat=1.17
popd
go mod tidy -compat=1.18
popd
2 changes: 1 addition & 1 deletion hack/go-mod-tidy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ set -o pipefail
for gomodule in $(find . | grep "go\.mod" | awk '{gsub(/\/go.mod/,""); print $0}' | grep -v "./test" | grep -v "./conformance")
do
pushd $gomodule
go mod tidy -compat=1.17
go mod tidy -compat=1.18
popd
done
2 changes: 1 addition & 1 deletion hack/integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ done
rm coverage.tmp

# Remove test only deps.
go mod tidy -compat=1.17
go mod tidy -compat=1.18

popd
2 changes: 1 addition & 1 deletion hack/observability-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ done
rm coverage.tmp

# Remove test only deps.
go mod tidy -compat=1.17
go mod tidy -compat=1.18

popd
2 changes: 1 addition & 1 deletion hack/tag-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ do
go get -d $repoint@$tag
go mod edit -dropreplace $repoint
fi
go mod tidy -compat=1.17
go mod tidy -compat=1.18
done
popd > /dev/null

Expand Down
2 changes: 1 addition & 1 deletion hack/unit-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ do

rm coverage.tmp
# Remove test only deps.
go mod tidy -compat=1.17
go mod tidy -compat=1.18
popd
done
2 changes: 1 addition & 1 deletion observability/opencensus/v2/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cloudevents/sdk-go/observability/opencensus/v2

go 1.17
go 1.18

require (
github.com/cloudevents/sdk-go/v2 v2.5.0
Expand Down
Loading

0 comments on commit 6f5984b

Please sign in to comment.