From 94e0a5e28f9b7702e9334cebf98cd1908b74e4d2 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Fri, 6 Jun 2025 21:52:06 +1000 Subject: [PATCH 1/6] #48 add framework reference. --- .../Apache.ShenYu.AspNetCore.csproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/Apache.ShenYu.AspNetCore/Apache.ShenYu.AspNetCore.csproj b/client/Apache.ShenYu.AspNetCore/Apache.ShenYu.AspNetCore.csproj index 07cc4ba..264fac0 100644 --- a/client/Apache.ShenYu.AspNetCore/Apache.ShenYu.AspNetCore.csproj +++ b/client/Apache.ShenYu.AspNetCore/Apache.ShenYu.AspNetCore.csproj @@ -15,7 +15,7 @@ - netstandard2.0;net461 + netstandard2.0;net461;net6.0 1.0.0 $(Version) Apache Software Foundation @@ -40,6 +40,10 @@ + + + + From 0c420b6b35c9d7631b207af1a0faf1ec0c65c9bb Mon Sep 17 00:00:00 2001 From: James Thompson Date: Fri, 18 Jul 2025 18:29:12 +1000 Subject: [PATCH 2/6] Update Apache.ShenYu.AspNetCore.csproj --- client/Apache.ShenYu.AspNetCore/Apache.ShenYu.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/Apache.ShenYu.AspNetCore/Apache.ShenYu.AspNetCore.csproj b/client/Apache.ShenYu.AspNetCore/Apache.ShenYu.AspNetCore.csproj index 264fac0..46fc64c 100644 --- a/client/Apache.ShenYu.AspNetCore/Apache.ShenYu.AspNetCore.csproj +++ b/client/Apache.ShenYu.AspNetCore/Apache.ShenYu.AspNetCore.csproj @@ -39,7 +39,7 @@ - + From 95d6efb62ac16dd057f8b4d5916d17aee0830565 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Fri, 18 Jul 2025 19:15:16 +1000 Subject: [PATCH 3/6] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20d60f9..dbf9081 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: dotnet: [6.0.201] - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-22.04, macos-latest, windows-latest] include: - dotnet: 5.0.406 os: ubuntu-latest From 2b90974b9f84aaf76f67b3cda9004bfa755f7db4 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Fri, 18 Jul 2025 21:20:02 +1000 Subject: [PATCH 4/6] More build fixes --- .github/workflows/code-coverage.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/integration-test.yml | 2 +- client/Apache.ShenYu.Client/Apache.ShenYu.Client.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index a2377e1..ce12015 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -23,7 +23,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a6a8d57..d7ab843 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -24,7 +24,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index d66f2dc..ecd35ad 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -30,7 +30,7 @@ jobs: # - zookeeper # - consul # - nacos - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: diff --git a/client/Apache.ShenYu.Client/Apache.ShenYu.Client.csproj b/client/Apache.ShenYu.Client/Apache.ShenYu.Client.csproj index dce303e..467446e 100644 --- a/client/Apache.ShenYu.Client/Apache.ShenYu.Client.csproj +++ b/client/Apache.ShenYu.Client/Apache.ShenYu.Client.csproj @@ -46,7 +46,7 @@ - + From 8fbe06e38377046ed302c97dcad5a567c7e79fc1 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Mon, 21 Jul 2025 00:01:28 +1000 Subject: [PATCH 5/6] more cicd work --- .github/workflows/ci.yml | 10 +++------- .github/workflows/code-coverage.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/integration-test.yml | 6 +++--- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbf9081..e358e3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,26 +25,22 @@ jobs: build: strategy: matrix: - dotnet: [6.0.201] os: [ubuntu-22.04, macos-latest, windows-latest] - include: - - dotnet: 5.0.406 - os: ubuntu-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' diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index ce12015..061b9c8 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -25,15 +25,15 @@ jobs: build: 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: 9.0.302 - name: Unit Test with dotnet run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d7ab843..27c7ee7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4.2.2 with: submodules: true @@ -41,9 +41,9 @@ jobs: 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 diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index ecd35ad..92ebc5a 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -32,7 +32,7 @@ jobs: # - nacos runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4.2.2 with: submodules: true @@ -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' From 8cf2b89ed280569384334e7bff1cedf026647c57 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Tue, 22 Jul 2025 17:37:15 +1000 Subject: [PATCH 6/6] docker compose tweak --- .github/workflows/code-coverage.yml | 4 +++- .github/workflows/integration-test.yml | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 061b9c8..61fd58b 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -33,7 +33,9 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v4.3.1 with: - dotnet-version: 9.0.302 + dotnet-version: | + 5.0.406 + 9.0.302 - name: Unit Test with dotnet run: | diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 92ebc5a..b13c45e 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -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