Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dependabot and upgrade golang and dependency versions #3

Merged
merged 2 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
version: 2
updates:
- package-ecosystem: "gomod"
directories:
- "/"
- "/example"
schedule:
interval: "weekly"
open-pull-requests-limit: 5
groups:
otel:
patterns:
- "go.opentelemetry.io/*"
golang-x:
patterns:
- "golang.org/x/*"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 5
25 changes: 10 additions & 15 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- "release-*"

env:
GO_VERSION: "1.20.x"
GO_VERSION: "1.22.x"
WORKDIR: src/github.com/containers/otelttrpc

permissions:
Expand All @@ -27,16 +27,16 @@ jobs:
timeout-minutes: 5

steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version: ${{ env.GO_VERSION }}

- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: ${{ env.WORKDIR }}
fetch-depth: 25

- uses: containerd/project-checks@v1.1.0
- uses: containerd/project-checks@434a07157608eeaa1d5c8d4dd506154204cd9401 # v1.1.0
with:
working-directory: ${{ env.WORKDIR }}

Expand All @@ -54,28 +54,23 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: ${{ env.WORKDIR }}

- name: Setup golang toolchain
uses: actions/setup-go@v3
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version: ${{ env.GO_VERSION }}

- name: Run golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
with:
version: v1.55
version: v1.60.3
args: --timeout=10m
skip-cache: true
working-directory: ${{ env.WORKDIR }}

- name: Show golangci-lint errors
run: make lint
working-directory: ${{ env.WORKIR }}
if: ${{ failure() }}

#
# Tests and other checks
#
Expand All @@ -89,12 +84,12 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: ${{ env.WORKDIR }}

- name: Setup golang toolchain
uses: actions/setup-go@v3
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version: ${{ env.GO_VERSION }}

Expand Down
19 changes: 10 additions & 9 deletions example/go.mod
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
module github.com/containerd/otelttrpc/example

go 1.18
go 1.21

require (
github.com/containerd/otelttrpc v0.0.0-00010101000000-000000000000
github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723
github.com/containerd/ttrpc v1.2.7
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
go.opentelemetry.io/otel v1.29.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.29.0
go.opentelemetry.io/otel/sdk v1.29.0
go.opentelemetry.io/otel/trace v1.29.0
google.golang.org/protobuf v1.33.0
)

require (
github.com/containerd/log v0.1.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
golang.org/x/sys v0.18.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
golang.org/x/sys v0.28.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d // indirect
google.golang.org/grpc v1.57.1 // indirect
)
Expand Down
Loading
Loading