diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index 53dfe6cb3..949c8c750 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@issue/OSOE-481 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.ymlissue/OSOE-481 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@issue/OSOE-481 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 94d264afe..81cf5b55a 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@issue/OSOE-481 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@issue/OSOE-481 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@issue/OSOE-481 with: + parent-job-name: "nuget-solution" build-directory: NuGetTest timeout-minutes: 15 blame-hang-timeout: "5m" diff --git a/NuGetTest/src/Themes/Lombiq.OSOCE.NuGet.TestTheme/package-lock.json b/NuGetTest/src/Themes/Lombiq.OSOCE.NuGet.TestTheme/package-lock.json deleted file mode 100644 index 75a4cc6de..000000000 --- a/NuGetTest/src/Themes/Lombiq.OSOCE.NuGet.TestTheme/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Lombiq.OSOCE.NuGet.TestTheme", - "lockfileVersion": 2, - "requires": true, - "packages": {} -} diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index a5e354a4b..9c5553e8e 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit a5e354a4b9e8d4225031de522c0081349dba366e +Subproject commit 9c5553e8e846eeb50144bc27b62d831bb008ab2c