Skip to content

Commit 34957a5

Browse files
dmathieupellared
andauthored
Switch from dependabot to renovate (#196)
* switch from dependabot to renovate * Update renovate.json Co-authored-by: Robert Pająk <[email protected]> --------- Co-authored-by: Robert Pająk <[email protected]>
1 parent 53bebda commit 34957a5

File tree

7 files changed

+27
-82
lines changed

7 files changed

+27
-82
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

.github/workflows/dependabot-check.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

Makefile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,8 @@ $(TOOLS)/%: | $(TOOLS)
7777
MULTIMOD = $(TOOLS)/multimod
7878
$(TOOLS)/multimod: PACKAGE=go.opentelemetry.io/build-tools/multimod
7979

80-
DBOTCONF = $(TOOLS)/dbotconf
81-
$(TOOLS)/dbotconf: PACKAGE=go.opentelemetry.io/build-tools/dbotconf
82-
8380
.PHONY: tools
84-
tools: $(DBOTCONF) $(MULTIMOD)
81+
tools: $(MULTIMOD)
8582

8683
.PHONY: protobuf
8784
protobuf: protobuf-source gen-otlp-protobuf copy-otlp-protobuf gen-otlp-protobuf-slim copy-otlp-protobuf-slim
@@ -131,7 +128,7 @@ copy-otlp-protobuf:
131128
rm -rf ./$(OTLP_OUTPUT_DIR)/*/
132129
@rsync -a $(PROTOBUF_TEMP_DIR)/go.opentelemetry.io/proto/otlp/ ./$(OTLP_OUTPUT_DIR)
133130
cd ./$(OTLP_OUTPUT_DIR) && go mod tidy
134-
131+
135132
.PHONY: gen-otlp-protobuf-slim
136133
gen-otlp-protobuf-slim: $(SOURCE_PROTOSLIM_FILES)
137134
rm -rf ./$(PROTOBUF_TEMP_DIR)
@@ -158,15 +155,6 @@ check-clean-work-tree:
158155
exit 1; \
159156
fi
160157

161-
DEPENDABOT_CONFIG = .github/dependabot.yml
162-
.PHONY: dependabot-check
163-
dependabot-check: | $(DBOTCONF)
164-
@$(DBOTCONF) verify $(DEPENDABOT_CONFIG) || printf "\n(run: make dependabot-generate)\n"
165-
166-
.PHONY: dependabot-generate
167-
dependabot-generate: | $(DBOTCONF)
168-
@$(DBOTCONF) generate > $(DEPENDABOT_CONFIG)
169-
170158
# Releasing
171159

172160
.PHONY: submodule-version

internal/tools/go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ module go.opentelemetry.io/proto/internal/tools
22

33
go 1.16
44

5-
require (
6-
go.opentelemetry.io/build-tools/dbotconf v0.14.0
7-
go.opentelemetry.io/build-tools/multimod v0.14.0
8-
)
5+
require go.opentelemetry.io/build-tools/multimod v0.14.0

internal/tools/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,8 +1950,6 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
19501950
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
19511951
go.opentelemetry.io/build-tools v0.14.0 h1:fcnriXRUVpnVIFXtdlc1fTn9g+YRxzOV0xhw4nN919c=
19521952
go.opentelemetry.io/build-tools v0.14.0/go.mod h1:pxTqOr0uL/0s9+xnpuKTAhmVFDssF3O4UUUuWKQqThE=
1953-
go.opentelemetry.io/build-tools/dbotconf v0.14.0 h1:sVIUBttMR7FwkZpcY/HvnfMupAe/K0XIuCYFgAmfYHA=
1954-
go.opentelemetry.io/build-tools/dbotconf v0.14.0/go.mod h1:jZADCRzN6h/DE3Ov9H5bFoOZDm55w/M2jSVkZGsZlbo=
19551953
go.opentelemetry.io/build-tools/multimod v0.14.0 h1:AaM06mlSga3IaCj6eM+Kg9tei062qsU6Z+x6ENmfBWI=
19561954
go.opentelemetry.io/build-tools/multimod v0.14.0/go.mod h1:lY7ZccnZ6dg4uRcghXa4p9v4IDvI9Yf/XFdlpPO84AA=
19571955
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=

internal/tools/tools.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@
1818
package tools // import "go.opentelemetry.io/proto/internal/tools"
1919

2020
import (
21-
_ "go.opentelemetry.io/build-tools/dbotconf"
2221
_ "go.opentelemetry.io/build-tools/multimod"
2322
)

renovate.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended"
5+
],
6+
"ignorePaths": [],
7+
"labels": ["Skip Changelog", "actions", "dependencies"],
8+
"postUpdateOptions" : [
9+
"gomodTidy"
10+
],
11+
"packageRules": [
12+
{
13+
"matchManagers": ["gomod"],
14+
"matchDepTypes": ["indirect"],
15+
"enabled": true
16+
},
17+
{
18+
"matchFileNames": ["internal/tools/**"],
19+
"matchManagers": ["gomod"],
20+
"matchDepTypes": ["indirect"],
21+
"enabled": false
22+
}
23+
]
24+
}

0 commit comments

Comments
 (0)