Skip to content

Commit f49a94d

Browse files
TheConstructorTheConstructor
committed
Fix GitHub-workflows
1 parent 9cf1672 commit f49a94d

File tree

7 files changed

+44
-46
lines changed

7 files changed

+44
-46
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
jobs:
88
build:
99
name: Build
10-
runs-on: windows-2019
10+
runs-on: windows-2022
1111
steps:
12-
- uses: actions/checkout@master
12+
- uses: actions/checkout@v5
1313
- name: Setup dotnet
14-
uses: actions/setup-dotnet@v1
14+
uses: actions/setup-dotnet@v5
1515
with:
1616
dotnet-version: |
1717
2.1.x
@@ -30,11 +30,11 @@ jobs:
3030
runs-on: ${{ matrix.os }}
3131
strategy:
3232
matrix:
33-
os: [ macos-latest, ubuntu-latest, windows-2019 ]
33+
os: [ macos-latest, ubuntu-latest, windows-2022 ]
3434
steps:
35-
- uses: actions/checkout@master
35+
- uses: actions/checkout@v5
3636
- name: Setup dotnet
37-
uses: actions/setup-dotnet@v1
37+
uses: actions/setup-dotnet@v5
3838
with:
3939
dotnet-version: |
4040
2.1.x
@@ -49,13 +49,13 @@ jobs:
4949

5050
sonar-ci:
5151
name: SonarCloud
52-
runs-on: windows-2019
52+
runs-on: windows-2022
5353
steps:
54-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v5
5555
with:
5656
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
5757
- name: Setup dotnet
58-
uses: actions/setup-dotnet@v1
58+
uses: actions/setup-dotnet@v5
5959
with:
6060
dotnet-version: |
6161
2.1.x
@@ -69,14 +69,14 @@ jobs:
6969
working-directory: ./source
7070
run: dotnet clean -c Release && dotnet nuget locals all --clear
7171
- name: Cache SonarCloud packages
72-
uses: actions/cache@v1
72+
uses: actions/cache@v4
7373
with:
7474
path: ~\sonar\cache
7575
key: ${{ runner.os }}-sonar
7676
restore-keys: ${{ runner.os }}-sonar
7777
- name: Cache SonarCloud scanner
7878
id: cache-sonar-scanner
79-
uses: actions/cache@v1
79+
uses: actions/cache@v4
8080
with:
8181
path: .\.sonar\scanner
8282
key: ${{ runner.os }}-sonar-scanner
@@ -103,12 +103,10 @@ jobs:
103103
name: Run Benchmark.Net
104104
runs-on: ubuntu-latest
105105
steps:
106-
- uses: actions/checkout@v2
107-
- uses: actions/setup-dotnet@v1
106+
- uses: actions/checkout@v5
107+
- uses: actions/setup-dotnet@v5
108108
with:
109109
dotnet-version: |
110-
2.1.x
111-
3.1.x
112110
6.0.x
113111
- name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
114112
working-directory: ./source
@@ -137,7 +135,7 @@ jobs:
137135
fail-on-alert: false
138136
alert-comment-cc-users: '@zjklee'
139137
- name: Upload Artifacts
140-
uses: actions/upload-artifact@v2
138+
uses: actions/upload-artifact@v4
141139
with:
142140
name: Benchmark
143141
path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/
@@ -147,6 +145,6 @@ jobs:
147145
runs-on: ubuntu-latest
148146
needs: [build, test, sonar-ci]
149147
steps:
150-
- uses: release-drafter/release-drafter@v5
148+
- uses: release-drafter/release-drafter@v6
151149
env:
152150
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/pull_request.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
jobs:
88
build:
99
name: Build
10-
runs-on: windows-2019
10+
runs-on: windows-2022
1111
steps:
12-
- uses: actions/checkout@master
12+
- uses: actions/checkout@v5
1313
- name: Setup dotnet
14-
uses: actions/setup-dotnet@v1
14+
uses: actions/setup-dotnet@v5
1515
with:
1616
dotnet-version: |
1717
2.1.x
@@ -30,11 +30,11 @@ jobs:
3030
runs-on: ${{ matrix.os }}
3131
strategy:
3232
matrix:
33-
os: [ macos-latest, ubuntu-latest, windows-2019 ]
33+
os: [ macos-latest, ubuntu-latest, windows-2022 ]
3434
steps:
35-
- uses: actions/checkout@master
35+
- uses: actions/checkout@v5
3636
- name: Setup dotnet
37-
uses: actions/setup-dotnet@v1
37+
uses: actions/setup-dotnet@v5
3838
with:
3939
dotnet-version: |
4040
2.1.x
@@ -49,34 +49,34 @@ jobs:
4949

5050
sonar-pr:
5151
name: SonarCloud
52-
runs-on: windows-2019
52+
runs-on: windows-2022
5353
steps:
54-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v5
5555
with:
5656
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
5757
- name: Setup dotnet
58-
uses: actions/setup-dotnet@v1
58+
uses: actions/setup-dotnet@v5
5959
with:
6060
dotnet-version: |
6161
2.1.x
6262
3.1.x
6363
6.0.x
64-
- uses: actions/setup-java@v4
64+
- uses: actions/setup-java@v5
6565
with:
6666
java-version: '21' # The JDK version to make available on the path.
6767
distribution: 'zulu'
6868
- name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
6969
working-directory: ./source
7070
run: dotnet clean -c Release && dotnet nuget locals all --clear
7171
- name: Cache SonarCloud packages
72-
uses: actions/cache@v1
72+
uses: actions/cache@v4
7373
with:
7474
path: ~\sonar\cache
7575
key: ${{ runner.os }}-sonar
7676
restore-keys: ${{ runner.os }}-sonar
7777
- name: Cache SonarCloud scanner
7878
id: cache-sonar-scanner
79-
uses: actions/cache@v1
79+
uses: actions/cache@v4
8080
with:
8181
path: .\.sonar\scanner
8282
key: ${{ runner.os }}-sonar-scanner
@@ -103,8 +103,8 @@ jobs:
103103
name: Run Benchmark.Net
104104
runs-on: ubuntu-latest
105105
steps:
106-
- uses: actions/checkout@v2
107-
- uses: actions/setup-dotnet@v1
106+
- uses: actions/checkout@v5
107+
- uses: actions/setup-dotnet@v5
108108
with:
109109
dotnet-version: |
110110
2.1.x
@@ -138,7 +138,7 @@ jobs:
138138
alert-comment-cc-users: '@zjklee'
139139

140140
- name: Upload Artifacts
141-
uses: actions/upload-artifact@v2
141+
uses: actions/upload-artifact@v4
142142
with:
143143
name: Benchmark
144144
path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ on:
77
jobs:
88
publish:
99
name: Publish
10-
runs-on: windows-2019
10+
runs-on: windows-2022
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v5
1313

1414
- name: Obtain SNK
1515
id: obtain_snk
@@ -19,7 +19,7 @@ jobs:
1919
encodedString: ${{ secrets.SNK_BASE64 }}
2020

2121
- name: Setup dotnet
22-
uses: actions/setup-dotnet@v1
22+
uses: actions/setup-dotnet@v5
2323
with:
2424
dotnet-version: |
2525
2.1.x

‎source/Handlebars.Benchmark/Handlebars.Benchmark.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
<RootNamespace>HandlebarsNet.Benchmark</RootNamespace>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
13-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
12+
<PackageReference Include="BenchmarkDotNet" Version="0.15.4" />
13+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎source/Handlebars.Benchmark/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ static class Program
1010
public static void Main(string[] args)
1111
{
1212
var job = Job.MediumRun
13-
.WithToolchain(CsProjCoreToolchain.NetCoreApp31)
13+
.WithToolchain(CsProjCoreToolchain.NetCoreApp60)
1414
.WithLaunchCount(1);
1515

1616
var manualConfig = DefaultConfig.Instance

‎source/Handlebars.Test/Handlebars.Test.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">$(TargetFrameworks);net452;net46;net461;net472</TargetFrameworks>
4+
<TargetFrameworks>net6</TargetFrameworks>
5+
<TargetFrameworks Condition="$([System.OperatingSystem]::IsWindows())">netcoreapp3.1;$(TargetFrameworks);net452;net46;net461;net472</TargetFrameworks>
66
<ProjectGuid>6BA232A6-8C4D-4C7D-BD75-1844FE9774AF</ProjectGuid>
77
<RootNamespace>HandlebarsDotNet.Test</RootNamespace>
88
<IsPackable>false</IsPackable>
@@ -17,15 +17,15 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="coverlet.collector" Version="1.2.1">
20+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="GitHubActionsTestLogger" Version="1.1.0" />
24+
<PackageReference Include="GitHubActionsTestLogger" Version="1.3.0"/>
2525
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2626
<PackageReference Include="NSubstitute" Version="4.2.2" />
27-
<PackageReference Include="xunit" Version="2.4.1" />
28-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
27+
<PackageReference Include="xunit" Version="2.9.3" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
2929
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
3030
</ItemGroup>
3131

‎source/Handlebars/Handlebars.csproj‎

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

5757
<ItemGroup>
5858
<PackageReference Include="ExpressionShortcuts" Version="1.0.4.39" PrivateAssets="All" />
59-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
59+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
6060
</ItemGroup>
6161

6262
</Project>

0 commit comments

Comments
 (0)