diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj similarity index 100% rename from src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj rename to src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 56e00219f..104bc1d74 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -105,7 +105,7 @@ if [ "$buildBootstrap" == "true" ]; then echo " Building bootstrap previously source-built in $workingDir" # Copy bootstrap project to working dir - cp $SCRIPT_ROOT/scripts/bootstrap/buildBootstrapPreviouslySB.csproj $workingDir + cp $SCRIPT_ROOT/eng/bootstrap/buildBootstrapPreviouslySB.csproj $workingDir # Copy NuGet.config from the installer repo to have the right feeds cp $SCRIPT_ROOT/src/installer.*/NuGet.config $workingDir diff --git a/src/SourceBuild/tarball/content/scripts/docker/docker-run.cmd b/src/SourceBuild/tarball/content/scripts/docker/docker-run.cmd deleted file mode 100644 index e7c0d21bb..000000000 --- a/src/SourceBuild/tarball/content/scripts/docker/docker-run.cmd +++ /dev/null @@ -1,47 +0,0 @@ - -@echo off -setlocal - -set SCRIPT_ROOT=%~dp0 -set REPO_ROOT=%SCRIPT_ROOT%..\..\ - -:arg_loop -set SET_DOCKERFILE= -set SET_DOCKERIMAGE= -if /I "%1" equ "-d" (set SET_DOCKERFILE=1) -if /I "%1" equ "--dockerfile" (set SET_DOCKERFILE=1) -if "%SET_DOCKERFILE%" == "1" ( - echo "1: %1 2: %2" - set DOCKER_FILE=%2 - shift /1 - shift /1 - goto :arg_loop -) -if /I "%1" equ "-i" (set SET_DOCKERIMAGE=1) -if /I "%1" equ "--image" (set SET_DOCKERIMAGE=1) -if "%SET_DOCKERIMAGE%" == "1" ( - set DOCKER_IMAGE=%2 - shift /1 - shift /1 - goto :arg_loop -) - -if "%DOCKER_FILE%" == "" ( - echo Missing required parameter --dockerfile [docker file dir] - exit /b 1 -) -if "%DOCKER_IMAGE%" == "" ( - echo Missing required parameter --image [image name] - exit /b 1 -) - -if EXIST "%DOCKER_FILE%\Dockerfile" ( - docker build -q -f %DOCKER_FILE%\Dockerfile -t %DOCKER_IMAGE% %DOCKER_FILE% -) else ( - echo Error: %DOCKER_FILE%\Dockerfile does not exist - exit /b 1 -) - -docker run -i -t --rm --init -v %REPO_ROOT%:/code -t -w /code %DOCKER_IMAGE% /bin/sh -endlocal - diff --git a/src/SourceBuild/tarball/content/scripts/docker/docker-run.sh b/src/SourceBuild/tarball/content/scripts/docker/docker-run.sh deleted file mode 100644 index 93e0382a0..000000000 --- a/src/SourceBuild/tarball/content/scripts/docker/docker-run.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -IFS=$'\n\t' - -DOCKER_FILE="" -DOCKER_IMAGE="" -SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" -REPO_ROOT="$(cd -P "$SCRIPT_ROOT/../../" && pwd)" - -case $(echo $1 | awk '{print tolower($0)}') in - -d | --dockerfile) - DOCKER_FILE=$2 - ;; - -i | --image) - DOCKER_IMAGE=$2 - ;; - *) - echo "usage: $0 [[-d | --dockerfile] ] | [-i | --image] ]] cmd-to-run" - exit 1 - ;; -esac - -shift -shift - -if [ $DOCKER_FILE ]; then - if [ -d $DOCKER_FILE ]; then - DOCKER_FILE="$DOCKER_FILE/Dockerfile" - fi - - DOCKER_FILE_DIR=$(dirname $DOCKER_FILE) - DOCKER_IMAGE=$(set -x ; docker build -q -f $DOCKER_FILE $DOCKER_FILE_DIR) -fi - -DOCKER_USERADD_AND_SWITCH_CMD="" - -if [ ! $(id -u) = 0 ]; then - DOCKER_USERADD_AND_SWITCH_CMD="useradd -m -u $(id -u) $(id -n -u) && su $(id -n -u) -c " -fi - -ARGS=$(IFS=' ' ; echo $@) -(set -x ; docker run --rm --init -v $REPO_ROOT:/code -t $DOCKER_IMAGE /bin/sh -c "cd /code ; $DOCKER_USERADD_AND_SWITCH_CMD\"$ARGS\"") diff --git a/src/SourceBuild/tarball/content/scripts/generate-readme-table.sh b/src/SourceBuild/tarball/content/scripts/generate-readme-table.sh deleted file mode 100644 index 244306d7d..000000000 --- a/src/SourceBuild/tarball/content/scripts/generate-readme-table.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -script_root="$(cd -P "$( dirname "$0" )" && pwd)" - -branch=master -branch_azdo=$branch - -readme="$script_root/../README.md" - -if [ ! -f "$readme" ]; then - echo "$readme must exist." - exit 1 -fi - -print_rows() { - echo '| OS | *Azure DevOps*
Release |' - echo '| -- | :-- |' - row 'CentOS7.1' 'Production' - row 'CentOS7.1' 'Online' - row 'CentOS7.1' 'Offline' - row 'CentOS7.1' 'Offline Portable' - row 'Debian8.2' 'Production' - row 'Debian8.2' 'Online' - row 'Fedora29' 'Production' - row 'Fedora29' 'Online' - row 'Fedora29' 'Offline' - row 'Fedora29' 'Offline Portable' - row 'OSX' 'Production' - row 'Ubuntu16.04' 'Production' - row 'Windows' 'Production' -} - -raw_print() { - printf '%s' "$1" -} - -row() { - os=$1 - job_type=$2 - display_name=$os - if [ "$job_type" != "Production" ]; then - display_name="$display_name ($job_type)" - fi - printf "| $display_name | " - azdo - end -} - -end() { - printf '\n' -} - -azdo() { - job=$(raw_print $os | awk '{print tolower($0)}' | sed 's/\.//g') - - # Fix case: AzDO has "sticky" casing across build def lifetime, so these names are inconsistent. - # https://dev.azure.com/dnceng/internal/_workitems/edit/98 - case $os in - OSX|Windows) - job=$os - ;; - esac - - job_type_escaped=$(raw_print "$job_type" | sed 's/ /%20/g') - query="?branchName=$branch_azdo&jobname=$job&configuration=$job_type_escaped" - - raw_print "[![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/dotnet/source-build/source-build-CI$query)]" - raw_print "(https://dev.azure.com/dnceng/internal/_build/latest?definitionId=114&branchName=$branch_azdo) | " -} - -none() { - raw_print '| ' -} - -cp "$readme" "$readme.old" - -phase=before -while read line; do - if [ "$phase" = before ]; then - echo "$line" - if [ "$line" = '' ]; then - print_rows - phase=skip - fi - elif [ "$phase" = skip ]; then - if [ "$line" = '' ]; then - echo "$line" - phase=after - fi - else - echo "$line" - fi -done < "$readme.old" > "$readme" - -rm "$readme.old"