From 69d98b0d70540805e161ad8a7bbd35ed722e87f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 7 Jul 2024 17:58:30 +0200 Subject: [PATCH 1/4] Removing build-create-binary-log and dotnet-test-process-timeout --- .github/workflows/build-and-test-windows.yml | 5 ----- .github/workflows/build-and-test.yml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index e24cd4c3c..d6b4052fa 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -44,8 +44,6 @@ jobs: set-up-sql-server: "true" set-up-azurite: "true" ui-test-parallelism: 0 - 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" @@ -61,8 +59,6 @@ jobs: timeout-minutes: 70 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" @@ -79,7 +75,6 @@ jobs: 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" diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 215dc7021..b564786a8 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,8 +19,6 @@ jobs: set-up-sql-server: "true" set-up-azurite: "true" ui-test-parallelism: 0 - build-create-binary-log: "true" - dotnet-test-process-timeout: 600000 build-enable-nuget-caching: "true" build-enable-npm-caching: "true" @@ -34,8 +32,6 @@ jobs: timeout-minutes: 50 set-up-sql-server: "true" set-up-azurite: "true" - build-create-binary-log: "true" - dotnet-test-process-timeout: 780000 build-and-test-nuget-test: name: Build and Test - NuGetTest solution @@ -44,7 +40,6 @@ jobs: parent-job-name: nuget-solution build-directory: NuGetTest timeout-minutes: 20 - dotnet-test-process-timeout: 480000 spelling: name: Spelling From f87384ea7cfc8c71d39554789c71a36166d9d3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Tue, 9 Jul 2024 22:28:12 +0200 Subject: [PATCH 2/4] Increasing timeout --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index b564786a8..152584b7e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -15,7 +15,7 @@ jobs: with: parent-job-name: "root-solution-larger-runners" machine-types: "['warp-ubuntu-2204-x64-4x']" - timeout-minutes: 30 + timeout-minutes: 60 set-up-sql-server: "true" set-up-azurite: "true" ui-test-parallelism: 0 From ddd6c1b83eda6945e5c5e946f9424c6f41050304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Tue, 9 Jul 2024 22:47:24 +0200 Subject: [PATCH 3/4] Updating submodules --- src/Libraries/Lombiq.OrchardCoreApiClient | 2 +- src/Modules/Lombiq.ChartJs | 2 +- src/Modules/Lombiq.ContentEditors | 2 +- src/Modules/Lombiq.HelpfulExtensions | 2 +- src/Themes/Lombiq.Hosting.MediaTheme | 2 +- test/Lombiq.UITestingToolbox | 2 +- tools/Lombiq.Analyzers | 2 +- tools/Lombiq.Analyzers.PowerShell | 2 +- tools/Lombiq.GitHub.Actions | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Libraries/Lombiq.OrchardCoreApiClient b/src/Libraries/Lombiq.OrchardCoreApiClient index 66b6f1df2..0857fa959 160000 --- a/src/Libraries/Lombiq.OrchardCoreApiClient +++ b/src/Libraries/Lombiq.OrchardCoreApiClient @@ -1 +1 @@ -Subproject commit 66b6f1df266f17830b849537c186f82ebf49da2b +Subproject commit 0857fa959238d2f8fdda8e4e993d473b97cb854d diff --git a/src/Modules/Lombiq.ChartJs b/src/Modules/Lombiq.ChartJs index 4adcb4d0a..89768b748 160000 --- a/src/Modules/Lombiq.ChartJs +++ b/src/Modules/Lombiq.ChartJs @@ -1 +1 @@ -Subproject commit 4adcb4d0a2ff658ed6428d86ac958f9e4e17dd70 +Subproject commit 89768b74855532c2dfa122862a550b4ed964b8f1 diff --git a/src/Modules/Lombiq.ContentEditors b/src/Modules/Lombiq.ContentEditors index 738b4b9f2..447bc95e8 160000 --- a/src/Modules/Lombiq.ContentEditors +++ b/src/Modules/Lombiq.ContentEditors @@ -1 +1 @@ -Subproject commit 738b4b9f26b526a0ff6e7f9de4b26b233cb4741c +Subproject commit 447bc95e85ef83b262dec85e65ee99529ee2dca0 diff --git a/src/Modules/Lombiq.HelpfulExtensions b/src/Modules/Lombiq.HelpfulExtensions index 1c6e4a8b6..975eea127 160000 --- a/src/Modules/Lombiq.HelpfulExtensions +++ b/src/Modules/Lombiq.HelpfulExtensions @@ -1 +1 @@ -Subproject commit 1c6e4a8b623d77be70f525a9fe5b081b7b4248c5 +Subproject commit 975eea127e33516206838bf591b61d91d3b60867 diff --git a/src/Themes/Lombiq.Hosting.MediaTheme b/src/Themes/Lombiq.Hosting.MediaTheme index 4443fe433..844864e92 160000 --- a/src/Themes/Lombiq.Hosting.MediaTheme +++ b/src/Themes/Lombiq.Hosting.MediaTheme @@ -1 +1 @@ -Subproject commit 4443fe4335c9911c2c7fe4803e3e030661f037b0 +Subproject commit 844864e9272687c8888fe85adb5f8cdae2c633a2 diff --git a/test/Lombiq.UITestingToolbox b/test/Lombiq.UITestingToolbox index 5ff24a620..9c940e20c 160000 --- a/test/Lombiq.UITestingToolbox +++ b/test/Lombiq.UITestingToolbox @@ -1 +1 @@ -Subproject commit 5ff24a620fa6e56876b1114c7e522633a6e58df5 +Subproject commit 9c940e20c7169a5e6350444faf05a2e1b4cb6df2 diff --git a/tools/Lombiq.Analyzers b/tools/Lombiq.Analyzers index 6ddf7b843..550648062 160000 --- a/tools/Lombiq.Analyzers +++ b/tools/Lombiq.Analyzers @@ -1 +1 @@ -Subproject commit 6ddf7b8433a1a60d1228a59075200bd50d7499d7 +Subproject commit 5506480624315c9db6eccefe0a4097a81c357494 diff --git a/tools/Lombiq.Analyzers.PowerShell b/tools/Lombiq.Analyzers.PowerShell index f299b9713..55749e6a1 160000 --- a/tools/Lombiq.Analyzers.PowerShell +++ b/tools/Lombiq.Analyzers.PowerShell @@ -1 +1 @@ -Subproject commit f299b97130ecbdbaebe75ce4c7e37d74a6d933cf +Subproject commit 55749e6a16b73684ab11ed0ccac58a0687c88548 diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index 2e5f38aae..813f2ed05 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit 2e5f38aae61cd562e7545637d81a7254c531d2fa +Subproject commit 813f2ed0586dce428250d502377e34c17884f2b7 From 4340f802b9c2c26cbd074d3eb866fb830537ded2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Tue, 9 Jul 2024 22:51:03 +0200 Subject: [PATCH 4/4] Fix spelling --- .github/workflows/build-and-test-windows.yml | 4 ++-- .github/workflows/build-and-test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index c611c0e89..598c10b9f 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -57,8 +57,8 @@ jobs: # 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" + set-up-sql-server: 'true' + set-up-azurite: 'true' # 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 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 63fefa28d..93a1e0eaa 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -30,8 +30,8 @@ jobs: # Since dev builds are not awaited by anyone, they can run on the slower free runners. parent-job-name: root-solution-standard-runners timeout-minutes: 50 - set-up-sql-server: "true" - set-up-azurite: "true" + set-up-sql-server: 'true' + set-up-azurite: 'true' build-and-test-nuget-test: name: Build and Test - NuGetTest solution