Skip to content

Commit 4684913

Browse files
committed
Auto merge of #140347 - marcoieni:free-disk-codebuild, r=<try>
ci: clean more disk space in codebuild try-job: dist-arm-linux
2 parents 496145b + 474466d commit 4684913

File tree

2 files changed

+81
-50
lines changed

2 files changed

+81
-50
lines changed

src/ci/github-actions/jobs.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ runners:
6565
os: codebuild-ubuntu-22-36c-$github.run_id-$github.run_attempt
6666
<<: *base-job
6767

68+
- &job-linux-8c-codebuild
69+
free_disk: true
70+
codebuild: true
71+
os: codebuild-ubuntu-22-8c-$github.run_id-$github.run_attempt
72+
<<: *base-job
73+
6874
envs:
6975
env-x86_64-apple-tests: &env-x86_64-apple-tests
7076
SCRIPT: ./x.py check compiletest --set build.compiletest-use-stage0-libtest=true && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
@@ -160,7 +166,7 @@ auto:
160166
<<: *job-linux-4c
161167

162168
- name: dist-arm-linux
163-
<<: *job-linux-36c-codebuild
169+
<<: *job-linux-8c-codebuild
164170

165171
- name: dist-armhf-linux
166172
<<: *job-linux-4c

src/ci/scripts/free-disk-space.sh

+74-49
Original file line numberDiff line numberDiff line change
@@ -87,59 +87,80 @@ printDF() {
8787

8888
removeUnusedFilesAndDirs() {
8989
local to_remove=(
90-
"/usr/local/aws-sam-cli"
91-
"/usr/local/doc/cmake"
92-
"/usr/local/julia"*
93-
"/usr/local/lib/android"
94-
"/usr/local/share/chromedriver-"*
95-
"/usr/local/share/chromium"
96-
"/usr/local/share/cmake-"*
97-
"/usr/local/share/edge_driver"
98-
"/usr/local/share/gecko_driver"
99-
"/usr/local/share/icons"
100-
"/usr/local/share/vim"
101-
"/usr/local/share/emacs"
102-
"/usr/local/share/powershell"
103-
"/usr/local/share/vcpkg"
104-
"/usr/share/apache-maven-"*
105-
"/usr/share/gradle-"*
10690
"/usr/share/java"
107-
"/usr/share/kotlinc"
108-
"/usr/share/miniconda"
109-
"/usr/share/php"
110-
"/usr/share/ri"
111-
"/usr/share/swift"
112-
113-
# binaries
114-
"/usr/local/bin/azcopy"
115-
"/usr/local/bin/bicep"
116-
"/usr/local/bin/ccmake"
117-
"/usr/local/bin/cmake-"*
118-
"/usr/local/bin/cmake"
119-
"/usr/local/bin/cpack"
120-
"/usr/local/bin/ctest"
121-
"/usr/local/bin/helm"
122-
"/usr/local/bin/kind"
123-
"/usr/local/bin/kustomize"
124-
"/usr/local/bin/minikube"
125-
"/usr/local/bin/packer"
126-
"/usr/local/bin/phpunit"
127-
"/usr/local/bin/pulumi-"*
128-
"/usr/local/bin/pulumi"
129-
"/usr/local/bin/stack"
130-
131-
# Haskell runtime
132-
"/usr/local/.ghcup"
133-
134-
# Azure
135-
"/opt/az"
136-
"/usr/share/az_"*
13791
)
13892

139-
if [ -n "${AGENT_TOOLSDIRECTORY:-}" ]; then
140-
# Environment variable set by GitHub Actions
93+
if isGitHubRunner; then
94+
to_remove+=(
95+
"/usr/local/aws-sam-cli"
96+
"/usr/local/doc/cmake"
97+
"/usr/local/julia"*
98+
"/usr/local/lib/android"
99+
"/usr/local/share/chromedriver-"*
100+
"/usr/local/share/chromium"
101+
"/usr/local/share/cmake-"*
102+
"/usr/local/share/edge_driver"
103+
"/usr/local/share/emacs"
104+
"/usr/local/share/gecko_driver"
105+
"/usr/local/share/icons"
106+
"/usr/local/share/powershell"
107+
"/usr/local/share/vcpkg"
108+
"/usr/local/share/vim"
109+
"/usr/share/apache-maven-"*
110+
"/usr/share/gradle-"*
111+
"/usr/share/kotlinc"
112+
"/usr/share/miniconda"
113+
"/usr/share/php"
114+
"/usr/share/ri"
115+
"/usr/share/swift"
116+
117+
# binaries
118+
"/usr/local/bin/azcopy"
119+
"/usr/local/bin/bicep"
120+
"/usr/local/bin/ccmake"
121+
"/usr/local/bin/cmake-"*
122+
"/usr/local/bin/cmake"
123+
"/usr/local/bin/cpack"
124+
"/usr/local/bin/ctest"
125+
"/usr/local/bin/helm"
126+
"/usr/local/bin/kind"
127+
"/usr/local/bin/kustomize"
128+
"/usr/local/bin/minikube"
129+
"/usr/local/bin/packer"
130+
"/usr/local/bin/phpunit"
131+
"/usr/local/bin/pulumi-"*
132+
"/usr/local/bin/pulumi"
133+
"/usr/local/bin/stack"
134+
135+
# Haskell runtime
136+
"/usr/local/.ghcup"
137+
138+
# Azure
139+
"/opt/az"
140+
"/usr/share/az_"*
141+
)
142+
143+
if [ -n "${AGENT_TOOLSDIRECTORY:-}" ]; then
144+
# Environment variable set by GitHub Actions
145+
to_remove+=(
146+
"${AGENT_TOOLSDIRECTORY}"
147+
)
148+
else
149+
echo "::warning::AGENT_TOOLSDIRECTORY is not set. Skipping removal."
150+
fi
151+
else
152+
# Remove folders and files present in AWS CodeBuild
141153
to_remove+=(
142-
"${AGENT_TOOLSDIRECTORY}"
154+
# binaries
155+
"/usr/local/bin/ecs-cli"
156+
"/usr/local/bin/eksctl"
157+
"/usr/local/bin/kubectl"
158+
159+
"${HOME}/.gradle"
160+
"${HOME}/.dotnet"
161+
"${HOME}/.goenv"
162+
"${HOME}/.phpenv"
163+
143164
)
144165
fi
145166

@@ -194,6 +215,10 @@ cleanPackages() {
194215
'powershell'
195216
)
196217
fi
218+
else
219+
packages+=(
220+
'google-chrome-stable'
221+
)
197222
fi
198223

199224
sudo apt-get -qq remove -y --fix-missing "${packages[@]}"

0 commit comments

Comments
 (0)