diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index f698b6f5f..97e6a4856 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -13,7 +13,7 @@ on: jobs: remove-run-windows-build-label: - if: github.ref_name != github.event.repository.default_branch && + if: github.ref_name != github.event.repository.default_branch && github.event.label.name == 'run-windows-build' name: Remove Run Windows Build Label runs-on: ubuntu-22.04 @@ -30,11 +30,12 @@ jobs: type: remove build-and-test-larger-runners: - if: github.ref_name != github.event.repository.default_branch && + 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 with: + parent-job-name: "root-solution-larger-runners" machine-types: "['gitrunners-windows-2022-x64-8vcpu']" timeout-minutes: 30 set-up-sql-server: "true" @@ -52,6 +53,7 @@ jobs: 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" machine-types: "['windows-2022']" timeout-minutes: 60 set-up-sql-server: "true" @@ -63,12 +65,13 @@ jobs: test-filter: "FullyQualifiedName!~SecurityScanningTests" build-and-test-nuget-test: - if: github.ref_name == github.event.repository.default_branch || + 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 - NuGetTest solution uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: + parent-job-name: "nuget-solution" machine-types: "['windows-2022']" build-directory: NuGetTest timeout-minutes: 25 @@ -78,7 +81,7 @@ jobs: test-filter: "FullyQualifiedName!~SecurityScanningTests" powershell-static-code-analysis: - if: github.ref_name == github.event.repository.default_branch || + if: github.ref_name == github.event.repository.default_branch || github.event_name == 'workflow_dispatch' || github.event.label.name == 'run-windows-build' name: PowerShell Static Code Analysis Windows diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 709a3e3ab..2d7f9a1d1 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -13,6 +13,7 @@ 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" machine-types: "['buildjet-4vcpu-ubuntu-2204']" timeout-minutes: 20 set-up-sql-server: "true" @@ -29,6 +30,7 @@ jobs: name: Build and Test - 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" timeout-minutes: 40 set-up-sql-server: "true" set-up-azurite: "true" @@ -39,6 +41,7 @@ jobs: name: Build and Test - NuGetTest solution uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev with: + parent-job-name: "nuget-solution" build-directory: NuGetTest timeout-minutes: 15 blame-hang-timeout: "5m" diff --git a/tools/Lombiq.Analyzers.PowerShell b/tools/Lombiq.Analyzers.PowerShell index 86f288765..2d83bfe82 160000 --- a/tools/Lombiq.Analyzers.PowerShell +++ b/tools/Lombiq.Analyzers.PowerShell @@ -1 +1 @@ -Subproject commit 86f288765076bfd1775d8440ba4506fc2bed0d81 +Subproject commit 2d83bfe82451f664059a1bad252deefe8c14a31e diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index 9ed9eea88..3f25d64a6 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit 9ed9eea88eed608db26ec1edfbe3eb6670c975d5 +Subproject commit 3f25d64a6b29383554bb90e304a119ed25ba90b8