From c4c0af7a66bc44922140d9954f3e390994a27605 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Sat, 7 Dec 2024 20:11:07 +0100 Subject: [PATCH 1/4] Using Title Casing in the Compile workflow's step names --- .github/workflows/compile.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index eb46871bea7..12961c3af50 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -16,13 +16,13 @@ jobs: shell: pwsh runs-on: windows-latest steps: - - name: Clone repository + - name: Clone Repository uses: actions/checkout@v4.1.1 - - name: Restore NuGet packages + - name: Restore NuGet Packages run: nuget restore src/Orchard.sln - - name: Add msbuild to PATH + - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 - name: Compile @@ -31,14 +31,14 @@ jobs: - name: Test run: msbuild Orchard.proj /m /v:minimal /t:Test - - name: Run Orchard setup + - name: Run Orchard Setup with Orchard.exe run: | $commandFile = 'src/Orchard.Web/bin/setup-commands.txt' New-Item -Path $commandFile -ItemType File -Force Set-Content -Path $commandFile -Value 'setup /SiteName:Orchard /AdminUsername:admin /AdminPassword:Password1! /DatabaseProvider:SqlCe /Recipe:Default' & 'src/Orchard.Web/bin/Orchard.exe' @$commandFile - - name: Run code generation + - name: Run Code Generation run: | $commandFile = 'src/Orchard.Web/bin/codegen-commands.txt' New-Item -Path $commandFile -ItemType File -Force @@ -50,17 +50,17 @@ jobs: '@ & 'src/Orchard.Web/bin/Orchard.exe' @$commandFile - - name: Compile with generated projects + - name: Compile Again with Generated Projects run: msbuild Orchard.proj /m /v:minimal /t:Compile /p:TreatWarningsAsErrors=true -WarnAsError /NoWarn:CS2008 compile-node: - name: Compile client-side assets + name: Compile Client-side Assets defaults: run: shell: pwsh runs-on: windows-latest steps: - - name: Clone repository + - name: Clone Repository uses: actions/checkout@v4.1.1 - name: Setup NodeJS @@ -68,7 +68,7 @@ jobs: with: node-version: '7' - - name: Setup NPM packages + - name: Setup NPM Packages working-directory: ./src run: | npm install --loglevel warn @@ -77,7 +77,7 @@ jobs: $gulpVersion = (Get-Content Package.json -Raw | ConvertFrom-Json).devDependencies.gulp Start-Process npm -NoNewWindow -Wait -ArgumentList "install gulp@$gulpVersion -g --loglevel warn" - - name: Rebuild client-side assets + - name: Rebuild Client-side Assets working-directory: ./src run: | gulp rebuild From 2d35e087c49bcde27b69dfe9dd83b82d4702c729 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Sat, 7 Dec 2024 20:11:47 +0100 Subject: [PATCH 2/4] Adding step to run the Setup with SpecFlow --- .github/workflows/compile.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 12961c3af50..079bc824802 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -31,6 +31,11 @@ jobs: - name: Test run: msbuild Orchard.proj /m /v:minimal /t:Test + - name: Test Setup With SpecFlow + run: | + $nunitConsole = (Get-ChildItem -Path 'src/packages' -Recurse -Filter 'nunit-console.exe' | Select-Object -Last 1).FullName + & $nunitConsole 'build/Compile/Orchard.Specs.dll' /xml='build/Orchard.Specs.xml' /run=Orchard.Specs.SetupFeature.RootAndSetupFolderShowsSetupScreenAndFormValuesAreValidated + - name: Run Orchard Setup with Orchard.exe run: | $commandFile = 'src/Orchard.Web/bin/setup-commands.txt' From cf01021e83925442dd2871ac2c565b0687abe2d0 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Sat, 7 Dec 2024 20:14:01 +0100 Subject: [PATCH 3/4] Fixing typo --- .github/workflows/compile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 079bc824802..9ba1a9c85b8 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -31,7 +31,7 @@ jobs: - name: Test run: msbuild Orchard.proj /m /v:minimal /t:Test - - name: Test Setup With SpecFlow + - name: Test Setup with SpecFlow run: | $nunitConsole = (Get-ChildItem -Path 'src/packages' -Recurse -Filter 'nunit-console.exe' | Select-Object -Last 1).FullName & $nunitConsole 'build/Compile/Orchard.Specs.dll' /xml='build/Orchard.Specs.xml' /run=Orchard.Specs.SetupFeature.RootAndSetupFolderShowsSetupScreenAndFormValuesAreValidated From 8f76bbd91d5071bc4a3d88f8a0731e4c982aac4f Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Sat, 7 Dec 2024 20:14:58 +0100 Subject: [PATCH 4/4] Fixing that upgrading Newtonsoft.Json to 13.x broke the SpecFlow test execution app --- src/Orchard.Specs/Hosting/Orchard.Web/Web.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config index 593d2ac20f5..0c84ea8c46e 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config @@ -151,7 +151,7 @@ - +