Skip to content

Commit

Permalink
Bump grpc dependencies and workflow versions (#914)
Browse files Browse the repository at this point in the history
* chore: bump deps

bump deps for go modules using grpc

Signed-off-by: Michael Gasch <[email protected]>

* ci: add dependabot configuration

Signed-off-by: Michael Gasch <[email protected]>

* ci: update workflows

- bump and reorder actions (to enable modules caching)
- force go 1.17 module compatibility

Signed-off-by: Michael Gasch <[email protected]>

---------

Signed-off-by: Michael Gasch <[email protected]>
  • Loading branch information
embano1 authored Jul 10, 2023
1 parent 50b18a0 commit f681ac6
Show file tree
Hide file tree
Showing 22 changed files with 217 additions and 1,317 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: gomod
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 5
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
8 changes: 4 additions & 4 deletions .github/workflows/conformance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
runs-on: ${{ matrix.platform }}

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Go ${{ matrix.go-version }}
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
cache-dependency-path: v2/go.sum
id: go

- name: Checkout code
uses: actions/checkout@v2

- name: Update git submodule
run: git submodule sync && git submodule update --init

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/go-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
runs-on: ${{ matrix.platform }}

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up Go ${{ matrix.go-version }}
uses: actions/setup-go@v2
- name: Setup Go ${{ matrix.go-version }}
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
cache-dependency-path: v2/go.sum
id: go

- name: Checkout code
uses: actions/checkout@v2

- name: Build
run: ./hack/build-test.sh

8 changes: 4 additions & 4 deletions .github/workflows/go-format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

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

- name: Checkout code
uses: actions/checkout@v2

- name: Go Format
shell: bash
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/go-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

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

- name: Checkout code
uses: actions/checkout@v2

- id: golangci_configuration
uses: andstor/file-existence-action@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/go-unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
runs-on: ${{ matrix.platform }}

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Go ${{ matrix.go-version }}
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
cache-dependency-path: v2/go.sum
id: go

- name: Checkout code
uses: actions/checkout@v2

- name: Test
run: ./hack/unit-test.sh
2 changes: 1 addition & 1 deletion .github/workflows/inclusive.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Woke
uses: get-woke/woke-action-reviewdog@v0
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ jobs:
- 5672:5672

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Go ${{ matrix.go-version }}
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
cache-dependency-path: v2/go.sum
id: go

- name: Checkout code
uses: actions/checkout@v2


- name: Test
run: ./hack/integration-test.sh

8 changes: 4 additions & 4 deletions .github/workflows/observability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
runs-on: ${{ matrix.platform }}

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Go ${{ matrix.go-version }}
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
cache-dependency-path: v2/go.sum
id: go

- name: Checkout code
uses: actions/checkout@v2

- name: Update git submodule
run: git submodule sync && git submodule update --init

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

- name: Install Dependencies
run: go install tableflip.dev/ggsv@latest
Expand All @@ -32,7 +33,7 @@ jobs:
needs: semver
steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Create Release ${{ needs.semver.outputs.next }}
uses: actions/create-release@v1
Expand All @@ -52,13 +53,15 @@ jobs:
env:
VERSION: ${{ needs.semver.outputs.next }}
steps:
- name: Checkout Code
uses: actions/checkout@v3

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

- name: Checkout Code
uses: actions/checkout@v2
- run: git pull

- name: Update Modules
Expand All @@ -85,12 +88,13 @@ jobs:
VERSION: ${{ needs.semver.outputs.next }}
steps:
- name: Set up Go 1.17.x
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.17.x
cache-dependency-path: v2/go.sum

- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v3
- run: git pull

- name: Update Examples
Expand Down
2 changes: 1 addition & 1 deletion 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
go mod tidy -compat=1.17
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
go mod tidy -compat=1.17
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
go mod tidy -compat=1.17

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
go mod tidy -compat=1.17

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
go mod tidy -compat=1.17
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
go mod tidy -compat=1.17
popd
done
39 changes: 20 additions & 19 deletions protocol/pubsub/v2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,39 @@ go 1.17
replace github.com/cloudevents/sdk-go/v2 => ../../../v2

require (
cloud.google.com/go/pubsub v1.23.0
cloud.google.com/go/pubsub v1.30.0
github.com/cloudevents/sdk-go/v2 v2.5.0
github.com/google/go-cmp v0.5.8
github.com/stretchr/testify v1.8.0
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
google.golang.org/api v0.84.0
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad
google.golang.org/grpc v1.47.0
github.com/google/go-cmp v0.5.9
github.com/stretchr/testify v1.8.1
golang.org/x/sync v0.1.0
google.golang.org/api v0.114.0
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
google.golang.org/grpc v1.56.1
)

require (
cloud.google.com/go v0.102.1 // indirect
cloud.google.com/go/compute v1.6.1 // indirect
cloud.google.com/go/iam v0.3.0 // indirect
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.19.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa // indirect
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.4.0 // indirect
go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.10.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit f681ac6

Please sign in to comment.