Skip to content

Commit 8d0b506

Browse files
authored
Monthly upgrade (#24)
* chore: use java runtime from github image for sonarscanner * fix: upgrade OTEL packages
1 parent 40222c3 commit 8d0b506

File tree

5 files changed

+6
-31
lines changed

5 files changed

+6
-31
lines changed

.github/workflows/deployment.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,8 @@ jobs:
1414
with:
1515
fetch-depth: 0
1616

17-
- name: Install Java 21 Temurin
18-
uses: actions/setup-java@v4
19-
with:
20-
distribution: "temurin"
21-
java-version: "21"
22-
2317
- name: Publish using nuke
24-
run: ./build.cmd Clean Publish
18+
run: JAVA_HOME=$JAVA_HOME_21_X64 ./build.cmd Clean Publish
2519
env:
2620
GH_TOKEN: ${{ github.token }}
2721
SONAR_TOKEN: ${{ secrets.sonar_token }}

.github/workflows/integration.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@ jobs:
1818
with:
1919
fetch-depth: 0
2020

21-
- name: Install Java 21 Temurin
22-
uses: actions/setup-java@v4
23-
with:
24-
distribution: "temurin"
25-
java-version: "21"
26-
2721
- name: Verify using nuke
28-
run: ./build.sh Clean Verify
22+
run: JAVA_HOME=$JAVA_HOME_21_X64 ./build.sh Clean Verify
2923
env:
3024
SONAR_TOKEN: ${{ secrets.sonar_token }}

.runsettings

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

src/ArwynFr.IntegrationTesting/ArwynFr.IntegrationTesting.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
2424
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
2525
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
26-
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.7.0" />
27-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
28-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
26+
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.8.0" />
27+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
28+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
2929
<PackageReference Include="XUnit" Version="2.7.0" />
3030
</ItemGroup>
3131

test/ArwynFr.IntegrationTesting.Tests.Target/ArwynFr.IntegrationTesting.Tests.Target.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PrivateAssets>all</PrivateAssets>
1414
</PackageReference>
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
16-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
16+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
1717
</ItemGroup>
1818

1919
</Project>

0 commit comments

Comments
 (0)