Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,22 @@ jobs:
build:
strategy:
matrix:
dotnet: [6.0.201]
os: [ubuntu-latest, macos-latest, windows-latest]
include:
- dotnet: 5.0.406
os: ubuntu-latest
os: [ubuntu-22.04, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Support longpaths
if: ${{ matrix.os == 'windows-latest'}}
run: git config --system core.longpaths true
- uses: actions/checkout@v2
- uses: actions/checkout@v4.2.2
with:
submodules: true
- name: Set Skip Env Var
uses: ./.github/actions/skip-ci

- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2.1.0
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: ${{ matrix.dotnet }}
dotnet-version: 9.0.302

- name: Build with dotnet
if: env.SKIP_CI != 'true'
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,19 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4.2.2
with:
submodules: true
- name: Set Skip Env Var
uses: ./.github/actions/skip-ci
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2.1.0
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: 5.0.406
dotnet-version: |
5.0.406
9.0.302

- name: Unit Test with dotnet
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

strategy:
fail-fast: false
Expand All @@ -33,17 +33,17 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4.2.2
with:
submodules: true

- name: Set Skip Env Var
uses: ./.github/actions/skip-ci

- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2.1.0
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: 6.0.201
dotnet-version: 9.0.302

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
# - zookeeper
# - consul
# - nacos
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4.2.2
with:
submodules: true

Expand All @@ -41,9 +41,9 @@ jobs:

- name: Setup .NET Core SDK
if: env.SKIP_CI != 'true'
uses: actions/setup-dotnet@v2.1.0
uses: actions/setup-dotnet@v4.3.1
with:
dotnet-version: 5.0.406
dotnet-version: 9.0.302

- name: Build with dotnet
if: env.SKIP_CI != 'true'
Expand All @@ -55,9 +55,12 @@ jobs:
cd ./examples/AspNetCoreExample/
docker build -t dotnet-example .

- name: Start Docker Compose
- name: Run docker compose
if: env.SKIP_CI != 'true'
run: docker-compose -f ./build/docker-compose-${{ matrix.case }}.yml up -d
uses: hoverkraft-tech/compose-action@v2.0.1
with:
compose-file: ./build/docker-compose-${{ matrix.case }}.yml
up-flags: -d

# replace with check health step
- name: Run tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net6.0</TargetFrameworks>
<Version>1.0.0</Version>
<FileVersion>$(Version)</FileVersion>
<Company>Apache Software Foundation</Company>
Expand All @@ -39,7 +39,11 @@
<ProjectReference Include="..\Apache.ShenYu.Client\Apache.ShenYu.Client.csproj" />
</ItemGroup>

<ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))">
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion client/Apache.ShenYu.Client/Apache.ShenYu.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="dotnet-etcd" Version="4.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="ZooKeeperNetEx" Version="3.4.12.4" />
Expand Down
Loading