Skip to content

Commit 8edd3b0

Browse files
MINOR: Remove macOS 15 build target (#10)
* Free up space before installing dependencies * Bump macOS development target * Remove macOS x86_64 build
1 parent bbe3557 commit 8edd3b0

File tree

2 files changed

+42
-10
lines changed

2 files changed

+42
-10
lines changed

.github/workflows/jarbuild.yml

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,9 @@ jobs:
165165
fail-fast: false
166166
matrix:
167167
platform:
168-
- { runs_on: macos-15-intel, arch: "x86_64"}
169168
- { runs_on: macos-15, arch: "aarch_64" }
170169
env:
171-
MACOSX_DEPLOYMENT_TARGET: "14.0"
170+
MACOSX_DEPLOYMENT_TARGET: "15.0"
172171
steps:
173172
- name: Download source archive
174173
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
@@ -216,8 +215,30 @@ jobs:
216215
./bootstrap-vcpkg.sh
217216
echo "VCPKG_ROOT=${PWD}/arrow/vcpkg" >> ${GITHUB_ENV}
218217
echo "${PWD}/arrow/vcpkg" >> ${GITHUB_PATH}
218+
- name: Clean up disk space
219+
run: |
220+
echo "=== Free disk space before cleanup ==="
221+
df -h /
222+
223+
echo ""
224+
echo "=== Removing Xcode simulators ==="
225+
sudo rm -rf /Library/Developer/CoreSimulator/Caches || :
226+
echo "Removed /Library/Developer/CoreSimulator/Caches"
227+
228+
echo ""
229+
echo "=== Removing user simulator data ==="
230+
rm -rf ~/Library/Developer/CoreSimulator || :
231+
echo "Removed ~/Library/Developer/CoreSimulator"
232+
233+
echo ""
234+
echo "=== Free disk space after cleanup ==="
235+
df -h /
219236
- name: Install dependencies
220237
run: |
238+
echo "=== Free disk space at start of dependency installation ==="
239+
df -h /
240+
241+
echo ""
221242
# Ensure updating python@XXX with the "--overwrite" option.
222243
# If python@XXX is updated without "--overwrite", it causes
223244
# a conflict error. Because Python 3 installed not by
@@ -264,14 +285,24 @@ jobs:
264285
# bundled Protobuf.
265286
brew uninstall protobuf
266287
288+
echo ""
289+
echo "=== Free disk space before LLVM build ==="
290+
df -h /
291+
292+
echo ""
267293
# Use vcpkg to install LLVM.
268294
vcpkg install \
269295
--clean-after-build \
270296
--x-install-root=${VCPKG_ROOT}/installed \
271297
--x-manifest-root=arrow/ci/vcpkg \
272298
--overlay-ports=arrow/ci/vcpkg/overlay/llvm/ \
273299
--x-feature=gandiva-llvm
274-
300+
301+
echo ""
302+
echo "=== Free disk space after LLVM build ==="
303+
df -h /
304+
305+
echo ""
275306
brew bundle --file=Brewfile
276307
- name: Prepare ccache
277308
run: |
@@ -284,10 +315,18 @@ jobs:
284315
restore-keys: jni-macos-${{ matrix.platform.arch }}-
285316
- name: Build
286317
run: |
318+
echo "=== Free disk space at start of build ==="
319+
df -h /
320+
321+
echo ""
287322
set -e
288323
# make brew Java available to CMake
289324
export JAVA_HOME=$(brew --prefix openjdk@11)/libexec/openjdk.jdk/Contents/Home
290325
ci/scripts/jni_macos_build.sh . arrow build jni
326+
327+
echo ""
328+
echo "=== Free disk space at end of build ==="
329+
df -h /
291330
- name: Compress into single artifact to keep directory structure
292331
run: tar -cvzf jni-macos-${{ matrix.platform.arch }}.tar.gz jni/
293332
- name: Upload artifacts
@@ -312,7 +351,6 @@ jobs:
312351
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
313352
tar -xvzf jni-linux-x86_64.tar.gz
314353
tar -xvzf jni-linux-aarch_64.tar.gz
315-
tar -xvzf jni-macos-x86_64.tar.gz
316354
tar -xvzf jni-macos-aarch_64.tar.gz
317355
- name: Test that shared libraries exist
318356
run: |
@@ -328,11 +366,6 @@ jobs:
328366
test -f jni/arrow_orc_jni/aarch_64/libarrow_orc_jni.so
329367
test -f jni/gandiva_jni/aarch_64/libgandiva_jni.so
330368
331-
test -f jni/arrow_cdata_jni/x86_64/libarrow_cdata_jni.dylib
332-
test -f jni/arrow_dataset_jni/x86_64/libarrow_dataset_jni.dylib
333-
test -f jni/arrow_orc_jni/x86_64/libarrow_orc_jni.dylib
334-
test -f jni/gandiva_jni/x86_64/libgandiva_jni.dylib
335-
336369
test -f jni/arrow_cdata_jni/aarch_64/libarrow_cdata_jni.dylib
337370
test -f jni/arrow_dataset_jni/aarch_64/libarrow_dataset_jni.dylib
338371
test -f jni/arrow_orc_jni/aarch_64/libarrow_orc_jni.dylib

.github/workflows/rc.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ jobs:
380380
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
381381
tar -xvzf jni-linux-x86_64.tar.gz
382382
tar -xvzf jni-linux-aarch_64.tar.gz
383-
tar -xvzf jni-macos-x86_64.tar.gz
384383
tar -xvzf jni-macos-aarch_64.tar.gz
385384
tar -xvzf jni-windows-x86_64.tar.gz
386385
- name: Test that shared libraries exist

0 commit comments

Comments
 (0)