Skip to content

Commit 48b0923

Browse files
authored
Merge branch 'master' into dependabot/nuget/build/Polly.Core-8.6.6
2 parents 7c00e59 + 47cb7ec commit 48b0923

4 files changed

Lines changed: 16 additions & 29 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ jobs:
2424
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
2525
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v6
2828

2929
- name: Setup .NET (8 + 9)
30-
uses: actions/setup-dotnet@v4
30+
uses: actions/setup-dotnet@v5
3131
with:
3232
dotnet-version: |
3333
8.0.x
3434
9.0.x
3535
3636
- name: Cache NuGet packages
37-
uses: actions/cache@v4
37+
uses: actions/cache@v5
3838
with:
3939
path: ${{ github.workspace }}/.nuget/packages
4040
key: ${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ jobs:
2828
DOTNET_NOLOGO: true
2929
DOTNET_CLI_TELEMETRY_OPTOUT: true
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v6
3232

3333
- name: Setup .NET (8 + 9)
34-
uses: actions/setup-dotnet@v4
34+
uses: actions/setup-dotnet@v5
3535
with:
3636
dotnet-version: |
3737
8.0.x
3838
9.0.x
3939
4040
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@v3
41+
uses: github/codeql-action/init@v4
4242
with:
4343
languages: csharp
4444
queries: security-and-quality
@@ -47,6 +47,6 @@ jobs:
4747
run: dotnet build NeoReports.sln --configuration Release
4848

4949
- name: Perform CodeQL Analysis
50-
uses: github/codeql-action/analyze@v3
50+
uses: github/codeql-action/analyze@v4
5151
with:
5252
category: "/language:csharp"

.github/workflows/sonar.yml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,53 +17,40 @@ jobs:
1717
analyze:
1818
name: SonarCloud
1919
runs-on: ubuntu-latest
20-
# Skip until the SONAR_TOKEN secret is configured (e.g. on forks). Once you
21-
# add the secret in repo settings, the job runs automatically.
22-
if: ${{ github.repository == 'thiagoluga/NeoReports' }}
20+
# The whole job is skipped (neutral, never red) until SonarCloud is fully set up.
21+
# To activate: import the project on sonarcloud.io, add the SONAR_TOKEN secret,
22+
# then set the repository variable SONAR_ENABLED to "true"
23+
# (gh variable set SONAR_ENABLED --body true).
24+
if: ${{ vars.SONAR_ENABLED == 'true' && github.repository == 'thiagoluga/NeoReports' }}
2325
env:
2426
DOTNET_NOLOGO: true
2527
DOTNET_CLI_TELEMETRY_OPTOUT: true
2628
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
2729
steps:
28-
- name: Guard — require SONAR_TOKEN
29-
id: guard
30-
run: |
31-
if [ -z "${SONAR_TOKEN}" ]; then
32-
echo "SONAR_TOKEN not set — skipping SonarCloud analysis."
33-
echo "enabled=false" >> "$GITHUB_OUTPUT"
34-
else
35-
echo "enabled=true" >> "$GITHUB_OUTPUT"
36-
fi
37-
38-
- uses: actions/checkout@v4
39-
if: steps.guard.outputs.enabled == 'true'
30+
- uses: actions/checkout@v6
4031
with:
4132
# Full history gives Sonar accurate new-code / blame information.
4233
fetch-depth: 0
4334

4435
- name: Setup .NET (8 + 9)
45-
if: steps.guard.outputs.enabled == 'true'
46-
uses: actions/setup-dotnet@v4
36+
uses: actions/setup-dotnet@v5
4737
with:
4838
dotnet-version: |
4939
8.0.x
5040
9.0.x
5141
5242
- name: Setup Java (required by the Sonar scanner)
53-
if: steps.guard.outputs.enabled == 'true'
54-
uses: actions/setup-java@v4
43+
uses: actions/setup-java@v5
5544
with:
5645
distribution: temurin
5746
java-version: "17"
5847

5948
- name: Install Sonar + coverage tools
60-
if: steps.guard.outputs.enabled == 'true'
6149
run: |
6250
dotnet tool install --global dotnet-sonarscanner
6351
dotnet tool install --global dotnet-coverage
6452
6553
- name: Build, test (with coverage) and analyze
66-
if: steps.guard.outputs.enabled == 'true'
6754
env:
6855
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6956
run: |

build/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- Sources / Formats / Destinations -->
1818
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
19-
<PackageVersion Include="ClosedXML" Version="0.104.2" />
19+
<PackageVersion Include="ClosedXML" Version="0.105.0" />
2020
<PackageVersion Include="AWSSDK.S3" Version="3.7.405.6" />
2121

2222
<!-- Jobs -->

0 commit comments

Comments
 (0)