diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index e24cd4c3c..7fcfa8fd4 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -21,14 +21,14 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 2 steps: - - name: Remove Run Windows Build Label - uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev - with: - # The token is necessary to be able to remove the label even if the workflow is triggered by a pull request - # coming from a fork. - token: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} - labels: run-windows-build - type: remove + - name: Remove Run Windows Build Label + uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev + with: + # The token is necessary to be able to remove the label even if the workflow is triggered by a pull request + # coming from a fork. + token: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} + labels: run-windows-build + type: remove build-and-test-larger-runners: if: github.ref_name != github.event.repository.default_branch && @@ -38,34 +38,34 @@ jobs: name: Build and Test Windows - root solution (larger runners) uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: - parent-job-name: "root-solution-larger-runners" + parent-job-name: root-solution-larger-runners machine-types: "['windows-2022-8core']" timeout-minutes: 50 - set-up-sql-server: "true" - set-up-azurite: "true" + set-up-sql-server: 'true' + set-up-azurite: 'true' ui-test-parallelism: 0 - build-create-binary-log: "true" + build-create-binary-log: 'true' dotnet-test-process-timeout: 720000 # Running ZAP for security scans in Docker under GHA Windows runners won't work since such virtualization is not # supported by GHA. - test-filter: "FullyQualifiedName!~SecurityScanningTests" + test-filter: FullyQualifiedName!~SecurityScanningTests build-and-test-standard-runners: if: github.ref_name == github.event.repository.default_branch name: Build and Test Windows - root solution (standard runners) uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: - parent-job-name: "root-solution-standard-runners" + parent-job-name: root-solution-standard-runners # Since dev builds are not awaited by anyone, they can run on the slower free runners. machine-types: "['windows-2022']" timeout-minutes: 70 - set-up-sql-server: "true" - set-up-azurite: "true" - build-create-binary-log: "true" + set-up-sql-server: 'true' + set-up-azurite: 'true' + build-create-binary-log: 'true' dotnet-test-process-timeout: 840000 # Running ZAP for security scans in Docker under GHA Windows runners won't work since such virtualization is not # supported by GHA. - test-filter: "FullyQualifiedName!~SecurityScanningTests" + test-filter: FullyQualifiedName!~SecurityScanningTests build-and-test-nuget-test: if: github.ref_name == github.event.repository.default_branch || @@ -75,14 +75,14 @@ jobs: name: Build and Test Windows - NuGetTest solution uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: - parent-job-name: "nuget-solution" + parent-job-name: nuget-solution machine-types: "['windows-2022']" build-directory: NuGetTest timeout-minutes: 30 dotnet-test-process-timeout: 540000 # Running ZAP for security scans in Docker under GHA Windows runners won't work since such virtualization is not # supported by GHA. - test-filter: "FullyQualifiedName!~SecurityScanningTests" + test-filter: FullyQualifiedName!~SecurityScanningTests powershell-static-code-analysis: if: github.ref_name == github.event.repository.default_branch || @@ -93,7 +93,7 @@ jobs: uses: Lombiq/PowerShell-Analyzers/.github/workflows/static-code-analysis.yml@dev with: machine-types: "['windows-2022']" - run-windows-powershell: "false" + run-windows-powershell: 'false' post-pull-request-checks-automation: name: Post Pull Request Checks Automation @@ -112,11 +112,11 @@ jobs: timeout-minutes: 2 needs: [build-and-test-larger-runners, build-and-test-nuget-test, powershell-static-code-analysis] steps: - - name: Remove Windows Build Warning Label - uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev - with: - # The token is necessary to be able to remove the label even if the workflow is triggered by a pull request - # coming from a fork. - token: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} - labels: requires-windows-build - type: remove + - name: Remove Windows Build Warning Label + uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev + with: + # The token is necessary to be able to remove the label even if the workflow is triggered by a pull request + # coming from a fork. + token: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} + labels: requires-windows-build + type: remove diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 215dc7021..ffb9bc952 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -13,16 +13,16 @@ jobs: name: Build and Test - root solution (larger runners) uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: - parent-job-name: "root-solution-larger-runners" + parent-job-name: root-solution-larger-runners machine-types: "['warp-ubuntu-2204-x64-4x']" timeout-minutes: 30 - set-up-sql-server: "true" - set-up-azurite: "true" + set-up-sql-server: 'true' + set-up-azurite: 'true' ui-test-parallelism: 0 - build-create-binary-log: "true" + build-create-binary-log: 'true' dotnet-test-process-timeout: 600000 - build-enable-nuget-caching: "true" - build-enable-npm-caching: "true" + build-enable-nuget-caching: 'true' + build-enable-npm-caching: 'true' build-and-test-standard-runners: if: github.ref_name == github.event.repository.default_branch @@ -30,11 +30,11 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: # Since dev builds are not awaited by anyone, they can run on the slower free runners. - parent-job-name: "root-solution-standard-runners" + parent-job-name: root-solution-standard-runners timeout-minutes: 50 - set-up-sql-server: "true" - set-up-azurite: "true" - build-create-binary-log: "true" + set-up-sql-server: 'true' + set-up-azurite: 'true' + build-create-binary-log: 'true' dotnet-test-process-timeout: 780000 build-and-test-nuget-test: @@ -94,11 +94,11 @@ jobs: timeout-minutes: 2 needs: [build-and-test-larger-runners, build-and-test-nuget-test, powershell-static-code-analysis] steps: - - name: Add Windows Build Warning Label - uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev - with: - # The token is necessary to be able to add the label even if the workflow is triggered by a pull request coming - # from a fork. - token: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} - labels: requires-windows-build - type: add + - name: Add Windows Build Warning Label + uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev + with: + # The token is necessary to be able to add the label even if the workflow is triggered by a pull request coming + # from a fork. + token: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} + labels: requires-windows-build + type: add diff --git a/.github/workflows/create-jira-issues-for-community-activities.yml b/.github/workflows/create-jira-issues-for-community-activities.yml index b8b23e77b..93b1be90d 100644 --- a/.github/workflows/create-jira-issues-for-community-activities.yml +++ b/.github/workflows/create-jira-issues-for-community-activities.yml @@ -21,4 +21,4 @@ jobs: ISSUE_JIRA_ISSUE_DESCRIPTION: ${{ secrets.DEFAULT_ISSUE_JIRA_ISSUE_DESCRIPTION }} PULL_REQUEST_JIRA_ISSUE_DESCRIPTION: ${{ secrets.DEFAULT_PULL_REQUEST_JIRA_ISSUE_DESCRIPTION }} with: - suffix-issue-titles: "false" + suffix-issue-titles: 'false' diff --git a/Publish-VNext.ps1 b/Publish-VNext.ps1 index 8e3ef4435..f8482ce95 100644 --- a/Publish-VNext.ps1 +++ b/Publish-VNext.ps1 @@ -77,7 +77,7 @@ try { if ($releaseTags[0] -match '^v\d+\.\d+\.\d+') { - $version = [Version]$matches[0].Substring(1) + $version = [Version]$Matches[0].Substring(1) $major = $version.Major $minor = $version.Minor $patch = $version.Build @@ -168,7 +168,7 @@ finally { if ($projectName -like '*.csproj*') { - .\Update-References.ps1 -ProjectToFind $projectName -NewVersion $NewVersion + .\Update-References.ps1 -ProjectToFind $projectName -NewVersion $newVersion } } } diff --git a/src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.recipe.json b/src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.recipe.json index eefcc2b13..c85849b57 100644 --- a/src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.recipe.json +++ b/src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.recipe.json @@ -24,9 +24,7 @@ "Lombiq.HelpfulExtensions.CodeGeneration", "Lombiq.HelpfulExtensions.ContentTypes", "Lombiq.HelpfulExtensions.Flows", - // Shape Tracing messes with the title and thus can break other things, see: - // https://github.com/Lombiq/Helpful-Extensions/issues/120. - // "Lombiq.HelpfulExtensions.ShapeTracing", + "Lombiq.HelpfulExtensions.ShapeTracing", "Lombiq.HelpfulExtensions.Widgets", "Lombiq.HelpfulLibraries.Samples", "Lombiq.Hosting.BuildVersionDisplay", diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs index b8ebb9398..082870a85 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs @@ -1,5 +1,6 @@ using Lombiq.Tests.UI.Constants; using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Services; using OpenQA.Selenium; using SixLabors.ImageSharp; using System.Threading.Tasks; @@ -29,5 +30,6 @@ public Task VerifyHomePageAndLayout() => context => context.AssertVisualVerificationApprovedOnAllResolutionsWithPlatformSuffix( _visualVerificationSizes, _ => By.TagName("body"), - pixelErrorPercentageThreshold: 0.005)); + pixelErrorPercentageThreshold: 0.005), + browser: Browser.Firefox); }