Skip to content

Commit 5742b10

Browse files
phlaxphlax
authored
github/ci: Delete all in diskspace hack where possible (#42273)
the toolshed action now backgrounds the `rm -rf` so its much faster, and in my testing appears to still be reliable some Android CI actually uses pre-installed SDK so in those cases the paths still need to be specified Signed-off-by: Ryan Northey <[email protected]>
1 parent fe7ddb0 commit 5742b10

13 files changed

+3
-38
lines changed

‎.github/workflows/_check_build.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
bazel-extra: '--config=rbe'
3939
cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }}
4040
concurrency-suffix: -${{ matrix.target }}
41-
diskspace-hack-paths: ${{ matrix.diskspace-hack-paths }}
4241
docker-ci: ${{ matrix.docker-ci || false }}
4342
error-match: |
4443
ERROR

‎.github/workflows/_check_coverage.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
bazel-extra: '--config=rbe'
4242
cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }}
4343
concurrency-suffix: -${{ matrix.target }}
44-
diskspace-hack-paths: ${{ matrix.diskspace-hack-paths }}
4544
error-match: |
4645
ERROR
4746
error:
@@ -72,8 +71,5 @@ jobs:
7271
include:
7372
- target: coverage
7473
name: Coverage
75-
diskspace-hack-paths:
7674
- target: fuzz_coverage
7775
name: Fuzz coverage
78-
diskspace-hack-paths: |
79-
/opt/hostedtoolcache

‎.github/workflows/_check_san.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
bazel-extra: '--config=rbe'
3939
cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }}
4040
concurrency-suffix: -${{ matrix.target }}
41-
diskspace-hack-paths: ${{ matrix.diskspace-hack-paths || '/opt/hostedtoolcache' }}
4241
request: ${{ inputs.request }}
4342
error-match: |
4443
ERROR
@@ -58,7 +57,4 @@ jobs:
5857
- target: msan
5958
rbe: true
6059
- target: tsan
61-
diskspace-hack-paths: |
62-
/opt/hostedtoolcache
63-
/usr/local/.ghcup
6460
rbe: true

‎.github/workflows/_mobile_container_ci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ on:
5353
default: false
5454
diskspace-hack-paths:
5555
type: string
56-
default: |
57-
/opt/hostedtoolcache
56+
default:
5857
downloads:
5958
type: string
6059
default:

‎.github/workflows/_precheck_deps.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ jobs:
4040
bazel-extra: '--config=rbe'
4141
cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }}
4242
concurrency-suffix: -${{ matrix.target }}
43-
diskspace-hack-paths: ${{ matrix.diskspace-hack-paths }}
4443
gcs-cache-bucket: ${{ inputs.gcs-cache-bucket }}
4544
request: ${{ inputs.request }}
4645
error-match: |
@@ -54,7 +53,6 @@ jobs:
5453
matrix:
5554
include:
5655
- target: deps
57-
diskspace-hack-paths:
5856

5957
dependency-review:
6058
runs-on: ubuntu-24.04

‎.github/workflows/_precheck_format.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
bazel-extra: '--config=rbe'
3939
cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }}
4040
concurrency-suffix: -${{ matrix.target }}
41-
diskspace-hack-paths: ${{ matrix.diskspace-hack-paths }}
4241
gcs-cache-bucket: ${{ inputs.gcs-cache-bucket }}
4342
request: ${{ inputs.request }}
4443
# format needs aspell, and format-api requires git

‎.github/workflows/_precheck_publish.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }}
4343
cache-build-image-key-suffix: ${{ matrix.arch == 'arm64' && '-arm64' || '' }}
4444
concurrency-suffix: -${{ matrix.target }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }}
45-
diskspace-hack-paths: ${{ matrix.diskspace-hack-paths || '/opt/hostedtoolcache' }}
4645
gcs-cache-bucket: ${{ inputs.gcs-cache-bucket }}
4746
rbe: ${{ matrix.rbe }}
4847
request: ${{ inputs.request }}
@@ -64,9 +63,6 @@ jobs:
6463
name: Release (x64)
6564
target-suffix: x64
6665
arch: x64
67-
diskspace-hack-paths: |
68-
/opt/hostedtoolcache
69-
/usr/local/.ghcup
7066
rbe: true
7167
- target: release.test_only
7268
name: Release (arm64)

‎.github/workflows/_publish_build.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ jobs:
5454
cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }}
5555
cache-build-image-key-suffix: ${{ inputs.arch == 'arm64' && '-arm64' || '' }}
5656
concurrency-suffix: -${{ inputs.arch }}
57-
diskspace-hack-paths: |
58-
/opt/hostedtoolcache
59-
/usr/local/.ghcup
6057
gcs-cache-bucket: ${{ inputs.gcs-cache-bucket }}
6158
rbe: true
6259
request: ${{ inputs.request }}
@@ -117,9 +114,6 @@ jobs:
117114
cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }}
118115
cache-build-image-key-suffix: ${{ inputs.arch == 'arm64' && '-arm64' || '' }}
119116
concurrency-suffix: -${{ inputs.arch }}
120-
diskspace-hack-paths: |
121-
/opt/hostedtoolcache
122-
/usr/local/.ghcup
123117
docker-ci: false
124118
gcs-cache-bucket: ${{ inputs.gcs-cache-bucket }}
125119
import-gpg: true

‎.github/workflows/_publish_release.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
--//distribution:x64-release=//distribution:custom/x64/bin/release.tar.zst
5959
--//distribution:arm64-release=//distribution:custom/arm64/bin/release.tar.zst
6060
cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }}
61-
diskspace-hack-paths:
6261
downloads: |
6362
packages.arm64: container/envoy/arm64/
6463
packages.x64: container/envoy/x64/

‎.github/workflows/_publish_verify.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ jobs:
4242
cache-build-image-key-suffix: ${{ matrix.arch == 'arm64' && format('-{0}', matrix.arch) || '' }}
4343
container-command: ${{ matrix.container-command }}
4444
concurrency-suffix: -${{ matrix.arch || 'x64' }}
45-
diskspace-hack-paths: |
46-
/opt/hostedtoolcache
47-
/usr/local/.ghcup
4845
downloads: ${{ matrix.downloads }}
4946
rbe: ${{ matrix.rbe }}
5047
request: ${{ inputs.request }}
@@ -162,9 +159,6 @@ jobs:
162159
cache-build-image-key-suffix: ${{ matrix.arch == 'arm64' && format('-{0}', matrix.arch) || '' }}
163160
container-command: ./ci/run_envoy_docker.sh
164161
concurrency-suffix: -${{ matrix.arch || 'x64' }}
165-
diskspace-hack-paths: |
166-
/opt/hostedtoolcache
167-
/usr/local/.ghcup
168162
downloads: |
169163
release.signed: container/release.signed
170164
gcs-cache-bucket: ${{ inputs.gcs-cache-bucket }}

0 commit comments

Comments
 (0)