From 0063c18f7f9636366c71da49c1178fba31e21e68 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Fri, 19 Sep 2025 09:57:27 +0200 Subject: [PATCH] Testing windows-2025 runners on 1.10.x (#8843) * Testing compile workflow on windows-2025 runners * Wording [skip ci] * Compile workflow: Switch shell to cmd where pwsh is not needed --- .github/workflows/compile.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 39cbc41a0..d0636920c 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -13,8 +13,8 @@ jobs: name: Compile .NET solution defaults: run: - shell: pwsh - runs-on: windows-latest + shell: cmd + runs-on: windows-2025 steps: - name: Clone Repository uses: actions/checkout@v4.1.1 @@ -32,11 +32,13 @@ jobs: run: msbuild Orchard.proj /m /v:minimal /t:Test - name: Test Setup with SpecFlow + shell: pwsh 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 + shell: pwsh run: | $commandFile = 'src/Orchard.Web/bin/setup-commands.txt' New-Item -Path $commandFile -ItemType File -Force @@ -44,6 +46,7 @@ jobs: & 'src/Orchard.Web/bin/Orchard.exe' @$commandFile - name: Run Code Generation + shell: pwsh run: | $commandFile = 'src/Orchard.Web/bin/codegen-commands.txt' New-Item -Path $commandFile -ItemType File -Force @@ -62,8 +65,8 @@ jobs: name: Compile Client-side Assets defaults: run: - shell: pwsh - runs-on: windows-latest + shell: cmd + runs-on: windows-2025 steps: - name: Clone Repository uses: actions/checkout@v4.1.1 @@ -75,23 +78,23 @@ jobs: - name: Install Gulp Globally working-directory: ./src + shell: pwsh run: | # Install gulp globally to be able to run the rebuild task, using the same version as in the project. $gulpVersion = (Get-Content Package.json -Raw | ConvertFrom-Json).devDependencies.gulp Start-Process npm -NoNewWindow -Wait -ArgumentList "install gulp@$gulpVersion -g --loglevel warn" - - name: Setup NPM Packages + - name: Install NPM Packages working-directory: ./src - shell: cmd run: npm install --loglevel warn - name: Rebuild Client-side Assets working-directory: ./src - shell: cmd run: gulp rebuild - name: Check Client-side Assets working-directory: ./src + shell: pwsh run: | git add . # To make line ending changes "disappear". $gitStatus = (git status --porcelain)