[ArPow] Update prebuilts and enable offline CI (#12072)
* Update prebuilts and enable offline CI * Update previous source-built and add offline source-link patch
This commit is contained in:
parent
1e9ab7323f
commit
d26f9a313a
4 changed files with 33 additions and 8 deletions
|
@ -160,8 +160,8 @@
|
|||
removed. See https://github.com/dotnet/source-build/issues/2295 -->
|
||||
<MicrosoftBuildFrameworkVersion>15.7.179</MicrosoftBuildFrameworkVersion>
|
||||
<MicrosoftBuildUtilitiesCoreVersion>15.7.179</MicrosoftBuildUtilitiesCoreVersion>
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.16</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-6.0.100-19</PrivateSourceBuiltPrebuiltsPackageVersion>
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.17</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-6.0.100-20</PrivateSourceBuiltPrebuiltsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
<PropertyGroup>
|
||||
|
|
|
@ -27,10 +27,9 @@ jobs:
|
|||
Fedora33-Online:
|
||||
_runOnline: true
|
||||
_Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
||||
# TODO: Renable once installer prebuilts are eliminated.
|
||||
# Fedora33-Offline:
|
||||
# _runOnline: false
|
||||
# _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
||||
Fedora33-Offline:
|
||||
_runOnline: false
|
||||
_Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
||||
timeoutInMinutes: 180
|
||||
variables:
|
||||
_TarballDir: $(Build.StagingDirectory)/tarball
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
</PropertyGroup>
|
||||
<!-- Production Dependencies -->
|
||||
<PropertyGroup>
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.16</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.17</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersionPrefix>0.1.0-6.0.100-</PrivateSourceBuiltPrebuiltsPackageVersionPrefix>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersionSuffix>19</PrivateSourceBuiltPrebuiltsPackageVersionSuffix>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersionSuffix>20</PrivateSourceBuiltPrebuiltsPackageVersionSuffix>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
From 4c6179851c1e4ff7f6835707d11f0d9a411aefbc Mon Sep 17 00:00:00 2001
|
||||
From: Matt Galbraith <mattgal@microsoft.com>
|
||||
Date: Mon, 23 Aug 2021 08:52:35 -0700
|
||||
Subject: [PATCH] https://github.com/dotnet/arcade/issues/7778 - Ignore curl
|
||||
failures for no-network build scenario
|
||||
|
||||
---
|
||||
eng/common/tools.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
|
||||
index 3c5f3a12..41e32310 100755
|
||||
--- a/eng/common/tools.sh
|
||||
+++ b/eng/common/tools.sh
|
||||
@@ -402,7 +402,7 @@ function StopProcesses {
|
||||
function TryLogClientIpAddress () {
|
||||
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
|
||||
if command -v curl > /dev/null; then
|
||||
- curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
|
||||
+ curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
|
||||
fi
|
||||
}
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
Loading…
Add table
Reference in a new issue