From 8ddecaf4ea9f2ee2b5e221a73eee174f9792caca Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Thu, 7 Dec 2023 13:07:19 +0100 Subject: [PATCH 1/2] Adapting build-and-test workflow to concurrency changes --- .github/workflows/build-and-test.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6e9ecbcd..8b1c32b9 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,8 +11,9 @@ jobs: build-and-test-larger-runners: if: github.ref_name != github.event.repository.default_branch name: Build and Test (larger runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@issue/OSOE-743 with: + parent-job-name: "root-solution-larger-runners" machine-types: "['buildjet-4vcpu-ubuntu-2204']" timeout-minutes: 15 build-configuration: Debug @@ -22,15 +23,17 @@ jobs: build-and-test-standard-runners: if: github.ref_name == github.event.repository.default_branch name: Build and Test (standard runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@issue/OSOE-743 with: + parent-job-name: "root-solution-standard-runners" timeout-minutes: 30 build-configuration: Debug build-and-test-nuget-test: name: Build and Test - NuGetTest solution - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@issue/OSOE-743 with: + parent-job-name: "nuget-solution" build-directory: NuGetTest timeout-minutes: 10 From 83ba0955906a09c62ea6473107ae09a4c81c9820 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Sun, 10 Dec 2023 15:29:14 +0100 Subject: [PATCH 2/2] Restoring workflow branch references to dev --- .github/workflows/build-and-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 8b1c32b9..cd61a8a4 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 (larger runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@issue/OSOE-743 + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: "root-solution-larger-runners" machine-types: "['buildjet-4vcpu-ubuntu-2204']" @@ -23,7 +23,7 @@ jobs: build-and-test-standard-runners: if: github.ref_name == github.event.repository.default_branch name: Build and Test (standard runners) - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@issue/OSOE-743 + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: "root-solution-standard-runners" timeout-minutes: 30 @@ -31,7 +31,7 @@ jobs: build-and-test-nuget-test: name: Build and Test - NuGetTest solution - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@issue/OSOE-743 + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: "nuget-solution" build-directory: NuGetTest