Skip to content

Commit 71ad6d3

Browse files
authored
Use Arcade SDK conventions more consistently, fix 'package-source-build' project (#1573)
1 parent e4a0119 commit 71ad6d3

File tree

68 files changed

+649
-533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+649
-533
lines changed

.vsts.pipelines/jobs/ci-linux.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ jobs:
133133
$(docker.run) $(docker.logs.map) $(docker.src.map) $(docker.src.work) $(imageName) /bin/bash -c "
134134
mkdir -p /logs/source-build/logs
135135
find . \( \
136-
-path './bin/*-report/*' -o \
137-
-path './bin/msbuild-debug/*' -o \
138-
-path './bin/roslyn-debug/*' -o \
139-
-path './bin/aspnet-debug/*' -o \
136+
-path './artifacts/*-report/*' -o \
137+
-path './artifacts/msbuild-debug/*' -o \
138+
-path './artifacts/roslyn-debug/*' -o \
139+
-path './artifacts/aspnet-debug/*' -o \
140140
-iname '*.binlog' -o \
141141
-iname '*.log' \) \
142142
-exec cp {} --parents /logs/source-build/logs \;"
@@ -151,7 +151,7 @@ jobs:
151151
df -h
152152
$(docker.run) $(docker.logs.map) $(docker.src.map) $(docker.src.work) $(imageName) /bin/bash -c "
153153
mkdir -p /logs/source-build/unit-tests-results
154-
find bin/src/. \( \
154+
find artifacts/src/. \( \
155155
-iname '*testResults.xml' \) \
156156
-exec cp {} --parents /logs/source-build/unit-tests-results \;"
157157
du -h $(rootDirectory) | sort -h | tail -n 50
@@ -163,8 +163,8 @@ jobs:
163163
- script: |
164164
set -ex
165165
df -h
166-
sudo rm -rf $(rootDirectory)/sb/source-build/bin/src
167-
sudo rm -rf $(rootDirectory)/sb/source-build/bin/obj
166+
sudo rm -rf $(rootDirectory)/sb/source-build/artifacts/src
167+
sudo rm -rf $(rootDirectory)/sb/source-build/artifacts/obj
168168
sudo rm -rf $(rootDirectory)/sb/source-build/.git
169169
sudo rm -rf $(rootDirectory)/sb/source-build/packages
170170
du -h $(rootDirectory) | sort -h | tail -n 50
@@ -239,10 +239,10 @@ jobs:
239239
mkdir -p /logs/tarball/logs
240240
cd \"$(tarballName)\"
241241
find . \( \
242-
-path './bin/*-report/*' -o \
243-
-path './bin/msbuild-debug/*' -o \
244-
-path './bin/roslyn-debug/*' -o \
245-
-path './bin/aspnet-debug/*' -o \
242+
-path './artifacts/*-report/*' -o \
243+
-path './artifacts/msbuild-debug/*' -o \
244+
-path './artifacts/roslyn-debug/*' -o \
245+
-path './artifacts/aspnet-debug/*' -o \
246246
-iname '*.binlog' -o \
247247
-iname '*.log' \) \
248248
-exec cp {} --parents /logs/tarball/logs \;"
@@ -258,7 +258,7 @@ jobs:
258258
$(docker.run) $(docker.tb.map) $(docker.drop.map) $(docker.tb.work) $(imageName) /bin/bash -c "
259259
mkdir -p /drop/tarball/
260260
cd \"$(tarballName)\"
261-
find ./bin \( \
261+
find ./artifacts \( \
262262
-iname 'Private.SourceBuilt.Artifacts*.tar.gz' \) \
263263
-exec cp {} /drop/tarball/ \;"
264264
du -h $(rootDirectory) | sort -h | tail -n 50

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ jobs:
8787
# Copy all these files to the logs dir, preserving relative path.
8888
mkdir -p "$(logsDirectory)"
8989
find . \( \
90-
-path './bin/*-report/*' -o \
91-
-path './bin/msbuild-debug/*' -o \
92-
-path './bin/roslyn-debug/*' -o \
93-
-path './bin/aspnet-debug/*' -o \
90+
-path './artifacts/*-report/*' -o \
91+
-path './artifacts/msbuild-debug/*' -o \
92+
-path './artifacts/roslyn-debug/*' -o \
93+
-path './artifacts/aspnet-debug/*' -o \
9494
-iname '*.binlog' -o \
9595
-iname '*.log' \) \
9696
-exec $copyWithParents "$(logsDirectory)" \;

.vsts.pipelines/steps/run-bootstrap.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ steps:
3030
mkdir -p /logs/stage1-sdk/logs
3131
pushd /bst/bootstrap_dir/stage1-sdk
3232
find . \( \
33-
-path './bin/*-report/*' -o \
34-
-path './bin/msbuild-debug/*' -o \
35-
-path './bin/roslyn-debug/*' -o \
36-
-path './bin/aspnet-debug/*' -o \
33+
-path './artifacts/*-report/*' -o \
34+
-path './artifacts/msbuild-debug/*' -o \
35+
-path './artifacts/roslyn-debug/*' -o \
36+
-path './artifacts/aspnet-debug/*' -o \
3737
-iname '*.binlog' -o \
3838
-iname '*.log' \) \
3939
-exec cp {} --parents /logs/stage1-sdk/logs \;
@@ -49,9 +49,9 @@ steps:
4949
df -h
5050
$(docker.run) --network=none $(docker.bst.map) $(docker.bst.work) $(imageName) bash -c '
5151
pushd /bst/bootstrap_dir/stage1-sdk
52-
echo "Removing everything in stage-1sdk except Tools and bin directory"
52+
echo "Removing everything in stage-1sdk except Tools and artifacts directory"
5353
shopt -s extglob
54-
rm -rvf !("Tools"|"bin")
54+
rm -rvf !("Tools"|"artifacts")
5555
shopt -u extglob
5656
popd'
5757
displayName: Clean all except tarball in stage1
@@ -134,10 +134,10 @@ steps:
134134
mkdir -p /logs/final-sdk/logs
135135
pushd /bst/bootstrap_dir/final-sdk
136136
find . \( \
137-
-path './bin/*-report/*' -o \
138-
-path './bin/msbuild-debug/*' -o \
139-
-path './bin/roslyn-debug/*' -o \
140-
-path './bin/aspnet-debug/*' -o \
137+
-path './artifacts/*-report/*' -o \
138+
-path './artifacts/msbuild-debug/*' -o \
139+
-path './artifacts/roslyn-debug/*' -o \
140+
-path './artifacts/aspnet-debug/*' -o \
141141
-iname '*.binlog' -o \
142142
-iname '*.log' \) \
143143
-exec cp {} --parents /logs/final-sdk/logs \;

0 commit comments

Comments
 (0)