Skip to content

Commit 6132008

Browse files
MrAliasMrAlias
authored
Use upstream dbotconf (#2713)
* Add upstream dbotconf dep * Remove local dbotconf * Update Makefile * Run dependabot generation
1 parent fdbcf71 commit 6132008

File tree

6 files changed

+79
-198
lines changed

6 files changed

+79
-198
lines changed

‎.github/dependabot.yml

+65-66
Original file line numberDiff line numberDiff line change
@@ -1,292 +1,291 @@
1-
# File generated by "make dependabot-generate"; DO NOT EDIT.
2-
1+
# File generated by dbotconf; DO NOT EDIT.
32
version: 2
43
updates:
54
- package-ecosystem: github-actions
65
directory: /
76
labels:
87
- dependencies
98
- actions
10-
- "Skip Changelog"
9+
- Skip Changelog
1110
schedule:
12-
day: sunday
1311
interval: weekly
12+
day: sunday
1413
- package-ecosystem: gomod
1514
directory: /
1615
labels:
1716
- dependencies
1817
- go
19-
- "Skip Changelog"
18+
- Skip Changelog
2019
schedule:
21-
day: sunday
2220
interval: weekly
21+
day: sunday
2322
- package-ecosystem: gomod
2423
directory: /bridge/opencensus
2524
labels:
2625
- dependencies
2726
- go
28-
- "Skip Changelog"
27+
- Skip Changelog
2928
schedule:
30-
day: sunday
3129
interval: weekly
30+
day: sunday
3231
- package-ecosystem: gomod
3332
directory: /bridge/opencensus/test
3433
labels:
3534
- dependencies
3635
- go
37-
- "Skip Changelog"
36+
- Skip Changelog
3837
schedule:
39-
day: sunday
4038
interval: weekly
39+
day: sunday
4140
- package-ecosystem: gomod
4241
directory: /bridge/opentracing
4342
labels:
4443
- dependencies
4544
- go
46-
- "Skip Changelog"
45+
- Skip Changelog
4746
schedule:
48-
day: sunday
4947
interval: weekly
48+
day: sunday
5049
- package-ecosystem: gomod
5150
directory: /example/fib
5251
labels:
5352
- dependencies
5453
- go
55-
- "Skip Changelog"
54+
- Skip Changelog
5655
schedule:
57-
day: sunday
5856
interval: weekly
57+
day: sunday
5958
- package-ecosystem: gomod
6059
directory: /example/jaeger
6160
labels:
6261
- dependencies
6362
- go
64-
- "Skip Changelog"
63+
- Skip Changelog
6564
schedule:
66-
day: sunday
6765
interval: weekly
66+
day: sunday
6867
- package-ecosystem: gomod
6968
directory: /example/namedtracer
7069
labels:
7170
- dependencies
7271
- go
73-
- "Skip Changelog"
72+
- Skip Changelog
7473
schedule:
75-
day: sunday
7674
interval: weekly
75+
day: sunday
7776
- package-ecosystem: gomod
7877
directory: /example/opencensus
7978
labels:
8079
- dependencies
8180
- go
82-
- "Skip Changelog"
81+
- Skip Changelog
8382
schedule:
84-
day: sunday
8583
interval: weekly
84+
day: sunday
8685
- package-ecosystem: gomod
8786
directory: /example/otel-collector
8887
labels:
8988
- dependencies
9089
- go
91-
- "Skip Changelog"
90+
- Skip Changelog
9291
schedule:
93-
day: sunday
9492
interval: weekly
93+
day: sunday
9594
- package-ecosystem: gomod
9695
directory: /example/passthrough
9796
labels:
9897
- dependencies
9998
- go
100-
- "Skip Changelog"
99+
- Skip Changelog
101100
schedule:
102-
day: sunday
103101
interval: weekly
102+
day: sunday
104103
- package-ecosystem: gomod
105104
directory: /example/prometheus
106105
labels:
107106
- dependencies
108107
- go
109-
- "Skip Changelog"
108+
- Skip Changelog
110109
schedule:
111-
day: sunday
112110
interval: weekly
111+
day: sunday
113112
- package-ecosystem: gomod
114113
directory: /example/zipkin
115114
labels:
116115
- dependencies
117116
- go
118-
- "Skip Changelog"
117+
- Skip Changelog
119118
schedule:
120-
day: sunday
121119
interval: weekly
120+
day: sunday
122121
- package-ecosystem: gomod
123122
directory: /exporters/jaeger
124123
labels:
125124
- dependencies
126125
- go
127-
- "Skip Changelog"
126+
- Skip Changelog
128127
schedule:
129-
day: sunday
130128
interval: weekly
129+
day: sunday
131130
- package-ecosystem: gomod
132131
directory: /exporters/otlp/internal/retry
133132
labels:
134133
- dependencies
135134
- go
136-
- "Skip Changelog"
135+
- Skip Changelog
137136
schedule:
138-
day: sunday
139137
interval: weekly
138+
day: sunday
140139
- package-ecosystem: gomod
141140
directory: /exporters/otlp/otlpmetric
142141
labels:
143142
- dependencies
144143
- go
145-
- "Skip Changelog"
144+
- Skip Changelog
146145
schedule:
147-
day: sunday
148146
interval: weekly
147+
day: sunday
149148
- package-ecosystem: gomod
150149
directory: /exporters/otlp/otlpmetric/otlpmetricgrpc
151150
labels:
152151
- dependencies
153152
- go
154-
- "Skip Changelog"
153+
- Skip Changelog
155154
schedule:
156-
day: sunday
157155
interval: weekly
156+
day: sunday
158157
- package-ecosystem: gomod
159158
directory: /exporters/otlp/otlpmetric/otlpmetrichttp
160159
labels:
161160
- dependencies
162161
- go
163-
- "Skip Changelog"
162+
- Skip Changelog
164163
schedule:
165-
day: sunday
166164
interval: weekly
165+
day: sunday
167166
- package-ecosystem: gomod
168167
directory: /exporters/otlp/otlptrace
169168
labels:
170169
- dependencies
171170
- go
172-
- "Skip Changelog"
171+
- Skip Changelog
173172
schedule:
174-
day: sunday
175173
interval: weekly
174+
day: sunday
176175
- package-ecosystem: gomod
177176
directory: /exporters/otlp/otlptrace/otlptracegrpc
178177
labels:
179178
- dependencies
180179
- go
181-
- "Skip Changelog"
180+
- Skip Changelog
182181
schedule:
183-
day: sunday
184182
interval: weekly
183+
day: sunday
185184
- package-ecosystem: gomod
186185
directory: /exporters/otlp/otlptrace/otlptracehttp
187186
labels:
188187
- dependencies
189188
- go
190-
- "Skip Changelog"
189+
- Skip Changelog
191190
schedule:
192-
day: sunday
193191
interval: weekly
192+
day: sunday
194193
- package-ecosystem: gomod
195194
directory: /exporters/prometheus
196195
labels:
197196
- dependencies
198197
- go
199-
- "Skip Changelog"
198+
- Skip Changelog
200199
schedule:
201-
day: sunday
202200
interval: weekly
201+
day: sunday
203202
- package-ecosystem: gomod
204203
directory: /exporters/stdout/stdoutmetric
205204
labels:
206205
- dependencies
207206
- go
208-
- "Skip Changelog"
207+
- Skip Changelog
209208
schedule:
210-
day: sunday
211209
interval: weekly
210+
day: sunday
212211
- package-ecosystem: gomod
213212
directory: /exporters/stdout/stdouttrace
214213
labels:
215214
- dependencies
216215
- go
217-
- "Skip Changelog"
216+
- Skip Changelog
218217
schedule:
219-
day: sunday
220218
interval: weekly
219+
day: sunday
221220
- package-ecosystem: gomod
222221
directory: /exporters/zipkin
223222
labels:
224223
- dependencies
225224
- go
226-
- "Skip Changelog"
225+
- Skip Changelog
227226
schedule:
228-
day: sunday
229227
interval: weekly
228+
day: sunday
230229
- package-ecosystem: gomod
231230
directory: /internal/tools
232231
labels:
233232
- dependencies
234233
- go
235-
- "Skip Changelog"
234+
- Skip Changelog
236235
schedule:
237-
day: sunday
238236
interval: weekly
237+
day: sunday
239238
- package-ecosystem: gomod
240239
directory: /metric
241240
labels:
242241
- dependencies
243242
- go
244-
- "Skip Changelog"
243+
- Skip Changelog
245244
schedule:
246-
day: sunday
247245
interval: weekly
246+
day: sunday
248247
- package-ecosystem: gomod
249248
directory: /schema
250249
labels:
251250
- dependencies
252251
- go
253-
- "Skip Changelog"
252+
- Skip Changelog
254253
schedule:
255-
day: sunday
256254
interval: weekly
255+
day: sunday
257256
- package-ecosystem: gomod
258257
directory: /sdk
259258
labels:
260259
- dependencies
261260
- go
262-
- "Skip Changelog"
261+
- Skip Changelog
263262
schedule:
264-
day: sunday
265263
interval: weekly
264+
day: sunday
266265
- package-ecosystem: gomod
267266
directory: /sdk/export/metric
268267
labels:
269268
- dependencies
270269
- go
271-
- "Skip Changelog"
270+
- Skip Changelog
272271
schedule:
273-
day: sunday
274272
interval: weekly
273+
day: sunday
275274
- package-ecosystem: gomod
276275
directory: /sdk/metric
277276
labels:
278277
- dependencies
279278
- go
280-
- "Skip Changelog"
279+
- Skip Changelog
281280
schedule:
282-
day: sunday
283281
interval: weekly
282+
day: sunday
284283
- package-ecosystem: gomod
285284
directory: /trace
286285
labels:
287286
- dependencies
288287
- go
289-
- "Skip Changelog"
288+
- Skip Changelog
290289
schedule:
291-
day: sunday
292290
interval: weekly
291+
day: sunday

‎Makefile

+6-18
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ CROSSLINK = $(TOOLS)/crosslink
4848
$(TOOLS)/crosslink: PACKAGE=go.opentelemetry.io/otel/$(TOOLS_MOD_DIR)/crosslink
4949

5050
DBOTCONF = $(TOOLS)/dbotconf
51-
$(TOOLS)/dbotconf: PACKAGE=go.opentelemetry.io/otel/$(TOOLS_MOD_DIR)/dbotconf
51+
$(TOOLS)/dbotconf: PACKAGE=go.opentelemetry.io/build-tools/dbotconf
5252

5353
GOLANGCI_LINT = $(TOOLS)/golangci-lint
5454
$(TOOLS)/golangci-lint: PACKAGE=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -178,26 +178,14 @@ license-check:
178178
exit 1; \
179179
fi
180180

181-
DEPENDABOT_PATH=./.github/dependabot.yml
181+
DEPENDABOT_CONFIG = .github/dependabot.yml
182182
.PHONY: dependabot-check
183-
dependabot-check:
184-
@result=$$( \
185-
for f in $$( find . -type f -name go.mod -exec dirname {} \; | sed 's/^.//' ); \
186-
do grep -q "directory: \+$$f" $(DEPENDABOT_PATH) \
187-
|| echo "$$f"; \
188-
done; \
189-
); \
190-
if [ -n "$$result" ]; then \
191-
echo "missing dependabot entry:"; echo "$$result"; \
192-
echo "new modules need to be added to the $(DEPENDABOT_PATH) file"; \
193-
echo "(run: make dependabot-generate)"; \
194-
exit 1; \
195-
fi
183+
dependabot-check: | $(DBOTCONF)
184+
@$(DBOTCONF) verify $(DEPENDABOT_CONFIG) || echo "(run: make dependabot-generate)"
196185

197186
.PHONY: dependabot-generate
198-
dependabot-generate: $(DBOTCONF)
199-
@echo "gerating dependabot configuration"; \
200-
$(DBOTCONF)
187+
dependabot-generate: | $(DBOTCONF)
188+
@$(DBOTCONF) generate > $(DEPENDABOT_CONFIG)
201189

202190
.PHONY: check-clean-work-tree
203191
check-clean-work-tree:

0 commit comments

Comments
 (0)