Remove usages of Ubuntu 16.04 from pipelines#75513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 8 commits into from
Sep 22, 2022
Merged

Remove usages of Ubuntu 16.04 from pipelines #75513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
161dde2
Remove usages of Ubuntu 16.04 from pipelines
am11 Sep 13, 2022
a4f9bb0
Delete old jenkins scripts
am11 Sep 13, 2022
89a6456
Try with grep
am11 Sep 14, 2022
7d50975
Use attribute(retain)
am11 Sep 14, 2022
d1a7570
Improve handling of /p:CrossBuild=true
am11 Sep 14, 2022
1a63b33
Update images and revert to binutils linker
am11 Sep 15, 2022
fb3838c
Revert __attribute__((retain)) for now
am11 Sep 15, 2022
34e4dbe
Merge dotnet/main into feature/ci/image-updates
am11 Sep 16, 2022
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
6 changes: 6 additions & 0 deletions eng/build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -403,6 +403,12 @@ while [[ $# > 0 ]]; do
shift 1
;;

*crossbuild=true*)
crossBuild=1
extraargs="$extraargs $1"
shift 1

@am11am11Sep 15, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handled /p:CrossBuild=true this way to support multiple property cases like ./build.sh /p:'RuntimeFlavor=coreclr;CrossBuild=true;Configuration=release'. Ideally, all cross-building CI legs should explicitly pass -cross (which appends /p:CrossBuild=true), but an explicit /p:CrossBuild=true should have the same effect.

;;

-clang*)
compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged)
arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
Expand Down
11 changes: 6 additions & 5 deletions eng/pipelines/common/global-build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,18 +75,19 @@ jobs:
- name: _osParameter
value: -os ${{ parameters.osGroup }}

- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
- name: _osParameter
value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}

- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_bionic')) }}:
- name: _osParameter
value: /p:RuntimeOS=linux-bionic /p:OutputRid=linux-bionic-${{ parameters.archType }}
value: /p:RuntimeOS=linux-bionic
Comment thread
hoyosjs marked this conversation as resolved.

# Do not rename as it clashes with MSBuild property in libraries/build-native.proj
- name: _crossBuildPropertyArg
value: /p:CrossBuild=${{ parameters.crossBuild }}

- ${{ if ne(parameters.jobParameters.crossrootfsDir, '') }}:
# This is only required for cross builds.
- name: ROOTFS_DIR
value: ${{ parameters.jobParameters.crossrootfsDir }}

