From a3289a2d50a983cab518dca14a6e06ac17511d5f Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Wed, 16 Oct 2024 15:20:47 +0200 Subject: [PATCH 01/10] Upgrading Ubuntu PR builds to 2024.4 (warp-ubuntu-2404-x64-4x) --- .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 1cae5161..ed63550b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,7 +14,7 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: root-solution-larger-runners - machine-types: "['warp-ubuntu-2204-x64-4x']" + machine-types: "['warp-ubuntu-2404-x64-4x']" timeout-minutes: 15 build-configuration: Debug build-enable-nuget-caching: 'true' From 4aa8fba700aabc3d6e50f03fe59a16aa6ebc8d62 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Wed, 16 Oct 2024 19:46:39 +0200 Subject: [PATCH 02/10] Pinning .NET version to 6.0.0 as it's not available on Ubuntu 2404 runners --- .github/workflows/build-and-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ed63550b..501e998d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,6 +19,7 @@ jobs: build-configuration: Debug build-enable-nuget-caching: 'true' build-enable-npm-caching: 'true' + dotnet-version: 6.0.0 build-and-test-standard-runners: if: github.ref_name == github.event.repository.default_branch @@ -28,6 +29,7 @@ jobs: parent-job-name: 'root-solution-standard-runners' timeout-minutes: 30 build-configuration: Debug + dotnet-version: 6.0.0 build-and-test-nuget-test: name: Build and Test - NuGetTest solution @@ -36,6 +38,7 @@ jobs: parent-job-name: 'nuget-solution' build-directory: NuGetTest timeout-minutes: 10 + dotnet-version: 6.0.0 post-pull-request-checks-automation: name: Post Pull Request Checks Automation From 9c44b3e88e14985bfdfaddc6ddede797ceb3a8c4 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Wed, 16 Oct 2024 19:51:09 +0200 Subject: [PATCH 03/10] Actual SDK version number is 6.0.100 --- .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 501e998d..86bec082 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,7 +19,7 @@ jobs: build-configuration: Debug build-enable-nuget-caching: 'true' build-enable-npm-caching: 'true' - dotnet-version: 6.0.0 + dotnet-version: 6.0.100 build-and-test-standard-runners: if: github.ref_name == github.event.repository.default_branch @@ -29,7 +29,7 @@ jobs: parent-job-name: 'root-solution-standard-runners' timeout-minutes: 30 build-configuration: Debug - dotnet-version: 6.0.0 + dotnet-version: 6.0.100 build-and-test-nuget-test: name: Build and Test - NuGetTest solution @@ -38,7 +38,7 @@ jobs: parent-job-name: 'nuget-solution' build-directory: NuGetTest timeout-minutes: 10 - dotnet-version: 6.0.0 + dotnet-version: 6.0.100 post-pull-request-checks-automation: name: Post Pull Request Checks Automation From 3dce7e6d2bf6588974bc1de22e4c79f8211bd9b8 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Wed, 16 Oct 2024 20:02:47 +0200 Subject: [PATCH 04/10] Updating machine type to ubuntu-2404 for the non-Warpbuild builds --- .github/workflows/build-and-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 86bec082..6d4467b8 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -27,6 +27,7 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: 'root-solution-standard-runners' + machine-types: "['ubuntu-2404']" timeout-minutes: 30 build-configuration: Debug dotnet-version: 6.0.100 @@ -36,6 +37,7 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: 'nuget-solution' + machine-types: "['ubuntu-2404']" build-directory: NuGetTest timeout-minutes: 10 dotnet-version: 6.0.100 From 4ea08e52ba7fedb75d3297a0cde8f430acf3489e Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Wed, 16 Oct 2024 20:09:01 +0200 Subject: [PATCH 05/10] Updating .NET to the highest 6.x version (6.0.427) --- .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 6d4467b8..f539c94a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,7 +19,7 @@ jobs: build-configuration: Debug build-enable-nuget-caching: 'true' build-enable-npm-caching: 'true' - dotnet-version: 6.0.100 + dotnet-version: 6.0.427 build-and-test-standard-runners: if: github.ref_name == github.event.repository.default_branch @@ -30,7 +30,7 @@ jobs: machine-types: "['ubuntu-2404']" timeout-minutes: 30 build-configuration: Debug - dotnet-version: 6.0.100 + dotnet-version: 6.0.427 build-and-test-nuget-test: name: Build and Test - NuGetTest solution @@ -40,7 +40,7 @@ jobs: machine-types: "['ubuntu-2404']" build-directory: NuGetTest timeout-minutes: 10 - dotnet-version: 6.0.100 + dotnet-version: 6.0.427 post-pull-request-checks-automation: name: Post Pull Request Checks Automation From cd76c96a44f69eca539dbc16c3101de87cab8e20 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Thu, 17 Oct 2024 16:24:22 +0200 Subject: [PATCH 06/10] Pinning .NET SDK to 8.0.301 --- .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 f539c94a..055740a4 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,7 +19,7 @@ jobs: build-configuration: Debug build-enable-nuget-caching: 'true' build-enable-npm-caching: 'true' - dotnet-version: 6.0.427 + dotnet-version: 8.0.301 build-and-test-standard-runners: if: github.ref_name == github.event.repository.default_branch @@ -30,7 +30,7 @@ jobs: machine-types: "['ubuntu-2404']" timeout-minutes: 30 build-configuration: Debug - dotnet-version: 6.0.427 + dotnet-version: 8.0.301 build-and-test-nuget-test: name: Build and Test - NuGetTest solution @@ -40,7 +40,7 @@ jobs: machine-types: "['ubuntu-2404']" build-directory: NuGetTest timeout-minutes: 10 - dotnet-version: 6.0.427 + dotnet-version: 8.0.301 post-pull-request-checks-automation: name: Post Pull Request Checks Automation From a4d763fc3589dc35af754f07101763eda0c274b2 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Thu, 17 Oct 2024 22:44:33 +0200 Subject: [PATCH 07/10] Attempting to install .NET SDK 6.0.427 and 8.0.301 --- .github/workflows/build-and-test.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 055740a4..2298fb4b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,7 +19,9 @@ jobs: build-configuration: Debug build-enable-nuget-caching: 'true' build-enable-npm-caching: 'true' - dotnet-version: 8.0.301 + dotnet-version: | + 6.0.427 + 8.0.301 build-and-test-standard-runners: if: github.ref_name == github.event.repository.default_branch @@ -32,15 +34,15 @@ jobs: build-configuration: Debug dotnet-version: 8.0.301 - build-and-test-nuget-test: - name: Build and Test - NuGetTest solution - uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev - with: - parent-job-name: 'nuget-solution' - machine-types: "['ubuntu-2404']" - build-directory: NuGetTest - timeout-minutes: 10 - dotnet-version: 8.0.301 + # build-and-test-nuget-test: + # name: Build and Test - NuGetTest solution + # uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev + # with: + # parent-job-name: 'nuget-solution' + # machine-types: "['ubuntu-2404']" + # build-directory: NuGetTest + # timeout-minutes: 10 + # dotnet-version: 8.0.301 post-pull-request-checks-automation: name: Post Pull Request Checks Automation From 113aa1af2d3ed89f525d44cc070115ab66d7cc85 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Thu, 17 Oct 2024 22:46:04 +0200 Subject: [PATCH 08/10] Really trying to install both this time --- .github/workflows/build-and-test.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 2298fb4b..c13cb574 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -32,17 +32,21 @@ jobs: machine-types: "['ubuntu-2404']" timeout-minutes: 30 build-configuration: Debug - dotnet-version: 8.0.301 + dotnet-version: | + 6.0.427 + 8.0.301 - # build-and-test-nuget-test: - # name: Build and Test - NuGetTest solution - # uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev - # with: - # parent-job-name: 'nuget-solution' - # machine-types: "['ubuntu-2404']" - # build-directory: NuGetTest - # timeout-minutes: 10 - # dotnet-version: 8.0.301 + build-and-test-nuget-test: + name: Build and Test - NuGetTest solution + uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev + with: + parent-job-name: 'nuget-solution' + machine-types: "['ubuntu-2404']" + build-directory: NuGetTest + timeout-minutes: 10 + dotnet-version: | + 6.0.427 + 8.0.301 post-pull-request-checks-automation: name: Post Pull Request Checks Automation From 0eb431b38c2791d135566dd8c511d37cb73b945e Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Thu, 17 Oct 2024 22:50:27 +0200 Subject: [PATCH 09/10] Fixing Ubuntu label --- .github/workflows/build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index c13cb574..5ec54c63 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -29,7 +29,7 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: 'root-solution-standard-runners' - machine-types: "['ubuntu-2404']" + machine-types: "['ubuntu-24.04']" timeout-minutes: 30 build-configuration: Debug dotnet-version: | @@ -41,7 +41,7 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: 'nuget-solution' - machine-types: "['ubuntu-2404']" + machine-types: "['ubuntu-24.04']" build-directory: NuGetTest timeout-minutes: 10 dotnet-version: | From 72ee37f92b9c0098645e9a1666357cb7018c9e3b Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Thu, 31 Oct 2024 16:08:04 +0100 Subject: [PATCH 10/10] Removing ubuntu-24.04 runner overrides --- .github/workflows/build-and-test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5ec54c63..4980e774 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -29,7 +29,6 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: 'root-solution-standard-runners' - machine-types: "['ubuntu-24.04']" timeout-minutes: 30 build-configuration: Debug dotnet-version: | @@ -41,7 +40,6 @@ jobs: uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-dotnet.yml@dev with: parent-job-name: 'nuget-solution' - machine-types: "['ubuntu-24.04']" build-directory: NuGetTest timeout-minutes: 10 dotnet-version: |