Skip to content
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.

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

Remove IsRuntimeRepository checks #43

Merged
merged 4 commits into from
Nov 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .dotnet-runtime-placeholder

This file was deleted.

2 changes: 1 addition & 1 deletion eng/helixcorefxtests.proj
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
-->
<ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
<ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
<ProjectDir>$(ProjectDir)\src\coreclr\</ProjectDir>
<RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
<TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
<TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand Down
5 changes: 0 additions & 5 deletions eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ jobs:
- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)/src/coreclr'

- ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)'

- name: coreClrRepoRootDir
value: '$(coreClrRepoRoot)$(dir)'

Expand Down
22 changes: 6 additions & 16 deletions eng/pipelines/installer/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ trigger:
branches:
include:
- master
- release/3.*
- release/*.*
paths:
include:
- '*'
- docs/installer/manpages/*
- Documentation/manpages/*
exclude:
- Documentation/*
- src/coreclr/*
- src/libraries/*
- eng/pipelines/coreclr/*
Expand All @@ -24,14 +22,12 @@ pr:
branches:
include:
- master
- release/3.*
- release/*.*
paths:
include:
- '*'
- docs/installer/manpages/*
- Documentation/manpages/*
exclude:
- Documentation/*
- src/coreclr/*
- src/libraries/*
- eng/pipelines/coreclr/*
Expand Down Expand Up @@ -72,16 +68,10 @@ variables:
# Values for SDLValidationParameters
- group: core-setup-sdl-validation

- ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
- name: pipelinesPath
value: /eng/pipelines/installer
- name: buildScriptFileName
value: installer
- ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
- name: pipelinesPath
value: /eng/pipelines
- name: buildScriptFileName
value: build
- name: pipelinesPath
value: /eng/pipelines/installer
- name: buildScriptFileName
value: installer

stages:
- stage: Build
Expand Down
14 changes: 4 additions & 10 deletions eng/pipelines/installer/jobs/bash-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ parameters:
packageDistroList: null
skipTests: $(SkipTests)
strategy:
matrix:
matrix:
debug:
_BuildConfig: Debug
release:
Expand Down Expand Up @@ -45,15 +45,12 @@ jobs:
$(PreserveNuGetAuthDockerArgs)
${{ parameters.additionalRunArgs }}
${{ parameters.dockerImage }}

${{ if eq(parameters.name, 'FreeBSD_x64')}}:
RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
BuildScript: ./eng/install-nuget-credprovider-then-build.sh
${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
MSBuildScript: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh

${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}:
Expand Down Expand Up @@ -97,10 +94,7 @@ jobs:
-w=/root/runtime
$(PreserveNuGetAuthDockerArgs)

${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
installersSubsetArg: --subset Installers
${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
installersSubsetArg: /p:Subset=Installer
installersSubsetArg: --subset Installers

steps:

Expand Down
13 changes: 3 additions & 10 deletions eng/pipelines/libraries/.azure-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ trigger:
branches:
include:
- master
- release/3.* # TODO: (Consolidation) Remove when consolidated
- release/*.*
paths:
exclude:
- Documentation/* # TODO: (Consolidation) Remove when consolidated
- docs/*
- CODE-OF-CONDUCT.md
- CONTRIBUTING.md
Expand All @@ -28,10 +27,9 @@ pr:
branches:
include:
- master
- release/3.* # TODO: (Consolidation) Remove when consolidated
- release/*.*
paths:
exclude:
- Documentation/* # TODO: (Consolidation) Remove when consolidated
- docs/*
- CODE-OF-CONDUCT.md
- CONTRIBUTING.md
Expand Down Expand Up @@ -69,12 +67,7 @@ resources:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-a50a721-20191023143845

variables:
- ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}: # TODO: (Consolidation) remove this condition
- template: variables.yml

# TODO: (Consolidation) remove this conditional block
- ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
- template: /eng/pipelines/variables.yml
- template: variables.yml

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
- group: DotNet-Blob-Feed
Expand Down
64 changes: 20 additions & 44 deletions eng/pipelines/libraries/corefx-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,50 +186,26 @@ jobs:
artifactType: container
condition: and(succeeded(), eq(variables['_publishTests'], 'true'))

- ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}: # TODO: (Consolidation) remove.
- template: /eng/pipelines/libraries/helix.yml
parameters:
# send tests to helix only on public builds, official scheduled builds or manual official builds.
condition: eq(${{ parameters.isOfficialBuild }}, False)
targetOS: ${{ parameters.targetOS }}
archGroup: $(_architecture)
configuration: $(_BuildConfig)
helixQueues: $(_helixQueues)
msbuildScript: $(_msbuildCommand)
framework: $(_framework)
testScope: ${{ coalesce(parameters.testScope, 'innerloop') }} # if parameters.testScope is empty use 'innerloop'

${{ if eq(parameters.isOfficialBuild, 'true') }}:
officialBuildId: $(Build.BuildNumber)
helixToken: $(HelixApiAccessToken)

${{ if eq(parameters.isOfficialBuild, 'false') }}:
# TODO: SET Creator to the PR owner whenever Azure DevOps supports a good way to retrieve it.
creator: dotnet-bot
helixToken: ''

# TODO: (Consolidation) remove this if block when consolidated
- ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
- template: /eng/pipelines/helix.yml
parameters:
# send tests to helix only on public builds, official scheduled builds or manual official builds.
condition: eq(${{ parameters.isOfficialBuild }}, False)
targetOS: ${{ parameters.targetOS }}
archGroup: $(_architecture)
configuration: $(_BuildConfig)
helixQueues: $(_helixQueues)
msbuildScript: $(_msbuildCommand)
framework: $(_framework)
testScope: ${{ coalesce(parameters.testScope, 'innerloop') }} # if parameters.testScope is empty use 'innerloop'

${{ if eq(parameters.isOfficialBuild, 'true') }}:
officialBuildId: $(Build.BuildNumber)
helixToken: $(HelixApiAccessToken)

${{ if eq(parameters.isOfficialBuild, 'false') }}:
# TODO: SET Creator to the PR owner whenever Azure DevOps supports a good way to retrieve it.
creator: dotnet-bot
helixToken: ''
- template: /eng/pipelines/libraries/helix.yml
parameters:
# send tests to helix only on public builds, official scheduled builds or manual official builds.
condition: eq(${{ parameters.isOfficialBuild }}, False)
targetOS: ${{ parameters.targetOS }}
archGroup: $(_architecture)
configuration: $(_BuildConfig)
helixQueues: $(_helixQueues)
msbuildScript: $(_msbuildCommand)
framework: $(_framework)
testScope: ${{ coalesce(parameters.testScope, 'innerloop') }} # if parameters.testScope is empty use 'innerloop'

${{ if eq(parameters.isOfficialBuild, 'true') }}:
officialBuildId: $(Build.BuildNumber)
helixToken: $(HelixApiAccessToken)

${{ if eq(parameters.isOfficialBuild, 'false') }}:
# TODO: SET Creator to the PR owner whenever Azure DevOps supports a good way to retrieve it.
creator: dotnet-bot
helixToken: ''

- ${{ if eq(parameters.isOfficialBuild, 'true') }}:
- task: PublishBuildArtifacts@1
Expand Down
22 changes: 6 additions & 16 deletions eng/pipelines/libraries/variables.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
variables:
- ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}: # TODO: (Consolidation) Remove condition when consolidated
- name: buildScriptFileName
value: libraries
- name: sourcesRoot
value: $(Build.SourcesDirectory)/src/libraries
- name: pipelinesPath
value: /eng/pipelines/libraries

# TODO: (Consolidation) Remove when consolidated
- ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
- name: buildScriptFileName
value: build
- name: sourcesRoot
value: $(Build.SourcesDirectory)/src
- name: pipelinesPath
value: /eng/pipelines
- name: buildScriptFileName
value: libraries
- name: sourcesRoot
value: $(Build.SourcesDirectory)/src/libraries
- name: pipelinesPath
value: /eng/pipelines/libraries
4 changes: 1 addition & 3 deletions src/coreclr/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<Project>

<!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
<PropertyGroup>
<IsRuntimeRepository Condition="Exists('$(MSBuildThisFileDirectory)..\..\.dotnet-runtime-placeholder')">true</IsRuntimeRepository>
<SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
</PropertyGroup>
<Import Project="..\..\Directory.Build.props" Condition="'$(IsRuntimeRepository)' == 'true'" />
<Import Project="..\..\Directory.Build.props" />

<!-- Ensure our properties are set before Arcade defines defaults -->
<Import Project="dir.common.props" />
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
<Import Project="..\..\Directory.Build.targets" Condition="'$(IsRuntimeRepository)' == 'true'" />
<Import Project="..\..\Directory.Build.targets" />

<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />

Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/build-packages.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ setlocal EnableDelayedExpansion
set "__ProjectDir=%~dp0"
set "__RepoRootDir=%~dp0..\..\"

rem Remove after repo consolidation
if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir=!__ProjectDir!" )

set "__args=%*"
set processedArgs=
set unprocessedArgs=
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/build-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ initDistroRid()
__ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
__RepoRootDir=${__ProjectRoot}/../..

# BEGIN SECTION to remove after repo consolidation
if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
__RepoRootDir=${__ProjectRoot}
fi
# END SECTION to remove after repo consolidation

__IsPortableBuild=1
__CrossBuild=0

Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/build-test.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ set "__ProjectDir=%~dp0"
if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
set "__RepoRootDir=%__ProjectDir%\..\.."

rem Remove after repo consolidation
if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir=!__ProjectDir!" )

set "__TestDir=%__ProjectDir%\tests"
set "__ProjectFilesDir=%__TestDir%"
set "__SourceDir=%__ProjectDir%\src"
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -584,12 +584,6 @@ usage_list+=("-skiprestorepackages - skip package restore.")
__ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
__RepoRootDir=${__ProjectRoot}/../..

# BEGIN SECTION to remove after repo consolidation
if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
__RepoRootDir=${__ProjectRoot}
fi
# END SECTION to remove after repo consolidation

handle_arguments() {
case $1 in
buildtestwrappersonly|-buildtestwrappersonly)
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ set "__ProjectDir=%~dp0"
if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
set "__RepoRootDir=%__ProjectDir%\..\.."

rem Remove after repo consolidation
if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir=!__ProjectDir!" )

set "__ProjectFilesDir=%__ProjectDir%"
set "__SourceDir=%__ProjectDir%\src"
set "__RootBinDir=%__ProjectDir%\bin"
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -581,12 +581,6 @@ __ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# Some paths are relative to the main repo root
__RepoRootDir="${__ProjectRoot}/../.."

# BEGIN SECTION to remove after repo consolidation
if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
__RepoRootDir=${__ProjectRoot}
fi
# END SECTION to remove after repo consolidation

__BuildArch=
__BuildType=Debug
__CodeCoverage=
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/dotnet.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ setlocal
set "__ProjectDir=%~dp0"
set "__RepoRootDir=%__ProjectDir%..\..\"

rem Remove after repo consolidation
if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir=%__ProjectDir%" )

:: Clear the 'Platform' env variable for this session, as it's a per-project setting within the build, and
:: misleading value (such as 'MCD' in HP PCs) may lead to build breakage (issue: #69).
set Platform=
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/dotnet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ working_tree_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
__ProjectDir=${working_tree_root}
__RepoRootDir=${working_tree_root}/../..

# BEGIN SECTION to remove after repo consolidation
if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
__RepoRootDir=${__ProjectDir}
fi
# END SECTION to remove after repo consolidation

# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
export DOTNET_MULTILEVEL_LOOKUP=0

Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/src/pal/tools/gen-buildsys.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ fi
__CoreClrDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../.."
__RepoRootDir=${__CoreClrDir}/../..

# BEGIN SECTION to remove after repo consolidation
if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
__RepoRootDir=${__CoreClrDir}
fi
# END SECTION to remove after repo consolidation

build_arch="$3"
buildtype=DEBUG
code_coverage=OFF
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/tests/scripts/arm32_ci_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,6 @@ function run_tests_using_docker {

__RepoRootDir=./../..

# BEGIN SECTION to remove after repo consolidation
if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
__RepoRootDir=.
fi
# END SECTION to remove after repo consolidation

#Define script variables
__ciMode="emulator"
__ARMEmulRootfs=/mnt/arm-emulator-rootfs
Expand Down
Loading