From f91f55e975e230eaeea61fb7307a0037118c3dd2 Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Mon, 12 Apr 2021 10:48:06 +0200 Subject: [PATCH 1/2] Update Alpine ARM docker image The Alpine ARM docker image is used for cross compilation. There was a breaking change in Alpine 3.13 - it uses a new MUSL that has 64 bit time_t even on 32 bit platforms. Since the official support for Alpine ARM was not announced yet, it was decided that we will support it only on Alpine >= 3.13 instead of having to build and distribute two different versions of runtime. This change updates the docker image used to build Alpine ARM runtime to a new version that uses Alpine 3.13 rootfs. It is also using Ubuntu 16.04 instead of 18.04 as a host to unify it with the one we use to build for Alpine ARM64. --- eng/pipelines/common/platform-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index ea17c5643461f..e638ecbda6c59 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -116,7 +116,7 @@ jobs: targetRid: linux-musl-arm platform: Linux_musl_arm container: - image: ubuntu-18.04-cross-arm-alpine-20200818211451-14441ae + image: ubuntu-16.04-cross-arm-alpine-20210409142327-044d5b9 registry: mcr jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} From 972300000d0362e1e006187eab4511d096b57eff Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Wed, 14 Apr 2021 17:35:33 +0200 Subject: [PATCH 2/2] Update helix queue for Alpine ARM to use Alpine 3.13 --- eng/pipelines/coreclr/templates/helix-queues-setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index af307b2e1867c..9312c4ac7d93d 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -66,9 +66,9 @@ jobs: # Linux musl arm32 - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - (Alpine.312.Arm32.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-arm32v7-20200908125213-5bece88 + - (Alpine.313.Arm32.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-helix-arm32v7-20210414141857-1ea6b0a - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - (Alpine.312.Arm32)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-arm32v7-20200908125213-5bece88 + - (Alpine.313.Arm32)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-helix-arm32v7-20210414141857-1ea6b0a # Linux musl arm64 - ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}: