Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 13 additions & 26 deletions diagnostics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,10 @@ stages:
_PublishArtifacts: bin/Windows_NT.x86.Release
${{ if ne(variables['System.TeamProject'], 'public') }}:
Build_Release_arm:
_BuildOnly: true
_BuildConfig: Release
_BuildArch: arm
_PublishArtifacts: bin/Windows_NT.arm.Release
Build_Release_arm64:
_BuildOnly: true
_BuildConfig: Release
_BuildArch: arm64
_PublishArtifacts: bin/Windows_NT.arm64.Release
Expand All @@ -126,7 +124,9 @@ stages:
parameters:
name: CentOS_7
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7
requiresCapPtraceContainer: true
buildAndSkipTest: true
strategy:
matrix:
Build_Debug:
Expand All @@ -142,7 +142,7 @@ stages:
parameters:
name: Alpine3_13
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode-20210910135845-c401c85
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode
artifactsTargetPath: bin/Linux-musl.x64.Release
requiresCapPtraceContainer: true
strategy:
Expand Down Expand Up @@ -193,7 +193,7 @@ stages:
parameters:
name: Linux_arm
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-20210719121212-8a8d3be
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross
crossrootfsDir: '/crossrootfs/arm'
buildAndSkipTest: true
strategy:
Expand All @@ -207,7 +207,7 @@ stages:
parameters:
name: Linux_arm64
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64
crossrootfsDir: '/crossrootfs/arm64'
buildAndSkipTest: true
strategy:
Expand All @@ -221,7 +221,7 @@ stages:
parameters:
name: Linux_musl_arm
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine
crossrootfsDir: '/crossrootfs/arm'
artifactsTargetPath: bin/Linux-musl.arm.Release
buildAndSkipTest: true
Expand All @@ -236,7 +236,7 @@ stages:
parameters:
name: Linux_musl_arm64
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine
crossrootfsDir: '/crossrootfs/arm64'
artifactsTargetPath: bin/Linux-musl.arm64.Release
buildAndSkipTest: true
Expand All @@ -255,9 +255,9 @@ stages:

- template: /eng/build.yml
parameters:
name: Debian_Stretch
name: Debian_Bullseye
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-3e800f1-20190521154431
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
dependsOn: CentOS_7
testOnly: true
strategy:
Expand All @@ -270,7 +270,7 @@ stages:
# parameters:
# name: Fedora_34
# osGroup: Linux
# dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220331150839-4f64125
# dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix
# dependsOn: CentOS_7
# testOnly: true
# requiresCapPtraceContainer: true
Expand All @@ -284,7 +284,7 @@ stages:
# parameters:
# name: OpenSuse_15_2
# osGroup: Linux
# dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20211018152525-9cc02fe
# dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
# dependsOn: CentOS_7
# testOnly: true
# strategy:
Expand All @@ -293,24 +293,11 @@ stages:
# _BuildConfig: Debug
# _BuildArch: x64

- template: /eng/build.yml
parameters:
name: Ubuntu_16_04
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-09ca40b-20190520220842
dependsOn: CentOS_7
testOnly: true
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
_BuildArch: x64

- template: /eng/build.yml
parameters:
name: Ubuntu_18_04
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-3e800f1-20190508143252
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04
dependsOn: CentOS_7
testOnly: true
strategy:
Expand Down
2 changes: 1 addition & 1 deletion eng/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,4 @@ jobs:
mergeTestResults: true
buildConfiguration: ${{ parameters.name }}
continueOnError: true
condition: ne(variables['_BuildOnly'], 'true')
condition: always()
31 changes: 1 addition & 30 deletions eng/cibuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ while [[ -h $source ]]; do
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
source="$(readlink "$source")"

# if $source was a relative symlink, we need to resolve it relative to the path where
# if $source was a relative symlink, we need to resolve it relative to the path where
# the symlink file was located
[[ $source != /* ]] && source="$scriptroot/$source"
done
Expand All @@ -35,35 +35,6 @@ if [ "$__osname" == "Linux" ]; then
source scl_source enable python27 devtoolset-2
fi
fi

# We are using old (2019) centos image in the CI with old cmake (2.8).
# Upgrading to 2021 centos image was failing SOS tests which rely on
# lldb REPL and ptrace etc. e.g. from test attachment logs:
#
# 00:00.136: error: process launch failed: 'A' packet returned an error: 8
# 00:00.136:
# 00:00.136: <END_COMMAND_ERROR>
#System.Exception: 'process launch -s' FAILED
#
# so we will keep using old image for now and install newer cmake as a workaround instead..
# FIXME: delete this comment and the next `if` block once centos image is upgraded.
if [ "$ID" = "centos" ]; then
# upgrade cmake
requiredversion=3.6.2
cmakeversion="$(cmake --version | head -1)"
currentversion="${cmakeversion##* }"
if ! printf '%s\n' "$requiredversion" "$currentversion" | sort --version-sort --check 2>/dev/null; then
echo "Old cmake version found: $currentversion, minimal requirement is $requiredversion. Upgrading to 3.15.5 .."
curl -sSL -o /tmp/cmake-install.sh https://github.com/Kitware/CMake/releases/download/v3.15.5/cmake-3.15.5-Linux-$(uname -m).sh
mkdir "$HOME/.cmake"
bash /tmp/cmake-install.sh --skip-license --exclude-subdir --prefix="$HOME/.cmake"
PATH="$HOME/.cmake/bin:$PATH"
export PATH
cmakeversion="$(cmake --version | head -1)"
newversion="${cmakeversion##* }"
echo "New cmake version is: $newversion"
fi
fi
fi

"$scriptroot/build.sh" -restore -prepareMachine -ci $@
Expand Down
3 changes: 2 additions & 1 deletion src/SOS/SOS.UnitTests/SOSRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,8 @@ public static async Task<SOSRunner> StartDebugger(TestInformation information, D
{
throw new ArgumentException("LLDB helper script path not set or does not exist: " + lldbHelperScript);
}
arguments.AppendFormat(@"--no-lldbinit -o ""settings set interpreter.prompt-on-quit false"" -o ""command script import {0}"" -o ""version""", lldbHelperScript);
arguments.Append(@"--no-lldbinit -o ""settings set target.disable-aslr false"" -o ""settings set interpreter.prompt-on-quit false""");
arguments.AppendFormat(@" -o ""command script import {0}"" -o ""version""", lldbHelperScript);

string debuggeeTarget = config.HostExe;
if (string.IsNullOrWhiteSpace(debuggeeTarget))
Expand Down