Skip to content

Commit f3d1c7b

Browse files
Merge branch 'main' into dotnet-10
2 parents 3d1a0eb + 3f86f47 commit f3d1c7b

File tree

2 files changed

+31
-2
lines changed

2 files changed

+31
-2
lines changed

.github/dependabot.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,34 @@ updates:
66
interval: "daily"
77
labels:
88
- "infra"
9+
- package-ecosystem: "docker"
10+
directory: "/examples/MicroserviceExample/WebApi"
11+
schedule:
12+
interval: "weekly"
13+
day: "wednesday"
14+
labels:
15+
- "infra"
16+
- package-ecosystem: "docker"
17+
directory: "examples/MicroserviceExample/WorkerService"
18+
schedule:
19+
interval: "weekly"
20+
day: "wednesday"
21+
labels:
22+
- "infra"
23+
- package-ecosystem: "docker"
24+
directory: "test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest"
25+
schedule:
26+
interval: "weekly"
27+
day: "wednesday"
28+
labels:
29+
- "infra"
30+
- package-ecosystem: "docker"
31+
directory: "test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests"
32+
schedule:
33+
interval: "weekly"
34+
day: "wednesday"
35+
labels:
36+
- "infra"
937
- package-ecosystem: "dotnet-sdk"
1038
directory: "/"
1139
schedule:

.github/workflows/Component.BuildTest.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,15 @@ jobs:
5353
# retrieve them all.
5454
fetch-depth: 0
5555

56-
- name: Setup previous dotnet runtimes
56+
- name: Setup previous .NET runtimes
5757
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
5858
with:
5959
dotnet-version: |
6060
8.0.x
6161
9.0.x
6262
63-
- name: Setup dotnet
63+
64+
- name: Setup .NET
6465
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
6566

6667
- name: dotnet restore ${{ inputs.project-name }}

0 commit comments

Comments
 (0)