- name: _cxx11Parameter
${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'arm64')) }}:
value: /p:MonoLLVMUseCxx11Abi=true
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/platform-matrix.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ jobs:
platform: Linux_musl_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
registry: mcr
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All@@ -165,7 +165,7 @@ jobs:
platform: Linux_musl_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
registry: mcr
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/common/templates/runtimes/build-test-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,9 @@ jobs:
pool: ${{ parameters.pool }}
dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX'))) }}:
${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX'))) }}:
compilerArg: '-clang9'
${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX')))) }}:
${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX')))) }}:
compilerArg: ''

# Test jobs should continue on error for internal builds
Expand DownExpand Up@@ -79,8 +79,8 @@ jobs:
- ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
- name: compilerArg
value: '-clang9'
# Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
# We need to use the stable version available on Alpine Linux
- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
- name: compilerArg
value: ''
# AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/templates/build-jit-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,8 @@ jobs:
- ${{ if ne(parameters.osGroup, 'windows') }}:
- name: compilerArg
value: '-clang9'
# Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
# We need to use the stable version available on Alpine Linux
- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
- name: compilerArg
value: ''
# AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,8 +93,8 @@ jobs:
- ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
- name: compilerArg
value: '-clang9'
# Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
# We need to use the stable version available on Alpine Linux
- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
- name: compilerArg
value: ''
# AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ jobs:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.314.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
- (Alpine.314.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19

# Linux musl arm32
- ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
Expand DownExpand Up@@ -110,7 +110,7 @@ jobs:
- (Debian.10.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011
- (Debian.11.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220810215032-f344011
- Ubuntu.1804.Amd64
- (Centos.8.Amd64)Ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
- (Centos.8.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
- (Fedora.34.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c
- RedHat.7.Amd64

Expand Down
20 changes: 5 additions & 15 deletions eng/pipelines/installer/jobs/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,34 +200,24 @@ jobs:
value: ${{ eq(parameters.osSubgroup, '') }}

- ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}:
# Set output RID manually: musl isn't properly detected. Make sure to also convert linux to
# lowercase for RID format. (Detection normally converts, but we're preventing it.)
- name: OutputRidArg
value: /p:OutputRid=linux-musl-${{ parameters.archType }}
- name: RuntimeOSArg
value: /p:RuntimeOS=linux-musl
- name: _PortableBuild
value: true

- ${{ if eq(parameters.crossBuild, true) }}:
- name: ArchArg
value: -arch ${{ parameters.archType }}

- name: BaseJobBuildCommand
value: >-
$(Build.SourcesDirectory)/build.sh -subset host+packs -ci
$(BuildAction)
$(ArchArg)
/p:CrossBuild=${{ parameters.crossBuild }}
/p:PortableBuild=$(_PortableBuild)
/p:SkipTests=$(SkipTests)
$(pgoInstrumentArg)
$(LiveOverridePathArgs)
$(CommonMSBuildArgs)
$(OutputRidArg)
$(RuntimeOSArg)

- name: PublishArguments
value: >-
/p:PortableBuild=$(_PortableBuild)
$(CommonMSBuildArgs)
$(OutputRidArg)
/bl:msbuild.publish.binlog

- name: installersSubsetArg
value: --subset packs.installers
Expand Down
14 changes: 1 addition & 13 deletions eng/pipelines/libraries/base-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ jobs:

- _msbuildCommonParameters: ''
# rename this variable, due to collision with build-native.proj
- _runtimeOSArg: ''
- _osArg: ''
- _finalFrameworkArg: ''
- _testModeArg: ''
Expand All@@ -71,12 +70,6 @@ jobs:
- ${{ if eq(parameters.crossBuild, true) }}:
- _crossBuildPropertyArg: /p:CrossBuild=true

- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
- _runtimeOSArg: /p:RuntimeOS=linux-musl

- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
- _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

# force a value for OS when cross-building
- ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}:
- _osArg: -os ${{ parameters.osGroup }}
Expand DownExpand Up@@ -111,15 +104,10 @@ jobs:
- ${{ if ne(parameters.testDisplayName, '') }}:
- _testRunNamePrefixSuffix: ${{ parameters.testDisplayName }}

# Windows variables
- ${{ if eq(parameters.osGroup, 'windows') }}:
- _runtimeOSArg: /p:RuntimeOS=win10

# Non-Windows variables
- ${{ if ne(parameters.osGroup, 'windows') }}:
- _buildScript: ./$(_buildScriptFileName)$(scriptExt)

- _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
- _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
- ${{ parameters.variables }}

# we need to override this value to support build-coreclr-and-libraries-job.yml
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,10 +74,10 @@ jobs:
- (Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220908220224-98605e8
- Ubuntu.2204.Amd64.Open
- (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220908132354-59ee6b3
- (Mariner.1.0.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
- (openSUSE.15.2.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
- (Mariner.1.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
- (openSUSE.15.2.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
- (Centos.7.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
- RedHat.7.Amd64.Open
- (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220908132009-59ee6b3
- Ubuntu.1804.Amd64.Open
Expand Down
3 changes: 2 additions & 1 deletion eng/testing/tests.singlefile.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,8 @@
<PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
<IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
<IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
<CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
<CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
<CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
<SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
<IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
<IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/tools/aot/crossgen2/crossgen2.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,8 @@
<PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
<IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
<IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
<CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
<CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
<CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
<SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
<IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
<IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down
9 changes: 8 additions & 1 deletion ...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,13 @@
StandardOutputImportance="Low">
<Output TaskParameter="ConsoleOutput" PropertyName="DnneCompilerCommand" />
</Exec>

<Exec Command="bash -c 'source &quot;$(RepositoryEngineeringDir)/common/native/init-compiler.sh&quot; &quot;$(RepositoryEngineeringDir)/common/native&quot; $(TargetArchitecture) $(NativeCompiler) &amp;&amp; echo $LDFLAGS' 2>/dev/null"
Comment thread
am11 marked this conversation as resolved.
EchoOff="true"
ConsoleToMsBuild="true"
StandardOutputImportance="Low">
<Output TaskParameter="ConsoleOutput" PropertyName="DnneLinkerCommand" />
</Exec>
</Target>

<Target Name="GetUnixCrossBuildArgumentsForDNNE"
Expand All@@ -61,7 +68,7 @@

<PropertyGroup>
<CommonToolchainArgs>--target=$(TargetTriple) --gcc-toolchain=$(ROOTFS_DIR)/usr --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
<DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
<DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerCommand) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
<DnneCompilerUserFlags>$(CommonToolchainArgs) $(DnneCompilerUserFlags.Replace(';',' '))</DnneCompilerUserFlags>
</PropertyGroup>
</Target>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove usages of Ubuntu 16.04 from pipelines#75513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 8 commits into

from

Sep 22, 2022
 Merged


Remove usages of Ubuntu 16.04 from pipelines
#75513
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
161dde2

Remove usages of Ubuntu 16.04 from pipelines


am11 Sep 13, 2022
a4f9bb0

Delete old jenkins scripts


am11 Sep 13, 2022
89a6456

Try with grep


am11 Sep 14, 2022
7d50975

Use attribute(retain)


am11 Sep 14, 2022
d1a7570

Improve handling of /p:CrossBuild=true


am11 Sep 14, 2022
1a63b33

Update images and revert to binutils linker


am11 Sep 15, 2022
fb3838c

Revert __attribute__((retain)) for now


am11 Sep 15, 2022
34e4dbe

Merge dotnet/main into feature/ci/image-updates


am11 Sep 16, 2022

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


6 changes: 6 additions & 0 deletions
eng/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -403,6 +403,12 @@ while [[ $# > 0 ]]; do
 shift 1
 ;;

 *crossbuild=true*)
 crossBuild=1
 extraargs="$extraargs $1"
 shift 1
@am11am11Sep 15, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handled /p:CrossBuild=true this way to support multiple property cases like ./build.sh /p:'RuntimeFlavor=coreclr;CrossBuild=true;Configuration=release'. Ideally, all cross-building CI legs should explicitly pass -cross (which appends /p:CrossBuild=true), but an explicit /p:CrossBuild=true should have the same effect.
 ;;

 -clang*)
 compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged)
 arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
Expand Down

11 changes: 6 additions & 5 deletions
eng/pipelines/common/global-build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,18 +75,19 @@ jobs:
 - name: _osParameter
 value: -os ${{ parameters.osGroup }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_bionic')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-bionic /p:OutputRid=linux-bionic-${{ parameters.archType }}
 value: /p:RuntimeOS=linux-bionic
Comment thread
hoyosjs marked this conversation as resolved.


 # Do not rename as it clashes with MSBuild property in libraries/build-native.proj
 - name: _crossBuildPropertyArg
 value: /p:CrossBuild=${{ parameters.crossBuild }}

 - ${{ if ne(parameters.jobParameters.crossrootfsDir, '') }}:
 # This is only required for cross builds.
 - name: ROOTFS_DIR
 value: ${{ parameters.jobParameters.crossrootfsDir }}

 - name: _cxx11Parameter
 ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'arm64')) }}:
 value: /p:MonoLLVMUseCxx11Abi=true
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ jobs:
 platform: Linux_musl_arm
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
 image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All@@ -165,7 +165,7 @@ jobs:
 platform: Linux_musl_arm64
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
 image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/common/templates/runtimes/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,9 @@ jobs:
 pool: ${{ parameters.pool }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 compilerArg: '-clang9'
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 compilerArg: ''

 # Test jobs should continue on error for internal builds
Expand DownExpand Up@@ -79,8 +79,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-jit-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,8 @@ jobs:
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,8 +93,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ jobs:
 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
 - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 - (Alpine.314.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - (Alpine.314.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19

 # Linux musl arm32
 - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
Expand DownExpand Up@@ -110,7 +110,7 @@ jobs:
 - (Debian.10.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011
 - (Debian.11.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220810215032-f344011
 - Ubuntu.1804.Amd64
 - (Centos.8.Amd64)Ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Centos.8.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Fedora.34.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c
 - RedHat.7.Amd64

Expand Down

20 changes: 5 additions & 15 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,34 +200,24 @@ jobs:
 value: ${{ eq(parameters.osSubgroup, '') }}

 - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}:
 # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to
 # lowercase for RID format. (Detection normally converts, but we're preventing it.)
 - name: OutputRidArg
 value: /p:OutputRid=linux-musl-${{ parameters.archType }}
 - name: RuntimeOSArg
 value: /p:RuntimeOS=linux-musl
 - name: _PortableBuild
 value: true

 - ${{ if eq(parameters.crossBuild, true) }}:
 - name: ArchArg
 value: -arch ${{ parameters.archType }}

 - name: BaseJobBuildCommand
 value: >-
 $(Build.SourcesDirectory)/build.sh -subset host+packs -ci
 $(BuildAction)
 $(ArchArg)
 /p:CrossBuild=${{ parameters.crossBuild }}
 /p:PortableBuild=$(_PortableBuild)
 /p:SkipTests=$(SkipTests)
 $(pgoInstrumentArg)
 $(LiveOverridePathArgs)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 $(RuntimeOSArg)

 - name: PublishArguments
 value: >-
 /p:PortableBuild=$(_PortableBuild)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 /bl:msbuild.publish.binlog

 - name: installersSubsetArg
 value: --subset packs.installers
Expand Down

14 changes: 1 addition & 13 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ jobs:

 - _msbuildCommonParameters: ''
 # rename this variable, due to collision with build-native.proj
 - _runtimeOSArg: ''
 - _osArg: ''
 - _finalFrameworkArg: ''
 - _testModeArg: ''
Expand All@@ -71,12 +70,6 @@ jobs:
 - ${{ if eq(parameters.crossBuild, true) }}:
 - _crossBuildPropertyArg: /p:CrossBuild=true

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - _runtimeOSArg: /p:RuntimeOS=linux-musl

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building
 - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}:
 - _osArg: -os ${{ parameters.osGroup }}
Expand DownExpand Up@@ -111,15 +104,10 @@ jobs:
 - ${{ if ne(parameters.testDisplayName, '') }}:
 - _testRunNamePrefixSuffix: ${{ parameters.testDisplayName }}

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'windows') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10

 # Non-Windows variables
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - _buildScript: ./$(_buildScriptFileName)$(scriptExt)

 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - ${{ parameters.variables }}

 # we need to override this value to support build-coreclr-and-libraries-job.yml
Expand Down

6 changes: 3 additions & 3 deletions
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,10 +74,10 @@ jobs:
 - (Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220908220224-98605e8
 - Ubuntu.2204.Amd64.Open
 - (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220908132354-59ee6b3
 - (Mariner.1.0.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - (Mariner.1.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
 - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - (Centos.7.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - RedHat.7.Amd64.Open
 - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220908132009-59ee6b3
 - Ubuntu.1804.Amd64.Open
Expand Down

3 changes: 2 additions & 1 deletion
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,8 @@
 <PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

3 changes: 2 additions & 1 deletion
src/coreclr/tools/aot/crossgen2/crossgen2.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,8 @@
 <PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

9 changes: 8 additions & 1 deletion
...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,13 @@
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneCompilerCommand" />
 </Exec>

 <Exec Command="bash -c 'source &quot;$(RepositoryEngineeringDir)/common/native/init-compiler.sh&quot; &quot;$(RepositoryEngineeringDir)/common/native&quot; $(TargetArchitecture) $(NativeCompiler) &amp;&amp; echo $LDFLAGS' 2>/dev/null"
Comment thread
am11 marked this conversation as resolved.

 EchoOff="true"
 ConsoleToMsBuild="true"
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneLinkerCommand" />
 </Exec>
 </Target>

 <Target Name="GetUnixCrossBuildArgumentsForDNNE"
Expand All@@ -61,7 +68,7 @@

 <PropertyGroup>
 <CommonToolchainArgs>--target=$(TargetTriple) --gcc-toolchain=$(ROOTFS_DIR)/usr --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerCommand) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneCompilerUserFlags>$(CommonToolchainArgs) $(DnneCompilerUserFlags.Replace(';',' '))</DnneCompilerUserFlags>
 </PropertyGroup>
 </Target>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove usages of Ubuntu 16.04 from pipelines#75513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 8 commits into

from

Sep 22, 2022
 Merged


Remove usages of Ubuntu 16.04 from pipelines
#75513
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
161dde2

Remove usages of Ubuntu 16.04 from pipelines


am11 Sep 13, 2022
a4f9bb0

Delete old jenkins scripts


am11 Sep 13, 2022
89a6456

Try with grep


am11 Sep 14, 2022
7d50975

Use attribute(retain)


am11 Sep 14, 2022
d1a7570

Improve handling of /p:CrossBuild=true


am11 Sep 14, 2022
1a63b33

Update images and revert to binutils linker


am11 Sep 15, 2022
fb3838c

Revert __attribute__((retain)) for now


am11 Sep 15, 2022
34e4dbe

Merge dotnet/main into feature/ci/image-updates


am11 Sep 16, 2022

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


6 changes: 6 additions & 0 deletions
eng/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -403,6 +403,12 @@ while [[ $# > 0 ]]; do
 shift 1
 ;;

 *crossbuild=true*)
 crossBuild=1
 extraargs="$extraargs $1"
 shift 1
@am11am11Sep 15, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handled /p:CrossBuild=true this way to support multiple property cases like ./build.sh /p:'RuntimeFlavor=coreclr;CrossBuild=true;Configuration=release'. Ideally, all cross-building CI legs should explicitly pass -cross (which appends /p:CrossBuild=true), but an explicit /p:CrossBuild=true should have the same effect.
 ;;

 -clang*)
 compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged)
 arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
Expand Down

11 changes: 6 additions & 5 deletions
eng/pipelines/common/global-build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,18 +75,19 @@ jobs:
 - name: _osParameter
 value: -os ${{ parameters.osGroup }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_bionic')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-bionic /p:OutputRid=linux-bionic-${{ parameters.archType }}
 value: /p:RuntimeOS=linux-bionic
Comment thread
hoyosjs marked this conversation as resolved.


 # Do not rename as it clashes with MSBuild property in libraries/build-native.proj
 - name: _crossBuildPropertyArg
 value: /p:CrossBuild=${{ parameters.crossBuild }}

 - ${{ if ne(parameters.jobParameters.crossrootfsDir, '') }}:
 # This is only required for cross builds.
 - name: ROOTFS_DIR
 value: ${{ parameters.jobParameters.crossrootfsDir }}

 - name: _cxx11Parameter
 ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'arm64')) }}:
 value: /p:MonoLLVMUseCxx11Abi=true
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ jobs:
 platform: Linux_musl_arm
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
 image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All@@ -165,7 +165,7 @@ jobs:
 platform: Linux_musl_arm64
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
 image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/common/templates/runtimes/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,9 @@ jobs:
 pool: ${{ parameters.pool }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 compilerArg: '-clang9'
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 compilerArg: ''

 # Test jobs should continue on error for internal builds
Expand DownExpand Up@@ -79,8 +79,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-jit-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,8 @@ jobs:
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,8 +93,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ jobs:
 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
 - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 - (Alpine.314.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - (Alpine.314.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19

 # Linux musl arm32
 - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
Expand DownExpand Up@@ -110,7 +110,7 @@ jobs:
 - (Debian.10.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011
 - (Debian.11.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220810215032-f344011
 - Ubuntu.1804.Amd64
 - (Centos.8.Amd64)Ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Centos.8.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Fedora.34.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c
 - RedHat.7.Amd64

Expand Down

20 changes: 5 additions & 15 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,34 +200,24 @@ jobs:
 value: ${{ eq(parameters.osSubgroup, '') }}

 - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}:
 # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to
 # lowercase for RID format. (Detection normally converts, but we're preventing it.)
 - name: OutputRidArg
 value: /p:OutputRid=linux-musl-${{ parameters.archType }}
 - name: RuntimeOSArg
 value: /p:RuntimeOS=linux-musl
 - name: _PortableBuild
 value: true

 - ${{ if eq(parameters.crossBuild, true) }}:
 - name: ArchArg
 value: -arch ${{ parameters.archType }}

 - name: BaseJobBuildCommand
 value: >-
 $(Build.SourcesDirectory)/build.sh -subset host+packs -ci
 $(BuildAction)
 $(ArchArg)
 /p:CrossBuild=${{ parameters.crossBuild }}
 /p:PortableBuild=$(_PortableBuild)
 /p:SkipTests=$(SkipTests)
 $(pgoInstrumentArg)
 $(LiveOverridePathArgs)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 $(RuntimeOSArg)

 - name: PublishArguments
 value: >-
 /p:PortableBuild=$(_PortableBuild)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 /bl:msbuild.publish.binlog

 - name: installersSubsetArg
 value: --subset packs.installers
Expand Down

14 changes: 1 addition & 13 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ jobs:

 - _msbuildCommonParameters: ''
 # rename this variable, due to collision with build-native.proj
 - _runtimeOSArg: ''
 - _osArg: ''
 - _finalFrameworkArg: ''
 - _testModeArg: ''
Expand All@@ -71,12 +70,6 @@ jobs:
 - ${{ if eq(parameters.crossBuild, true) }}:
 - _crossBuildPropertyArg: /p:CrossBuild=true

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - _runtimeOSArg: /p:RuntimeOS=linux-musl

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building
 - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}:
 - _osArg: -os ${{ parameters.osGroup }}
Expand DownExpand Up@@ -111,15 +104,10 @@ jobs:
 - ${{ if ne(parameters.testDisplayName, '') }}:
 - _testRunNamePrefixSuffix: ${{ parameters.testDisplayName }}

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'windows') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10

 # Non-Windows variables
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - _buildScript: ./$(_buildScriptFileName)$(scriptExt)

 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - ${{ parameters.variables }}

 # we need to override this value to support build-coreclr-and-libraries-job.yml
Expand Down

6 changes: 3 additions & 3 deletions
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,10 +74,10 @@ jobs:
 - (Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220908220224-98605e8
 - Ubuntu.2204.Amd64.Open
 - (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220908132354-59ee6b3
 - (Mariner.1.0.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - (Mariner.1.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
 - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - (Centos.7.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - RedHat.7.Amd64.Open
 - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220908132009-59ee6b3
 - Ubuntu.1804.Amd64.Open
Expand Down

3 changes: 2 additions & 1 deletion
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,8 @@
 <PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

3 changes: 2 additions & 1 deletion
src/coreclr/tools/aot/crossgen2/crossgen2.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,8 @@
 <PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

9 changes: 8 additions & 1 deletion
...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,13 @@
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneCompilerCommand" />
 </Exec>

 <Exec Command="bash -c 'source &quot;$(RepositoryEngineeringDir)/common/native/init-compiler.sh&quot; &quot;$(RepositoryEngineeringDir)/common/native&quot; $(TargetArchitecture) $(NativeCompiler) &amp;&amp; echo $LDFLAGS' 2>/dev/null"
Comment thread
am11 marked this conversation as resolved.

 EchoOff="true"
 ConsoleToMsBuild="true"
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneLinkerCommand" />
 </Exec>
 </Target>

 <Target Name="GetUnixCrossBuildArgumentsForDNNE"
Expand All@@ -61,7 +68,7 @@

 <PropertyGroup>
 <CommonToolchainArgs>--target=$(TargetTriple) --gcc-toolchain=$(ROOTFS_DIR)/usr --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerCommand) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneCompilerUserFlags>$(CommonToolchainArgs) $(DnneCompilerUserFlags.Replace(';',' '))</DnneCompilerUserFlags>
 </PropertyGroup>
 </Target>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove usages of Ubuntu 16.04 from pipelines#75513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 8 commits into

from

Sep 22, 2022
 Merged


Remove usages of Ubuntu 16.04 from pipelines
#75513
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
161dde2

Remove usages of Ubuntu 16.04 from pipelines


am11 Sep 13, 2022
a4f9bb0

Delete old jenkins scripts


am11 Sep 13, 2022
89a6456

Try with grep


am11 Sep 14, 2022
7d50975

Use attribute(retain)


am11 Sep 14, 2022
d1a7570

Improve handling of /p:CrossBuild=true


am11 Sep 14, 2022
1a63b33

Update images and revert to binutils linker


am11 Sep 15, 2022
fb3838c

Revert __attribute__((retain)) for now


am11 Sep 15, 2022
34e4dbe

Merge dotnet/main into feature/ci/image-updates


am11 Sep 16, 2022

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


6 changes: 6 additions & 0 deletions
eng/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -403,6 +403,12 @@ while [[ $# > 0 ]]; do
 shift 1
 ;;

 *crossbuild=true*)
 crossBuild=1
 extraargs="$extraargs $1"
 shift 1
@am11am11Sep 15, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handled /p:CrossBuild=true this way to support multiple property cases like ./build.sh /p:'RuntimeFlavor=coreclr;CrossBuild=true;Configuration=release'. Ideally, all cross-building CI legs should explicitly pass -cross (which appends /p:CrossBuild=true), but an explicit /p:CrossBuild=true should have the same effect.
 ;;

 -clang*)
 compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged)
 arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
Expand Down

11 changes: 6 additions & 5 deletions
eng/pipelines/common/global-build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,18 +75,19 @@ jobs:
 - name: _osParameter
 value: -os ${{ parameters.osGroup }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_bionic')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-bionic /p:OutputRid=linux-bionic-${{ parameters.archType }}
 value: /p:RuntimeOS=linux-bionic
Comment thread
hoyosjs marked this conversation as resolved.


 # Do not rename as it clashes with MSBuild property in libraries/build-native.proj
 - name: _crossBuildPropertyArg
 value: /p:CrossBuild=${{ parameters.crossBuild }}

 - ${{ if ne(parameters.jobParameters.crossrootfsDir, '') }}:
 # This is only required for cross builds.
 - name: ROOTFS_DIR
 value: ${{ parameters.jobParameters.crossrootfsDir }}

 - name: _cxx11Parameter
 ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'arm64')) }}:
 value: /p:MonoLLVMUseCxx11Abi=true
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ jobs:
 platform: Linux_musl_arm
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
 image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All@@ -165,7 +165,7 @@ jobs:
 platform: Linux_musl_arm64
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
 image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/common/templates/runtimes/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,9 @@ jobs:
 pool: ${{ parameters.pool }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 compilerArg: '-clang9'
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 compilerArg: ''

 # Test jobs should continue on error for internal builds
Expand DownExpand Up@@ -79,8 +79,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-jit-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,8 @@ jobs:
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,8 +93,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ jobs:
 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
 - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 - (Alpine.314.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - (Alpine.314.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19

 # Linux musl arm32
 - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
Expand DownExpand Up@@ -110,7 +110,7 @@ jobs:
 - (Debian.10.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011
 - (Debian.11.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220810215032-f344011
 - Ubuntu.1804.Amd64
 - (Centos.8.Amd64)Ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Centos.8.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Fedora.34.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c
 - RedHat.7.Amd64

Expand Down

20 changes: 5 additions & 15 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,34 +200,24 @@ jobs:
 value: ${{ eq(parameters.osSubgroup, '') }}

 - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}:
 # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to
 # lowercase for RID format. (Detection normally converts, but we're preventing it.)
 - name: OutputRidArg
 value: /p:OutputRid=linux-musl-${{ parameters.archType }}
 - name: RuntimeOSArg
 value: /p:RuntimeOS=linux-musl
 - name: _PortableBuild
 value: true

 - ${{ if eq(parameters.crossBuild, true) }}:
 - name: ArchArg
 value: -arch ${{ parameters.archType }}

 - name: BaseJobBuildCommand
 value: >-
 $(Build.SourcesDirectory)/build.sh -subset host+packs -ci
 $(BuildAction)
 $(ArchArg)
 /p:CrossBuild=${{ parameters.crossBuild }}
 /p:PortableBuild=$(_PortableBuild)
 /p:SkipTests=$(SkipTests)
 $(pgoInstrumentArg)
 $(LiveOverridePathArgs)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 $(RuntimeOSArg)

 - name: PublishArguments
 value: >-
 /p:PortableBuild=$(_PortableBuild)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 /bl:msbuild.publish.binlog

 - name: installersSubsetArg
 value: --subset packs.installers
Expand Down

14 changes: 1 addition & 13 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ jobs:

 - _msbuildCommonParameters: ''
 # rename this variable, due to collision with build-native.proj
 - _runtimeOSArg: ''
 - _osArg: ''
 - _finalFrameworkArg: ''
 - _testModeArg: ''
Expand All@@ -71,12 +70,6 @@ jobs:
 - ${{ if eq(parameters.crossBuild, true) }}:
 - _crossBuildPropertyArg: /p:CrossBuild=true

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - _runtimeOSArg: /p:RuntimeOS=linux-musl

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building
 - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}:
 - _osArg: -os ${{ parameters.osGroup }}
Expand DownExpand Up@@ -111,15 +104,10 @@ jobs:
 - ${{ if ne(parameters.testDisplayName, '') }}:
 - _testRunNamePrefixSuffix: ${{ parameters.testDisplayName }}

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'windows') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10

 # Non-Windows variables
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - _buildScript: ./$(_buildScriptFileName)$(scriptExt)

 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - ${{ parameters.variables }}

 # we need to override this value to support build-coreclr-and-libraries-job.yml
Expand Down

6 changes: 3 additions & 3 deletions
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,10 +74,10 @@ jobs:
 - (Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220908220224-98605e8
 - Ubuntu.2204.Amd64.Open
 - (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220908132354-59ee6b3
 - (Mariner.1.0.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - (Mariner.1.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
 - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - (Centos.7.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - RedHat.7.Amd64.Open
 - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220908132009-59ee6b3
 - Ubuntu.1804.Amd64.Open
Expand Down

3 changes: 2 additions & 1 deletion
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,8 @@
 <PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

3 changes: 2 additions & 1 deletion
src/coreclr/tools/aot/crossgen2/crossgen2.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,8 @@
 <PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

9 changes: 8 additions & 1 deletion
...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,13 @@
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneCompilerCommand" />
 </Exec>

 <Exec Command="bash -c 'source &quot;$(RepositoryEngineeringDir)/common/native/init-compiler.sh&quot; &quot;$(RepositoryEngineeringDir)/common/native&quot; $(TargetArchitecture) $(NativeCompiler) &amp;&amp; echo $LDFLAGS' 2>/dev/null"
Comment thread
am11 marked this conversation as resolved.

 EchoOff="true"
 ConsoleToMsBuild="true"
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneLinkerCommand" />
 </Exec>
 </Target>

 <Target Name="GetUnixCrossBuildArgumentsForDNNE"
Expand All@@ -61,7 +68,7 @@

 <PropertyGroup>
 <CommonToolchainArgs>--target=$(TargetTriple) --gcc-toolchain=$(ROOTFS_DIR)/usr --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerCommand) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneCompilerUserFlags>$(CommonToolchainArgs) $(DnneCompilerUserFlags.Replace(';',' '))</DnneCompilerUserFlags>
 </PropertyGroup>
 </Target>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove usages of Ubuntu 16.04 from pipelines#75513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 8 commits into

from

Sep 22, 2022
 Merged


Remove usages of Ubuntu 16.04 from pipelines
#75513
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
161dde2

Remove usages of Ubuntu 16.04 from pipelines


am11 Sep 13, 2022
a4f9bb0

Delete old jenkins scripts


am11 Sep 13, 2022
89a6456

Try with grep


am11 Sep 14, 2022
7d50975

Use attribute(retain)


am11 Sep 14, 2022
d1a7570

Improve handling of /p:CrossBuild=true


am11 Sep 14, 2022
1a63b33

Update images and revert to binutils linker


am11 Sep 15, 2022
fb3838c

Revert __attribute__((retain)) for now


am11 Sep 15, 2022
34e4dbe

Merge dotnet/main into feature/ci/image-updates


am11 Sep 16, 2022

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


6 changes: 6 additions & 0 deletions
eng/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -403,6 +403,12 @@ while [[ $# > 0 ]]; do
 shift 1
 ;;

 *crossbuild=true*)
 crossBuild=1
 extraargs="$extraargs $1"
 shift 1
@am11am11Sep 15, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handled /p:CrossBuild=true this way to support multiple property cases like ./build.sh /p:'RuntimeFlavor=coreclr;CrossBuild=true;Configuration=release'. Ideally, all cross-building CI legs should explicitly pass -cross (which appends /p:CrossBuild=true), but an explicit /p:CrossBuild=true should have the same effect.
 ;;

 -clang*)
 compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged)
 arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
Expand Down

11 changes: 6 additions & 5 deletions
eng/pipelines/common/global-build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,18 +75,19 @@ jobs:
 - name: _osParameter
 value: -os ${{ parameters.osGroup }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_bionic')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-bionic /p:OutputRid=linux-bionic-${{ parameters.archType }}
 value: /p:RuntimeOS=linux-bionic
Comment thread
hoyosjs marked this conversation as resolved.


 # Do not rename as it clashes with MSBuild property in libraries/build-native.proj
 - name: _crossBuildPropertyArg
 value: /p:CrossBuild=${{ parameters.crossBuild }}

 - ${{ if ne(parameters.jobParameters.crossrootfsDir, '') }}:
 # This is only required for cross builds.
 - name: ROOTFS_DIR
 value: ${{ parameters.jobParameters.crossrootfsDir }}

 - name: _cxx11Parameter
 ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'arm64')) }}:
 value: /p:MonoLLVMUseCxx11Abi=true
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ jobs:
 platform: Linux_musl_arm
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
 image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All@@ -165,7 +165,7 @@ jobs:
 platform: Linux_musl_arm64
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
 image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/common/templates/runtimes/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,9 @@ jobs:
 pool: ${{ parameters.pool }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 compilerArg: '-clang9'
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 compilerArg: ''

 # Test jobs should continue on error for internal builds
Expand DownExpand Up@@ -79,8 +79,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-jit-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,8 @@ jobs:
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,8 +93,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ jobs:
 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
 - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 - (Alpine.314.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - (Alpine.314.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19

 # Linux musl arm32
 - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
Expand DownExpand Up@@ -110,7 +110,7 @@ jobs:
 - (Debian.10.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011
 - (Debian.11.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220810215032-f344011
 - Ubuntu.1804.Amd64
 - (Centos.8.Amd64)Ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Centos.8.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Fedora.34.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c
 - RedHat.7.Amd64

Expand Down

20 changes: 5 additions & 15 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,34 +200,24 @@ jobs:
 value: ${{ eq(parameters.osSubgroup, '') }}

 - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}:
 # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to
 # lowercase for RID format. (Detection normally converts, but we're preventing it.)
 - name: OutputRidArg
 value: /p:OutputRid=linux-musl-${{ parameters.archType }}
 - name: RuntimeOSArg
 value: /p:RuntimeOS=linux-musl
 - name: _PortableBuild
 value: true

 - ${{ if eq(parameters.crossBuild, true) }}:
 - name: ArchArg
 value: -arch ${{ parameters.archType }}

 - name: BaseJobBuildCommand
 value: >-
 $(Build.SourcesDirectory)/build.sh -subset host+packs -ci
 $(BuildAction)
 $(ArchArg)
 /p:CrossBuild=${{ parameters.crossBuild }}
 /p:PortableBuild=$(_PortableBuild)
 /p:SkipTests=$(SkipTests)
 $(pgoInstrumentArg)
 $(LiveOverridePathArgs)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 $(RuntimeOSArg)

 - name: PublishArguments
 value: >-
 /p:PortableBuild=$(_PortableBuild)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 /bl:msbuild.publish.binlog

 - name: installersSubsetArg
 value: --subset packs.installers
Expand Down

14 changes: 1 addition & 13 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ jobs:

 - _msbuildCommonParameters: ''
 # rename this variable, due to collision with build-native.proj
 - _runtimeOSArg: ''
 - _osArg: ''
 - _finalFrameworkArg: ''
 - _testModeArg: ''
Expand All@@ -71,12 +70,6 @@ jobs:
 - ${{ if eq(parameters.crossBuild, true) }}:
 - _crossBuildPropertyArg: /p:CrossBuild=true

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - _runtimeOSArg: /p:RuntimeOS=linux-musl

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building
 - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}:
 - _osArg: -os ${{ parameters.osGroup }}
Expand DownExpand Up@@ -111,15 +104,10 @@ jobs:
 - ${{ if ne(parameters.testDisplayName, '') }}:
 - _testRunNamePrefixSuffix: ${{ parameters.testDisplayName }}

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'windows') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10

 # Non-Windows variables
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - _buildScript: ./$(_buildScriptFileName)$(scriptExt)

 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - ${{ parameters.variables }}

 # we need to override this value to support build-coreclr-and-libraries-job.yml
Expand Down

6 changes: 3 additions & 3 deletions
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,10 +74,10 @@ jobs:
 - (Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220908220224-98605e8
 - Ubuntu.2204.Amd64.Open
 - (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220908132354-59ee6b3
 - (Mariner.1.0.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - (Mariner.1.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
 - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - (Centos.7.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - RedHat.7.Amd64.Open
 - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220908132009-59ee6b3
 - Ubuntu.1804.Amd64.Open
Expand Down

3 changes: 2 additions & 1 deletion
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,8 @@
 <PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

3 changes: 2 additions & 1 deletion
src/coreclr/tools/aot/crossgen2/crossgen2.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,8 @@
 <PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

9 changes: 8 additions & 1 deletion
...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,13 @@
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneCompilerCommand" />
 </Exec>

 <Exec Command="bash -c 'source &quot;$(RepositoryEngineeringDir)/common/native/init-compiler.sh&quot; &quot;$(RepositoryEngineeringDir)/common/native&quot; $(TargetArchitecture) $(NativeCompiler) &amp;&amp; echo $LDFLAGS' 2>/dev/null"
Comment thread
am11 marked this conversation as resolved.

 EchoOff="true"
 ConsoleToMsBuild="true"
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneLinkerCommand" />
 </Exec>
 </Target>

 <Target Name="GetUnixCrossBuildArgumentsForDNNE"
Expand All@@ -61,7 +68,7 @@

 <PropertyGroup>
 <CommonToolchainArgs>--target=$(TargetTriple) --gcc-toolchain=$(ROOTFS_DIR)/usr --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerCommand) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneCompilerUserFlags>$(CommonToolchainArgs) $(DnneCompilerUserFlags.Replace(';',' '))</DnneCompilerUserFlags>
 </PropertyGroup>
 </Target>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove usages of Ubuntu 16.04 from pipelines#75513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 8 commits into

from

Sep 22, 2022
 Merged


Remove usages of Ubuntu 16.04 from pipelines
#75513
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
161dde2

Remove usages of Ubuntu 16.04 from pipelines


am11 Sep 13, 2022
a4f9bb0

Delete old jenkins scripts


am11 Sep 13, 2022
89a6456

Try with grep


am11 Sep 14, 2022
7d50975

Use attribute(retain)


am11 Sep 14, 2022
d1a7570

Improve handling of /p:CrossBuild=true


am11 Sep 14, 2022
1a63b33

Update images and revert to binutils linker


am11 Sep 15, 2022
fb3838c

Revert __attribute__((retain)) for now


am11 Sep 15, 2022
34e4dbe

Merge dotnet/main into feature/ci/image-updates


am11 Sep 16, 2022

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


6 changes: 6 additions & 0 deletions
eng/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -403,6 +403,12 @@ while [[ $# > 0 ]]; do
 shift 1
 ;;

 *crossbuild=true*)
 crossBuild=1
 extraargs="$extraargs $1"
 shift 1
@am11am11Sep 15, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handled /p:CrossBuild=true this way to support multiple property cases like ./build.sh /p:'RuntimeFlavor=coreclr;CrossBuild=true;Configuration=release'. Ideally, all cross-building CI legs should explicitly pass -cross (which appends /p:CrossBuild=true), but an explicit /p:CrossBuild=true should have the same effect.
 ;;

 -clang*)
 compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged)
 arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
Expand Down

11 changes: 6 additions & 5 deletions
eng/pipelines/common/global-build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,18 +75,19 @@ jobs:
 - name: _osParameter
 value: -os ${{ parameters.osGroup }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_bionic')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-bionic /p:OutputRid=linux-bionic-${{ parameters.archType }}
 value: /p:RuntimeOS=linux-bionic
Comment thread
hoyosjs marked this conversation as resolved.


 # Do not rename as it clashes with MSBuild property in libraries/build-native.proj
 - name: _crossBuildPropertyArg
 value: /p:CrossBuild=${{ parameters.crossBuild }}

 - ${{ if ne(parameters.jobParameters.crossrootfsDir, '') }}:
 # This is only required for cross builds.
 - name: ROOTFS_DIR
 value: ${{ parameters.jobParameters.crossrootfsDir }}

 - name: _cxx11Parameter
 ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'arm64')) }}:
 value: /p:MonoLLVMUseCxx11Abi=true
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ jobs:
 platform: Linux_musl_arm
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
 image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All@@ -165,7 +165,7 @@ jobs:
 platform: Linux_musl_arm64
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
 image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/common/templates/runtimes/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,9 @@ jobs:
 pool: ${{ parameters.pool }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 compilerArg: '-clang9'
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 compilerArg: ''

 # Test jobs should continue on error for internal builds
Expand DownExpand Up@@ -79,8 +79,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-jit-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,8 @@ jobs:
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,8 +93,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ jobs:
 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
 - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 - (Alpine.314.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - (Alpine.314.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19

 # Linux musl arm32
 - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
Expand DownExpand Up@@ -110,7 +110,7 @@ jobs:
 - (Debian.10.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011
 - (Debian.11.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220810215032-f344011
 - Ubuntu.1804.Amd64
 - (Centos.8.Amd64)Ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Centos.8.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Fedora.34.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c
 - RedHat.7.Amd64

Expand Down

20 changes: 5 additions & 15 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,34 +200,24 @@ jobs:
 value: ${{ eq(parameters.osSubgroup, '') }}

 - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}:
 # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to
 # lowercase for RID format. (Detection normally converts, but we're preventing it.)
 - name: OutputRidArg
 value: /p:OutputRid=linux-musl-${{ parameters.archType }}
 - name: RuntimeOSArg
 value: /p:RuntimeOS=linux-musl
 - name: _PortableBuild
 value: true

 - ${{ if eq(parameters.crossBuild, true) }}:
 - name: ArchArg
 value: -arch ${{ parameters.archType }}

 - name: BaseJobBuildCommand
 value: >-
 $(Build.SourcesDirectory)/build.sh -subset host+packs -ci
 $(BuildAction)
 $(ArchArg)
 /p:CrossBuild=${{ parameters.crossBuild }}
 /p:PortableBuild=$(_PortableBuild)
 /p:SkipTests=$(SkipTests)
 $(pgoInstrumentArg)
 $(LiveOverridePathArgs)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 $(RuntimeOSArg)

 - name: PublishArguments
 value: >-
 /p:PortableBuild=$(_PortableBuild)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 /bl:msbuild.publish.binlog

 - name: installersSubsetArg
 value: --subset packs.installers
Expand Down

14 changes: 1 addition & 13 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ jobs:

 - _msbuildCommonParameters: ''
 # rename this variable, due to collision with build-native.proj
 - _runtimeOSArg: ''
 - _osArg: ''
 - _finalFrameworkArg: ''
 - _testModeArg: ''
Expand All@@ -71,12 +70,6 @@ jobs:
 - ${{ if eq(parameters.crossBuild, true) }}:
 - _crossBuildPropertyArg: /p:CrossBuild=true

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - _runtimeOSArg: /p:RuntimeOS=linux-musl

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building
 - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}:
 - _osArg: -os ${{ parameters.osGroup }}
Expand DownExpand Up@@ -111,15 +104,10 @@ jobs:
 - ${{ if ne(parameters.testDisplayName, '') }}:
 - _testRunNamePrefixSuffix: ${{ parameters.testDisplayName }}

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'windows') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10

 # Non-Windows variables
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - _buildScript: ./$(_buildScriptFileName)$(scriptExt)

 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - ${{ parameters.variables }}

 # we need to override this value to support build-coreclr-and-libraries-job.yml
Expand Down

6 changes: 3 additions & 3 deletions
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,10 +74,10 @@ jobs:
 - (Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220908220224-98605e8
 - Ubuntu.2204.Amd64.Open
 - (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220908132354-59ee6b3
 - (Mariner.1.0.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - (Mariner.1.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
 - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - (Centos.7.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - RedHat.7.Amd64.Open
 - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220908132009-59ee6b3
 - Ubuntu.1804.Amd64.Open
Expand Down

3 changes: 2 additions & 1 deletion
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,8 @@
 <PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

3 changes: 2 additions & 1 deletion
src/coreclr/tools/aot/crossgen2/crossgen2.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,8 @@
 <PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

9 changes: 8 additions & 1 deletion
...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,13 @@
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneCompilerCommand" />
 </Exec>

 <Exec Command="bash -c 'source &quot;$(RepositoryEngineeringDir)/common/native/init-compiler.sh&quot; &quot;$(RepositoryEngineeringDir)/common/native&quot; $(TargetArchitecture) $(NativeCompiler) &amp;&amp; echo $LDFLAGS' 2>/dev/null"
Comment thread
am11 marked this conversation as resolved.

 EchoOff="true"
 ConsoleToMsBuild="true"
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneLinkerCommand" />
 </Exec>
 </Target>

 <Target Name="GetUnixCrossBuildArgumentsForDNNE"
Expand All@@ -61,7 +68,7 @@

 <PropertyGroup>
 <CommonToolchainArgs>--target=$(TargetTriple) --gcc-toolchain=$(ROOTFS_DIR)/usr --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerCommand) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneCompilerUserFlags>$(CommonToolchainArgs) $(DnneCompilerUserFlags.Replace(';',' '))</DnneCompilerUserFlags>
 </PropertyGroup>
 </Target>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove usages of Ubuntu 16.04 from pipelines#75513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 8 commits into

from

Sep 22, 2022
 Merged


Remove usages of Ubuntu 16.04 from pipelines
#75513
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
161dde2

Remove usages of Ubuntu 16.04 from pipelines


am11 Sep 13, 2022
a4f9bb0

Delete old jenkins scripts


am11 Sep 13, 2022
89a6456

Try with grep


am11 Sep 14, 2022
7d50975

Use attribute(retain)


am11 Sep 14, 2022
d1a7570

Improve handling of /p:CrossBuild=true


am11 Sep 14, 2022
1a63b33

Update images and revert to binutils linker


am11 Sep 15, 2022
fb3838c

Revert __attribute__((retain)) for now


am11 Sep 15, 2022
34e4dbe

Merge dotnet/main into feature/ci/image-updates


am11 Sep 16, 2022

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


6 changes: 6 additions & 0 deletions
eng/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -403,6 +403,12 @@ while [[ $# > 0 ]]; do
 shift 1
 ;;

 *crossbuild=true*)
 crossBuild=1
 extraargs="$extraargs $1"
 shift 1
@am11am11Sep 15, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handled /p:CrossBuild=true this way to support multiple property cases like ./build.sh /p:'RuntimeFlavor=coreclr;CrossBuild=true;Configuration=release'. Ideally, all cross-building CI legs should explicitly pass -cross (which appends /p:CrossBuild=true), but an explicit /p:CrossBuild=true should have the same effect.
 ;;

 -clang*)
 compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged)
 arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
Expand Down

11 changes: 6 additions & 5 deletions
eng/pipelines/common/global-build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,18 +75,19 @@ jobs:
 - name: _osParameter
 value: -os ${{ parameters.osGroup }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_bionic')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-bionic /p:OutputRid=linux-bionic-${{ parameters.archType }}
 value: /p:RuntimeOS=linux-bionic
Comment thread
hoyosjs marked this conversation as resolved.


 # Do not rename as it clashes with MSBuild property in libraries/build-native.proj
 - name: _crossBuildPropertyArg
 value: /p:CrossBuild=${{ parameters.crossBuild }}

 - ${{ if ne(parameters.jobParameters.crossrootfsDir, '') }}:
 # This is only required for cross builds.
 - name: ROOTFS_DIR
 value: ${{ parameters.jobParameters.crossrootfsDir }}

 - name: _cxx11Parameter
 ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'arm64')) }}:
 value: /p:MonoLLVMUseCxx11Abi=true
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ jobs:
 platform: Linux_musl_arm
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
 image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All@@ -165,7 +165,7 @@ jobs:
 platform: Linux_musl_arm64
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
 image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/common/templates/runtimes/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,9 @@ jobs:
 pool: ${{ parameters.pool }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 compilerArg: '-clang9'
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 compilerArg: ''

 # Test jobs should continue on error for internal builds
Expand DownExpand Up@@ -79,8 +79,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-jit-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,8 @@ jobs:
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,8 +93,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ jobs:
 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
 - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 - (Alpine.314.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - (Alpine.314.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19

 # Linux musl arm32
 - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
Expand DownExpand Up@@ -110,7 +110,7 @@ jobs:
 - (Debian.10.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011
 - (Debian.11.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220810215032-f344011
 - Ubuntu.1804.Amd64
 - (Centos.8.Amd64)Ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Centos.8.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Fedora.34.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c
 - RedHat.7.Amd64

Expand Down

20 changes: 5 additions & 15 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,34 +200,24 @@ jobs:
 value: ${{ eq(parameters.osSubgroup, '') }}

 - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}:
 # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to
 # lowercase for RID format. (Detection normally converts, but we're preventing it.)
 - name: OutputRidArg
 value: /p:OutputRid=linux-musl-${{ parameters.archType }}
 - name: RuntimeOSArg
 value: /p:RuntimeOS=linux-musl
 - name: _PortableBuild
 value: true

 - ${{ if eq(parameters.crossBuild, true) }}:
 - name: ArchArg
 value: -arch ${{ parameters.archType }}

 - name: BaseJobBuildCommand
 value: >-
 $(Build.SourcesDirectory)/build.sh -subset host+packs -ci
 $(BuildAction)
 $(ArchArg)
 /p:CrossBuild=${{ parameters.crossBuild }}
 /p:PortableBuild=$(_PortableBuild)
 /p:SkipTests=$(SkipTests)
 $(pgoInstrumentArg)
 $(LiveOverridePathArgs)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 $(RuntimeOSArg)

 - name: PublishArguments
 value: >-
 /p:PortableBuild=$(_PortableBuild)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 /bl:msbuild.publish.binlog

 - name: installersSubsetArg
 value: --subset packs.installers
Expand Down

14 changes: 1 addition & 13 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ jobs:

 - _msbuildCommonParameters: ''
 # rename this variable, due to collision with build-native.proj
 - _runtimeOSArg: ''
 - _osArg: ''
 - _finalFrameworkArg: ''
 - _testModeArg: ''
Expand All@@ -71,12 +70,6 @@ jobs:
 - ${{ if eq(parameters.crossBuild, true) }}:
 - _crossBuildPropertyArg: /p:CrossBuild=true

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - _runtimeOSArg: /p:RuntimeOS=linux-musl

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building
 - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}:
 - _osArg: -os ${{ parameters.osGroup }}
Expand DownExpand Up@@ -111,15 +104,10 @@ jobs:
 - ${{ if ne(parameters.testDisplayName, '') }}:
 - _testRunNamePrefixSuffix: ${{ parameters.testDisplayName }}

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'windows') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10

 # Non-Windows variables
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - _buildScript: ./$(_buildScriptFileName)$(scriptExt)

 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - ${{ parameters.variables }}

 # we need to override this value to support build-coreclr-and-libraries-job.yml
Expand Down

6 changes: 3 additions & 3 deletions
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,10 +74,10 @@ jobs:
 - (Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220908220224-98605e8
 - Ubuntu.2204.Amd64.Open
 - (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220908132354-59ee6b3
 - (Mariner.1.0.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - (Mariner.1.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
 - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - (Centos.7.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - RedHat.7.Amd64.Open
 - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220908132009-59ee6b3
 - Ubuntu.1804.Amd64.Open
Expand Down

3 changes: 2 additions & 1 deletion
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,8 @@
 <PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

3 changes: 2 additions & 1 deletion
src/coreclr/tools/aot/crossgen2/crossgen2.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,8 @@
 <PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

9 changes: 8 additions & 1 deletion
...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,13 @@
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneCompilerCommand" />
 </Exec>

 <Exec Command="bash -c 'source &quot;$(RepositoryEngineeringDir)/common/native/init-compiler.sh&quot; &quot;$(RepositoryEngineeringDir)/common/native&quot; $(TargetArchitecture) $(NativeCompiler) &amp;&amp; echo $LDFLAGS' 2>/dev/null"
Comment thread
am11 marked this conversation as resolved.

 EchoOff="true"
 ConsoleToMsBuild="true"
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneLinkerCommand" />
 </Exec>
 </Target>

 <Target Name="GetUnixCrossBuildArgumentsForDNNE"
Expand All@@ -61,7 +68,7 @@

 <PropertyGroup>
 <CommonToolchainArgs>--target=$(TargetTriple) --gcc-toolchain=$(ROOTFS_DIR)/usr --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerCommand) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneCompilerUserFlags>$(CommonToolchainArgs) $(DnneCompilerUserFlags.Replace(';',' '))</DnneCompilerUserFlags>
 </PropertyGroup>
 </Target>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove usages of Ubuntu 16.04 from pipelines#75513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 8 commits into

from

Sep 22, 2022
 Merged


Remove usages of Ubuntu 16.04 from pipelines
#75513
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
161dde2

Remove usages of Ubuntu 16.04 from pipelines


am11 Sep 13, 2022
a4f9bb0

Delete old jenkins scripts


am11 Sep 13, 2022
89a6456

Try with grep


am11 Sep 14, 2022
7d50975

Use attribute(retain)


am11 Sep 14, 2022
d1a7570

Improve handling of /p:CrossBuild=true


am11 Sep 14, 2022
1a63b33

Update images and revert to binutils linker


am11 Sep 15, 2022
fb3838c

Revert __attribute__((retain)) for now


am11 Sep 15, 2022
34e4dbe

Merge dotnet/main into feature/ci/image-updates


am11 Sep 16, 2022

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


6 changes: 6 additions & 0 deletions
eng/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -403,6 +403,12 @@ while [[ $# > 0 ]]; do
 shift 1
 ;;

 *crossbuild=true*)
 crossBuild=1
 extraargs="$extraargs $1"
 shift 1
@am11am11Sep 15, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Handled /p:CrossBuild=true this way to support multiple property cases like ./build.sh /p:'RuntimeFlavor=coreclr;CrossBuild=true;Configuration=release'. Ideally, all cross-building CI legs should explicitly pass -cross (which appends /p:CrossBuild=true), but an explicit /p:CrossBuild=true should have the same effect.
 ;;

 -clang*)
 compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged)
 arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
Expand Down

11 changes: 6 additions & 5 deletions
eng/pipelines/common/global-build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,18 +75,19 @@ jobs:
 - name: _osParameter
 value: -os ${{ parameters.osGroup }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_bionic')) }}:
 - name: _osParameter
 value: /p:RuntimeOS=linux-bionic /p:OutputRid=linux-bionic-${{ parameters.archType }}
 value: /p:RuntimeOS=linux-bionic
Comment thread
hoyosjs marked this conversation as resolved.


 # Do not rename as it clashes with MSBuild property in libraries/build-native.proj
 - name: _crossBuildPropertyArg
 value: /p:CrossBuild=${{ parameters.crossBuild }}

 - ${{ if ne(parameters.jobParameters.crossrootfsDir, '') }}:
 # This is only required for cross builds.
 - name: ROOTFS_DIR
 value: ${{ parameters.jobParameters.crossrootfsDir }}

 - name: _cxx11Parameter
 ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'arm64')) }}:
 value: /p:MonoLLVMUseCxx11Abi=true
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ jobs:
 platform: Linux_musl_arm
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
 image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All@@ -165,7 +165,7 @@ jobs:
 platform: Linux_musl_arm64
 shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 container:
 image: ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
 image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/common/templates/runtimes/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,9 +39,9 @@ jobs:
 pool: ${{ parameters.pool }}
 dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX'))) }}:
 compilerArg: '-clang9'
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX')))) }}:
 compilerArg: ''

 # Test jobs should continue on error for internal builds
Expand DownExpand Up@@ -79,8 +79,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-jit-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,8 @@ jobs:
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,8 +93,8 @@ jobs:
 - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
 - name: compilerArg
 value: '-clang9'
 # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64')) }}:
 # We need to use the stable version available on Alpine Linux
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}:
 - name: compilerArg
 value: ''
 # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ jobs:
 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
 - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 - (Alpine.314.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
 - (Alpine.314.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19

 # Linux musl arm32
 - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
Expand DownExpand Up@@ -110,7 +110,7 @@ jobs:
 - (Debian.10.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220810215022-f344011
 - (Debian.11.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220810215032-f344011
 - Ubuntu.1804.Amd64
 - (Centos.8.Amd64)Ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Centos.8.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
 - (Fedora.34.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220809205730-e7e8d1c
 - RedHat.7.Amd64

Expand Down

20 changes: 5 additions & 15 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,34 +200,24 @@ jobs:
 value: ${{ eq(parameters.osSubgroup, '') }}

 - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}:
 # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to
 # lowercase for RID format. (Detection normally converts, but we're preventing it.)
 - name: OutputRidArg
 value: /p:OutputRid=linux-musl-${{ parameters.archType }}
 - name: RuntimeOSArg
 value: /p:RuntimeOS=linux-musl
 - name: _PortableBuild
 value: true

 - ${{ if eq(parameters.crossBuild, true) }}:
 - name: ArchArg
 value: -arch ${{ parameters.archType }}

 - name: BaseJobBuildCommand
 value: >-
 $(Build.SourcesDirectory)/build.sh -subset host+packs -ci
 $(BuildAction)
 $(ArchArg)
 /p:CrossBuild=${{ parameters.crossBuild }}
 /p:PortableBuild=$(_PortableBuild)
 /p:SkipTests=$(SkipTests)
 $(pgoInstrumentArg)
 $(LiveOverridePathArgs)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 $(RuntimeOSArg)

 - name: PublishArguments
 value: >-
 /p:PortableBuild=$(_PortableBuild)
 $(CommonMSBuildArgs)
 $(OutputRidArg)
 /bl:msbuild.publish.binlog

 - name: installersSubsetArg
 value: --subset packs.installers
Expand Down

14 changes: 1 addition & 13 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ jobs:

 - _msbuildCommonParameters: ''
 # rename this variable, due to collision with build-native.proj
 - _runtimeOSArg: ''
 - _osArg: ''
 - _finalFrameworkArg: ''
 - _testModeArg: ''
Expand All@@ -71,12 +70,6 @@ jobs:
 - ${{ if eq(parameters.crossBuild, true) }}:
 - _crossBuildPropertyArg: /p:CrossBuild=true

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
 - _runtimeOSArg: /p:RuntimeOS=linux-musl

 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building
 - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}:
 - _osArg: -os ${{ parameters.osGroup }}
Expand DownExpand Up@@ -111,15 +104,10 @@ jobs:
 - ${{ if ne(parameters.testDisplayName, '') }}:
 - _testRunNamePrefixSuffix: ${{ parameters.testDisplayName }}

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'windows') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10

 # Non-Windows variables
 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - _buildScript: ./$(_buildScriptFileName)$(scriptExt)

 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
 - ${{ parameters.variables }}

 # we need to override this value to support build-coreclr-and-libraries-job.yml
Expand Down

6 changes: 3 additions & 3 deletions
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,10 +74,10 @@ jobs:
 - (Fedora.34.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix-20220908220224-98605e8
 - Ubuntu.2204.Amd64.Open
 - (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220908132354-59ee6b3
 - (Mariner.1.0.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - (Mariner.1.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
 - (openSUSE.15.2.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64-20220912173041-1d2766c
 - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
 - (Centos.7.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - (Centos.7.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20220601183719-dde38af
 - RedHat.7.Amd64.Open
 - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20220908132009-59ee6b3
 - Ubuntu.1804.Amd64.Open
Expand Down

3 changes: 2 additions & 1 deletion
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,8 @@
 <PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

3 changes: 2 additions & 1 deletion
src/coreclr/tools/aot/crossgen2/crossgen2.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,8 @@
 <PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
 <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
 <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' == 'linux-musl-arm64'">clang-15</CppCompilerAndLinker>
 <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows' and '$(RuntimeIdentifier)' != 'linux-musl-arm64'">clang-9</CppCompilerAndLinker>
 <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
Expand Down

9 changes: 8 additions & 1 deletion
...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,13 @@
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneCompilerCommand" />
 </Exec>

 <Exec Command="bash -c 'source &quot;$(RepositoryEngineeringDir)/common/native/init-compiler.sh&quot; &quot;$(RepositoryEngineeringDir)/common/native&quot; $(TargetArchitecture) $(NativeCompiler) &amp;&amp; echo $LDFLAGS' 2>/dev/null"
Comment thread
am11 marked this conversation as resolved.

 EchoOff="true"
 ConsoleToMsBuild="true"
 StandardOutputImportance="Low">
 <Output TaskParameter="ConsoleOutput" PropertyName="DnneLinkerCommand" />
 </Exec>
 </Target>

 <Target Name="GetUnixCrossBuildArgumentsForDNNE"
Expand All@@ -61,7 +68,7 @@

 <PropertyGroup>
 <CommonToolchainArgs>--target=$(TargetTriple) --gcc-toolchain=$(ROOTFS_DIR)/usr --sysroot=$(ROOTFS_DIR)</CommonToolchainArgs>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneLinkerUserFlags>$(CommonToolchainArgs) $(DnneLinkerCommand) $(DnneLinkerUserFlags.Replace(';',' '))</DnneLinkerUserFlags>
 <DnneCompilerUserFlags>$(CommonToolchainArgs) $(DnneCompilerUserFlags.Replace(';',' '))</DnneCompilerUserFlags>
 </PropertyGroup>
 </Target>
Expand Down
Loading