Skip to content

Commit fe7c6bf

Browse files
committed
CI on forked branches
1 parent 04b5a99 commit fe7c6bf

2 files changed

Lines changed: 22 additions & 7 deletions

File tree

.github/workflows/build_and_test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,9 @@ jobs:
3030
name: CI
3131
uses: ./.github/workflows/ci.yml
3232
secrets: inherit
33+
with:
34+
# Force every gated job to run on fork-CI: contributor pushes don't necessarily
35+
# touch paths that match ci.yml's filters (e.g. when iterating on the fork-CI
36+
# workflow files themselves), so honour the Spark-style "run the full matrix"
37+
# contract instead of skipping silently.
38+
force_all: true

.github/workflows/spark_sql_test_reusable.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,21 @@ jobs:
121121
image: amd64/rust
122122
steps:
123123
- uses: actions/checkout@v6
124+
- name: Free up disk space (container)
125+
# Mirror apache/spark's dev/free_disk_space_container. The amd64/rust
126+
# container inherits GitHub's tool-cache via the /__t mount; strip the
127+
# entries we never use (CodeQL, Go, Node) to free ~5-10 GB before the
128+
# Spark clone, Maven dep tree, sbt build cache, and per-test-suite
129+
# warehouse dirs all start fighting for the runner's disk.
130+
shell: bash
131+
run: |
132+
echo "Disk usage before cleanup:"
133+
df -h || true
134+
rm -rf /__t/CodeQL || true
135+
rm -rf /__t/go || true
136+
rm -rf /__t/node || true
137+
echo "Disk usage after cleanup:"
138+
df -h || true
124139
- name: Setup Rust & Java toolchain
125140
uses: ./.github/actions/setup-builder
126141
with:
@@ -165,14 +180,8 @@ jobs:
165180
fi
166181
env:
167182
LC_ALL: "C.UTF-8"
168-
# Skew Comet's memory budget toward the forked test JVM. SBT
169-
# (build driver, not where the tests run) gets 3 GB; the forked
170-
# test JVM gets 5 GB via Spark's `HEAP_SIZE` env in SparkBuild.scala.
171-
# Total nominal = 3 GB SBT + 5 GB forked test heap + ~1.3 GB
172-
# metaspace; over 7 GB, but peak coincidence is between a small
173-
# driver and the big test JVM rather than two equal-sized JVMs.
174183
SBT_MEM: "3072"
175-
HEAP_SIZE: "5g"
184+
HEAP_SIZE: "3g"
176185
# Cap forked test JVM direct memory. Without this, -XX:MaxDirectMemorySize
177186
# defaults to ≈ -Xmx (5 GB), letting Netty / DirectByteBuffer / shuffle
178187
# buffers grow alongside the heap and push host RSS past the 7 GB

0 commit comments

Comments
 (0)