Skip to content

Commit d297c42

Browse files
dagooddagood
committed
Merge remote-tracking branch 'dotnet/release/2.2' into merge/release/2.2-to-master
# Conflicts: # README.md # netci.groovy # scripts/generate-readme-table.sh
2 parents 2d23675 + 12e0d75 commit d297c42

File tree

5 files changed

+51
-388
lines changed

5 files changed

+51
-388
lines changed

‎.vsts.pipelines/jobs/ci-local.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ jobs:
3838
- checkout: self
3939
clean: true
4040

41+
# If the machine is dirty, submodule URLs may be from a different branch. Sync to prevent that.
42+
- script: git submodule sync
43+
displayName: Sync submodule urls
44+
4145
# Make sure submodules from other branches are removed: pass extra f.
4246
- script: git clean -xdff
4347
displayName: Clean leftover submodules

‎README.md

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,21 @@
44

55
<!-- Use scripts/generate-readme-table.sh to update table. -->
66
<!-- Generated table start -->
7-
| OS | *Jenkins*<br/>Release | <br/>Debug | *Azure DevOps*<br/>Release |
8-
| -- | :-- | :-- | :-- |
9-
| CentOS7.1 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/CentOS7.1_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/CentOS7.1_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/CentOS7.1_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/CentOS7.1_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=centos71&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
10-
| CentOS7.1 (Online) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/CentOS7.1_Tarball_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/CentOS7.1_Tarball_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/CentOS7.1_Tarball_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/CentOS7.1_Tarball_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=centos71&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
11-
| CentOS7.1 (Online Portable) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/CentOS7.1_Tarball_Release_Portable)](https://ci.dot.net/job/dotnet_source-build/job/master/job/CentOS7.1_Tarball_Release_Portable/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/CentOS7.1_Tarball_Debug_Portable)](https://ci.dot.net/job/dotnet_source-build/job/master/job/CentOS7.1_Tarball_Debug_Portable/) |
12-
| CentOS7.1 (Offline) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=centos71&configuration=Offline)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
13-
| CentOS7.1 (Offline Portable) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=centos71&configuration=Offline%20Portable)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
14-
| Debian8.2 | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=debian82&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
15-
| Debian8.2 (Online) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=debian82&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
16-
| Debian8.4 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/Debian8.4_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/Debian8.4_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/Debian8.4_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/Debian8.4_Debug/) |
17-
| Fedora24 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/Fedora24_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/Fedora24_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/Fedora24_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/Fedora24_Debug/) |
18-
| Fedora29 | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=fedora29&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
19-
| Fedora29 (Online) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=fedora29&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
20-
| Fedora29 (Offline) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=fedora29&configuration=Offline)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
21-
| Fedora29 (Offline Portable) | | | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=fedora29&configuration=Offline%20Portable)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
22-
| OSX10.12 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/OSX10.12_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/OSX10.12_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/OSX10.12_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/OSX10.12_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=OSX&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
23-
| RHEL7.2 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Debug/) |
24-
| RHEL7.2 (Online) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Tarball_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Tarball_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Tarball_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Tarball_Debug/) |
25-
| RHEL7.2 (Online Portable) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Tarball_Release_Portable)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Tarball_Release_Portable/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Tarball_Debug_Portable)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Tarball_Debug_Portable/) |
26-
| RHEL7.2 (Offline) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Unshared_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Unshared_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Unshared_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Unshared_Debug/) |
27-
| RHEL7.2 (Offline Portable) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Unshared_Release_Portable)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Unshared_Release_Portable/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/RHEL7.2_Unshared_Debug_Portable)](https://ci.dot.net/job/dotnet_source-build/job/master/job/RHEL7.2_Unshared_Debug_Portable/) |
28-
| Ubuntu16.04 | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/Ubuntu16.04_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/Ubuntu16.04_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/Ubuntu16.04_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/Ubuntu16.04_Debug/) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=ubuntu1604&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
29-
| Windows | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/Windows_NT_Release)](https://ci.dot.net/job/dotnet_source-build/job/master/job/Windows_NT_Release/) | [![Build Status](https://ci.dot.net/buildStatus/icon?job=dotnet_source-build/master/Windows_NT_Debug)](https://ci.dot.net/job/dotnet_source-build/job/master/job/Windows_NT_Debug/) |
7+
| OS | *Azure DevOps*<br/>Release |
8+
| -- | :-- |
9+
| CentOS7.1 | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=centos71&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
10+
| CentOS7.1 (Online) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=centos71&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
11+
| CentOS7.1 (Offline) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=centos71&configuration=Offline)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
12+
| CentOS7.1 (Offline Portable) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=centos71&configuration=Offline%20Portable)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
13+
| Debian8.2 | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=debian82&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
14+
| Debian8.2 (Online) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=debian82&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
15+
| Fedora29 | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=fedora29&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
16+
| Fedora29 (Online) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=fedora29&configuration=Online)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
17+
| Fedora29 (Offline) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=fedora29&configuration=Offline)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
18+
| Fedora29 (Offline Portable) | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=fedora29&configuration=Offline%20Portable)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
19+
| OSX | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=OSX&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
20+
| Ubuntu16.04 | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=ubuntu1604&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
21+
| Windows | [![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI?branchName=master&jobname=Windows&configuration=Production)](https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=master) |
3022
<!-- Generated table end -->
3123

3224
This repository contains a set of scripts for building the .NET Core Runtime and SDK from source. The scripts were built to make it easy for anyone to build the .NET Core product.

‎build-source-tarball.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -euo pipefail
33
IFS=$'\n\t'
44

55
usage() {
6-
echo "usage: $0 <path-to-tarball-root> [--skip-build] [--enable-leak-detection]"
6+
echo "usage: $0 <path-to-tarball-root> [--skip-build] [--enable-leak-detection] [-- [extra build.sh args]]"
77
echo ""
88
}
99

@@ -26,16 +26,21 @@ while :; do
2626

2727
lowerI="$(echo $1 | awk '{print tolower($0)}')"
2828
case $lowerI in
29-
-?|-h|--help)
30-
usage
31-
exit 0
32-
;;
3329
--skip-build)
3430
SKIP_BUILD=1
3531
;;
3632
--enable-leak-detection)
3733
INCLUDE_LEAK_DETECTION=1
3834
;;
35+
--)
36+
shift
37+
echo "Detected '--': passing remaining parameters '$@' as build.sh arguments."
38+
break
39+
;;
40+
-?|-h|--help)
41+
usage
42+
exit 0
43+
;;
3944
*)
4045
echo "Unrecognized argument '$1'"
4146
usage
@@ -62,7 +67,7 @@ if [ $SKIP_BUILD -ne 1 ]; then
6267
fi
6368

6469
$SCRIPT_ROOT/clean.sh
65-
$SCRIPT_ROOT/build.sh /p:ArchiveDownloadedPackages=true /flp:v=detailed
70+
$SCRIPT_ROOT/build.sh /p:ArchiveDownloadedPackages=true "$@"
6671
fi
6772

6873
mkdir -p "$TARBALL_ROOT"

0 commit comments

Comments
 (0)