From ab3abd051c56719eb5b794f4c57eccecb021bb61 Mon Sep 17 00:00:00 2001 From: Ali Yousefi Date: Fri, 12 Jan 2024 19:50:05 +0330 Subject: [PATCH 1/2] fix format action --- .github/workflows/dotnet-format-action.yml | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/dotnet-format-action.yml b/.github/workflows/dotnet-format-action.yml index 8f71901..c75a5f8 100644 --- a/.github/workflows/dotnet-format-action.yml +++ b/.github/workflows/dotnet-format-action.yml @@ -16,6 +16,24 @@ jobs: 6.0.x 7.0.x 8.0.x + - name: Clone and run Authentication + run: | + git clone https://github.com/EasyMicroservices/Authentications-Microservice.git + cd Authentications-Microservice + dotnet run --project src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/EasyMicroservices.AuthenticationsMicroservice.WebApi.csproj & + AUTH_PID=$! + echo "Started Authentication Service with PID $AUTH_PID" + cd .. + shell: bash + - name: Clone and run WhiteLabel + run: | + git clone https://github.com/EasyMicroservices/WhiteLabels-Microservice.git + cd WhiteLabels-Microservice + dotnet run --project src/CSharp/EasyMicroservices.WhiteLabelsMicroservice.WebApi/EasyMicroservices.WhiteLabelsMicroservice.WebApi.csproj & + WHITELABEL_PID=$! + echo "Started WhiteLabel Service with PID $WHITELABEL_PID" + cd .. + shell: bash - name: Run dotnet format id: format uses: jfversluis/dotnet-format@v1.0.5 @@ -36,3 +54,10 @@ jobs: ref: ${{ github.head_ref }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Cleanup + if: always() + run: echo "Shutting down Authentication Service with PID $AUTH_PID" + kill $AUTH_PID echo "Authentication Service shutdown failed" + echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID" + kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed" \ No newline at end of file From a0cdcf31fc96c70ba59722046a4400cbdf6d0629 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 12 Jan 2024 16:21:37 +0000 Subject: [PATCH 2/2] chore: Automated dotnet-format update --- Authentications-Microservice | 1 + WhiteLabels-Microservice | 1 + .../EasyMicroservices.IdentityMicroservice.WebApi/Program.cs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 160000 Authentications-Microservice create mode 160000 WhiteLabels-Microservice diff --git a/Authentications-Microservice b/Authentications-Microservice new file mode 160000 index 0000000..1a7aba1 --- /dev/null +++ b/Authentications-Microservice @@ -0,0 +1 @@ +Subproject commit 1a7aba1419e2af9d1b806cdc7e1bc7799af6ef74 diff --git a/WhiteLabels-Microservice b/WhiteLabels-Microservice new file mode 160000 index 0000000..062fbbd --- /dev/null +++ b/WhiteLabels-Microservice @@ -0,0 +1 @@ +Subproject commit 062fbbd47bf638b25e263491a71c617175b2624c diff --git a/src/CSharp/EasyMicroservices.IdentityMicroservice.WebApi/Program.cs b/src/CSharp/EasyMicroservices.IdentityMicroservice.WebApi/Program.cs index db1d6c9..60d4cf6 100644 --- a/src/CSharp/EasyMicroservices.IdentityMicroservice.WebApi/Program.cs +++ b/src/CSharp/EasyMicroservices.IdentityMicroservice.WebApi/Program.cs @@ -18,7 +18,7 @@ public static async Task Main(string[] args) var build = await app.BuildWithUseCors((options) => { AddCors(options, - "adahmsay.ir", + "adahmsay.ir", "appgenadmin.adahmsay.ir", "contractgenerator.ir", "appgenadmin.contractgenerator.ir",