From 708a464ee93020b3b7e7732b35fffa4046f5d3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 11:29:11 +0100 Subject: [PATCH 01/12] Updating submodule: - Lombiq.GitHub.Actions: revert, fix test dotnet --- tools/Lombiq.GitHub.Actions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index 670d30ab0..ac71f5e41 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit 670d30ab0e6cfff678a9f66cabeb14cc479cf01b +Subproject commit ac71f5e419512606199d5abafedc9c532af6bec2 From 049cc0c103a7fea0c26b5ea3e371fcf85ee6c784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 11:30:36 +0100 Subject: [PATCH 02/12] [no ci] From 51b55d37e5ee83199a7121031efbdf3541a729c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 14:10:26 +0100 Subject: [PATCH 03/12] Adjusting timeouts and branch references Updating submodule: - Lombiq.GitHub.Actions: Adjusting branch references --- .github/workflows/build-and-test-windows.yml | 12 ++++++------ .github/workflows/build-and-test.yml | 12 ++++++------ tools/Lombiq.GitHub.Actions | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index 97e6a4856..0bf5f87c3 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -33,7 +33,7 @@ jobs: if: github.ref_name != github.event.repository.default_branch && (github.event_name == 'workflow_dispatch' || github.event.label.name == 'run-windows-build') name: Build and Test Windows - root solution (larger runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "root-solution-larger-runners" machine-types: "['gitrunners-windows-2022-x64-8vcpu']" @@ -42,7 +42,7 @@ jobs: set-up-azurite: "true" ui-test-parallelism: 0 build-create-binary-log: "true" - blame-hang-timeout: "5m" + dotnet-test-process-timeout: 360000 # 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" @@ -51,7 +51,7 @@ jobs: # Since dev builds are not awaited by anyone, they can run on the slower free 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 + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "root-solution-standard-runners" machine-types: "['windows-2022']" @@ -59,7 +59,7 @@ jobs: set-up-sql-server: "true" set-up-azurite: "true" build-create-binary-log: "true" - blame-hang-timeout: "5m" + 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" @@ -69,13 +69,13 @@ jobs: github.event_name == 'workflow_dispatch' || github.event.label.name == 'run-windows-build' name: Build and Test Windows - NuGetTest solution - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "nuget-solution" machine-types: "['windows-2022']" build-directory: NuGetTest timeout-minutes: 25 - blame-hang-timeout: "5m" + dotnet-test-process-timeout: 360000 # 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 01866e2e2..bed83443b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,7 +11,7 @@ jobs: build-and-test-larger-runners: if: github.ref_name != github.event.repository.default_branch name: Build and Test - root solution (larger runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "root-solution-larger-runners" machine-types: "['buildjet-4vcpu-ubuntu-2204']" @@ -20,7 +20,7 @@ jobs: set-up-azurite: "true" ui-test-parallelism: 0 build-create-binary-log: "true" - blame-hang-timeout: "5m" + dotnet-test-process-timeout: 360000 build-enable-nuget-caching: "true" build-enable-npm-caching: "true" @@ -28,23 +28,23 @@ jobs: # Since dev builds are not awaited by anyone, they can run on the slower free runners. if: github.ref_name == github.event.repository.default_branch name: Build and Test - root solution (standard runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "root-solution-standard-runners" timeout-minutes: 50 set-up-sql-server: "true" set-up-azurite: "true" build-create-binary-log: "true" - blame-hang-timeout: "5m" + dotnet-test-process-timeout: 720000 build-and-test-nuget-test: name: Build and Test - NuGetTest solution - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "nuget-solution" build-directory: NuGetTest timeout-minutes: 15 - blame-hang-timeout: "5m" + dotnet-test-process-timeout: 360000 spelling: name: Spelling diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index ac71f5e41..ea9c2011b 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit ac71f5e419512606199d5abafedc9c532af6bec2 +Subproject commit ea9c2011b0629212f2cee75b00b58747af041c6c From 216120eb88e81d3a4155febdff7da362cbe26290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 14:40:41 +0100 Subject: [PATCH 04/12] Adjusting test process timeout for test --- .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 bed83443b..9b504a2be 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -20,7 +20,7 @@ jobs: set-up-azurite: "true" ui-test-parallelism: 0 build-create-binary-log: "true" - dotnet-test-process-timeout: 360000 + dotnet-test-process-timeout: 36000 build-enable-nuget-caching: "true" build-enable-npm-caching: "true" From 69447f9d287f2fb3c82d51ddb9338194ba51e75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 15:02:17 +0100 Subject: [PATCH 05/12] Updating submodule: - Lombiq.GitHub.Actions: Fixing process name --- tools/Lombiq.GitHub.Actions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index ea9c2011b..c440406a7 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit ea9c2011b0629212f2cee75b00b58747af041c6c +Subproject commit c440406a78d28a6feadb7d2c37dcb3577bcb2851 From a5efa56ad38b8a85a4205931c6641772181d8b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 15:39:59 +0100 Subject: [PATCH 06/12] Updating submodule: - Lombiq.GitHub.Actions: Saving more details --- tools/Lombiq.GitHub.Actions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index c440406a7..fd3365b5e 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit c440406a78d28a6feadb7d2c37dcb3577bcb2851 +Subproject commit fd3365b5ef00872d431db173788648885d6250b9 From 67eef6e06166e3c836bb741a065417bad4666c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 15:45:43 +0100 Subject: [PATCH 07/12] Updating submodule: - Lombiq.GitHub.Actions: Fixing PS analyzer warnings --- tools/Lombiq.GitHub.Actions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index fd3365b5e..ee41ed219 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit fd3365b5ef00872d431db173788648885d6250b9 +Subproject commit ee41ed2193edffa78281f84f316d9f405161d9f1 From 3b7c1e87e6b8ecff6154cc762f5e3865807fbdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 15:50:12 +0100 Subject: [PATCH 08/12] Updating submodule: - Lombiq.GitHub.Actions: Fixing PS analyzer warnings again --- tools/Lombiq.GitHub.Actions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index ee41ed219..35b7a261f 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit ee41ed2193edffa78281f84f316d9f405161d9f1 +Subproject commit 35b7a261fafd1c73cd5b88c086ebd3e834d08831 From d4c57e31949a726151bd05f283bf6a75b8731f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 16:04:43 +0100 Subject: [PATCH 09/12] Testing dotnet test process timeout on standard runners --- .github/workflows/build-and-test-windows.yml | 7 ++++--- .github/workflows/build-and-test.yml | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index 0bf5f87c3..5ca935537 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -36,13 +36,14 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "root-solution-larger-runners" - machine-types: "['gitrunners-windows-2022-x64-8vcpu']" - timeout-minutes: 30 + #machine-types: "['gitrunners-windows-2022-x64-8vcpu']" + machine-types: "['windows-2022']" + timeout-minutes: 60 set-up-sql-server: "true" set-up-azurite: "true" ui-test-parallelism: 0 build-create-binary-log: "true" - dotnet-test-process-timeout: 360000 + 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" diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 9b504a2be..5321b7c9f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,13 +14,13 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "root-solution-larger-runners" - machine-types: "['buildjet-4vcpu-ubuntu-2204']" - timeout-minutes: 20 + #machine-types: "['buildjet-4vcpu-ubuntu-2204']" + timeout-minutes: 50 set-up-sql-server: "true" set-up-azurite: "true" ui-test-parallelism: 0 build-create-binary-log: "true" - dotnet-test-process-timeout: 36000 + dotnet-test-process-timeout: 720000 build-enable-nuget-caching: "true" build-enable-npm-caching: "true" From 95ff37d4a148bd8685a456d08b526a05a2b21568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Sun, 21 Jan 2024 19:27:31 +0100 Subject: [PATCH 10/12] Revert "Testing dotnet test process timeout on standard runners" This reverts commit d4c57e31949a726151bd05f283bf6a75b8731f51. --- .github/workflows/build-and-test-windows.yml | 7 +++---- .github/workflows/build-and-test.yml | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index 5ca935537..0bf5f87c3 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -36,14 +36,13 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "root-solution-larger-runners" - #machine-types: "['gitrunners-windows-2022-x64-8vcpu']" - machine-types: "['windows-2022']" - timeout-minutes: 60 + machine-types: "['gitrunners-windows-2022-x64-8vcpu']" + timeout-minutes: 30 set-up-sql-server: "true" set-up-azurite: "true" ui-test-parallelism: 0 build-create-binary-log: "true" - dotnet-test-process-timeout: 720000 + dotnet-test-process-timeout: 360000 # 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 5321b7c9f..bed83443b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,13 +14,13 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout with: parent-job-name: "root-solution-larger-runners" - #machine-types: "['buildjet-4vcpu-ubuntu-2204']" - timeout-minutes: 50 + machine-types: "['buildjet-4vcpu-ubuntu-2204']" + timeout-minutes: 20 set-up-sql-server: "true" set-up-azurite: "true" ui-test-parallelism: 0 build-create-binary-log: "true" - dotnet-test-process-timeout: 720000 + dotnet-test-process-timeout: 360000 build-enable-nuget-caching: "true" build-enable-npm-caching: "true" From f1876b5f31e187eb336e44b96c91b84f7ddf52f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 25 Jan 2024 22:28:26 +0100 Subject: [PATCH 11/12] restore branch selector --- .github/workflows/build-and-test-windows.yml | 6 +++--- .github/workflows/build-and-test.yml | 6 +++--- tools/Lombiq.GitHub.Actions | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index 0bf5f87c3..e3276c7a5 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -33,7 +33,7 @@ jobs: if: github.ref_name != github.event.repository.default_branch && (github.event_name == 'workflow_dispatch' || github.event.label.name == 'run-windows-build') name: Build and Test Windows - root solution (larger runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: parent-job-name: "root-solution-larger-runners" machine-types: "['gitrunners-windows-2022-x64-8vcpu']" @@ -51,7 +51,7 @@ jobs: # Since dev builds are not awaited by anyone, they can run on the slower free 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@issue/OSOE-464-executing-dotnet-test-with-process-timeout + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: parent-job-name: "root-solution-standard-runners" machine-types: "['windows-2022']" @@ -69,7 +69,7 @@ jobs: github.event_name == 'workflow_dispatch' || github.event.label.name == 'run-windows-build' name: Build and Test Windows - NuGetTest solution - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: parent-job-name: "nuget-solution" machine-types: "['windows-2022']" diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index bed83443b..e245b3927 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,7 +11,7 @@ jobs: build-and-test-larger-runners: if: github.ref_name != github.event.repository.default_branch name: Build and Test - root solution (larger runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: parent-job-name: "root-solution-larger-runners" machine-types: "['buildjet-4vcpu-ubuntu-2204']" @@ -28,7 +28,7 @@ jobs: # Since dev builds are not awaited by anyone, they can run on the slower free runners. if: github.ref_name == github.event.repository.default_branch name: Build and Test - root solution (standard runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: parent-job-name: "root-solution-standard-runners" timeout-minutes: 50 @@ -39,7 +39,7 @@ jobs: build-and-test-nuget-test: name: Build and Test - NuGetTest solution - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-464-executing-dotnet-test-with-process-timeout + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: parent-job-name: "nuget-solution" build-directory: NuGetTest diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index 35b7a261f..becdac4f8 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit 35b7a261fafd1c73cd5b88c086ebd3e834d08831 +Subproject commit becdac4f89396a9d0c3d7a3a2a3fc7ea302be09c From 768bb3799ec96d4ce750897dbbad58cca47d6879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Fri, 26 Jan 2024 21:55:09 +0100 Subject: [PATCH 12/12] submodule --- tools/Lombiq.GitHub.Actions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index becdac4f8..8c4594c6e 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit becdac4f89396a9d0c3d7a3a2a3fc7ea302be09c +Subproject commit 8c4594c6e5003220b86f6913c414e16dd63f15f2