From 9fa529ada8d05fc0400c08b13de8362c92ba9bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 29 Aug 2022 16:56:15 +0200 Subject: [PATCH 1/2] Fix Linux armv6 build on runtime-community.yml We only need the `clr.iltools+clr.packages` subset, not all of CoreCLR. Also fix some dependencies that weren't working for FreeBSD since we missed the local variables. We don't need installer subset conditions here. --- eng/pipelines/runtime-community.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/runtime-community.yml b/eng/pipelines/runtime-community.yml index 4da1a6605ee893..3eace877e55222 100644 --- a/eng/pipelines/runtime-community.yml +++ b/eng/pipelines/runtime-community.yml @@ -65,7 +65,6 @@ jobs: or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/libraries/helix.yml @@ -89,6 +88,12 @@ jobs: runtimeFlavor: mono platforms: - FreeBSD_x64 + variables: + # map dependencies variables to local variables + - name: librariesContainsChange + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] + - name: monoContainsChange + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] jobParameters: testScope: innerloop nameSuffix: AllSubsets_Mono @@ -98,7 +103,7 @@ jobs: or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true)) + eq(variables['isRollingBuild'], true)) # # Build the whole product using Mono and run libraries tests @@ -120,13 +125,12 @@ jobs: jobParameters: testScope: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+clr+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true + buildArgs: -s mono+clr.iltools+clr.packages+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 120 condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) ${{ if eq(variables['isRollingBuild'], true) }}: # extra steps, run tests From fe0d9d98ec0cd6bd045567f206c4f7c57d6dee01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 30 Aug 2022 13:25:15 +0200 Subject: [PATCH 2/2] Add missing HOST_ARM define to armv6 in configurecompiler.cmake It was missed in https://github.com/dotnet/runtime/pull/73530, before that we defined `HOST_ARM` for armv6 in pal.h too because of `defined(__arm__)` --- eng/native/configurecompiler.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index 9594de561b452e..10513e72d39b98 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -220,6 +220,7 @@ elseif (CLR_CMAKE_HOST_ARCH_ARM) add_definitions(-DHOST_ARM) elseif (CLR_CMAKE_HOST_ARCH_ARMV6) set(ARCH_HOST_NAME armv6) + add_definitions(-DHOST_ARM) add_definitions(-DHOST_ARMV6) elseif (CLR_CMAKE_HOST_ARCH_ARM64) set(ARCH_HOST_NAME arm64)