From 96ca8853100d289771788b9c95e2609aa3ea50c5 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 30 Aug 2022 16:40:18 -0400 Subject: [PATCH 1/3] Add Alpine CI for source-build --- .../templates/job/source-build-run-tarball-build.yml | 8 ++++++++ .../eng/bootstrap/buildBootstrapPreviouslySB.csproj | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index efa1ff1af8f0..67059c107adc 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -9,6 +9,7 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- + alpine315Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-20230201170331-8b7d579 centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8-20220812185233-b286fae @@ -49,6 +50,13 @@ jobs: _ExcludeOmniSharpTests: true _RunOnline: false _WithPreviousSDK: false + Alpine315-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine315Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOSStream8-WithPreviousSDK: _BootstrapPrep: false diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index 4f2bbd079174..9b8282139c4b 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -15,11 +15,15 @@ + + + + From 9b4d0a0e7d40e7f0425f17d6a37b4bf3a3a819c9 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 8 Feb 2023 09:10:06 -0600 Subject: [PATCH 2/3] Correct bootstrap versions --- .../content/eng/bootstrap/buildBootstrapPreviouslySB.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index 9b8282139c4b..618b6e7c1b69 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -17,13 +17,13 @@ + + + - - - From 730947d3cbfd1ca132e48fb8b28c495e23e1e56c Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 8 Feb 2023 16:27:26 -0500 Subject: [PATCH 3/3] Switch to alpine 3.17 It's the release that most closely matches the .NET 7.0 lifetime. --- .../job/source-build-run-tarball-build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 67059c107adc..f031aaf23574 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -9,7 +9,7 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- - alpine315Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-20230201170331-8b7d579 + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-20230214152931-7f13c75 centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8-20220812185233-b286fae @@ -50,14 +50,14 @@ jobs: _ExcludeOmniSharpTests: true _RunOnline: false _WithPreviousSDK: false - Alpine315-Offline: - _BootstrapPrep: true - _Container: ${{ parameters.alpine315Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: true - _RunOnline: false - _WithPreviousSDK: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: false CentOSStream8-WithPreviousSDK: _BootstrapPrep: false _Container: ${{ parameters.centOSStream8Container }}