From f49a94dc3ff48c0e4a981527b28ee0e68c2e86c9 Mon Sep 17 00:00:00 2001 From: Matthias Vill Date: Fri, 17 Oct 2025 11:35:21 +0200 Subject: [PATCH] Fix GitHub-workflows --- .github/workflows/ci.yml | 32 +++++++++---------- .github/workflows/pull_request.yml | 30 ++++++++--------- .github/workflows/release.yml | 6 ++-- .../Handlebars.Benchmark.csproj | 6 ++-- source/Handlebars.Benchmark/Program.cs | 2 +- source/Handlebars.Test/Handlebars.Test.csproj | 12 +++---- source/Handlebars/Handlebars.csproj | 2 +- 7 files changed, 44 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba54d7eb..0d10623c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,11 +7,11 @@ on: jobs: build: name: Build - runs-on: windows-2019 + runs-on: windows-2022 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 2.1.x @@ -30,11 +30,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ macos-latest, ubuntu-latest, windows-2019 ] + os: [ macos-latest, ubuntu-latest, windows-2022 ] steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 2.1.x @@ -49,13 +49,13 @@ jobs: sonar-ci: name: SonarCloud - runs-on: windows-2019 + runs-on: windows-2022 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 2.1.x @@ -69,14 +69,14 @@ jobs: working-directory: ./source run: dotnet clean -c Release && dotnet nuget locals all --clear - name: Cache SonarCloud packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~\sonar\cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache SonarCloud scanner id: cache-sonar-scanner - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: .\.sonar\scanner key: ${{ runner.os }}-sonar-scanner @@ -103,12 +103,10 @@ jobs: name: Run Benchmark.Net runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 + - uses: actions/checkout@v5 + - uses: actions/setup-dotnet@v5 with: dotnet-version: | - 2.1.x - 3.1.x 6.0.x - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155 working-directory: ./source @@ -137,7 +135,7 @@ jobs: fail-on-alert: false alert-comment-cc-users: '@zjklee' - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Benchmark path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/ @@ -147,6 +145,6 @@ jobs: runs-on: ubuntu-latest needs: [build, test, sonar-ci] steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 25301f4b..a8922dec 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,11 +7,11 @@ on: jobs: build: name: Build - runs-on: windows-2019 + runs-on: windows-2022 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 2.1.x @@ -30,11 +30,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ macos-latest, ubuntu-latest, windows-2019 ] + os: [ macos-latest, ubuntu-latest, windows-2022 ] steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 2.1.x @@ -49,19 +49,19 @@ jobs: sonar-pr: name: SonarCloud - runs-on: windows-2019 + runs-on: windows-2022 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 2.1.x 3.1.x 6.0.x - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: java-version: '21' # The JDK version to make available on the path. distribution: 'zulu' @@ -69,14 +69,14 @@ jobs: working-directory: ./source run: dotnet clean -c Release && dotnet nuget locals all --clear - name: Cache SonarCloud packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~\sonar\cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache SonarCloud scanner id: cache-sonar-scanner - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: .\.sonar\scanner key: ${{ runner.os }}-sonar-scanner @@ -103,8 +103,8 @@ jobs: name: Run Benchmark.Net runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 + - uses: actions/checkout@v5 + - uses: actions/setup-dotnet@v5 with: dotnet-version: | 2.1.x @@ -138,7 +138,7 @@ jobs: alert-comment-cc-users: '@zjklee' - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Benchmark path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 338ea23b..1599474a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,9 +7,9 @@ on: jobs: publish: name: Publish - runs-on: windows-2019 + runs-on: windows-2022 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 - name: Obtain SNK id: obtain_snk @@ -19,7 +19,7 @@ jobs: encodedString: ${{ secrets.SNK_BASE64 }} - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 2.1.x diff --git a/source/Handlebars.Benchmark/Handlebars.Benchmark.csproj b/source/Handlebars.Benchmark/Handlebars.Benchmark.csproj index 1174d8a2..f3e90d43 100644 --- a/source/Handlebars.Benchmark/Handlebars.Benchmark.csproj +++ b/source/Handlebars.Benchmark/Handlebars.Benchmark.csproj @@ -2,15 +2,15 @@ Exe - netcoreapp3.1 + net6.0 false false HandlebarsNet.Benchmark - - + + diff --git a/source/Handlebars.Benchmark/Program.cs b/source/Handlebars.Benchmark/Program.cs index 87715600..98087ef7 100644 --- a/source/Handlebars.Benchmark/Program.cs +++ b/source/Handlebars.Benchmark/Program.cs @@ -10,7 +10,7 @@ static class Program public static void Main(string[] args) { var job = Job.MediumRun - .WithToolchain(CsProjCoreToolchain.NetCoreApp31) + .WithToolchain(CsProjCoreToolchain.NetCoreApp60) .WithLaunchCount(1); var manualConfig = DefaultConfig.Instance diff --git a/source/Handlebars.Test/Handlebars.Test.csproj b/source/Handlebars.Test/Handlebars.Test.csproj index 7205360e..26e3c951 100644 --- a/source/Handlebars.Test/Handlebars.Test.csproj +++ b/source/Handlebars.Test/Handlebars.Test.csproj @@ -1,8 +1,8 @@  - netcoreapp3.1;net6 - $(TargetFrameworks);net452;net46;net461;net472 + net6 + netcoreapp3.1;$(TargetFrameworks);net452;net46;net461;net472 6BA232A6-8C4D-4C7D-BD75-1844FE9774AF HandlebarsDotNet.Test false @@ -17,15 +17,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + diff --git a/source/Handlebars/Handlebars.csproj b/source/Handlebars/Handlebars.csproj index df5c44d4..0ad997b1 100644 --- a/source/Handlebars/Handlebars.csproj +++ b/source/Handlebars/Handlebars.csproj @@ -56,7 +56,7 @@ - +