Skip to content

Commit dd928f0

Browse files
committed
Use ninja for macOS CI builds
This change enables the usage of `ninja` instead of `gmake` to speed up macOS builds on GH actions. Addtionally it fixes `upload-assets-to-staging.sh` script that starts failing on macOS with `error: externally-managed-environment` on `pip install`.
1 parent 3ede02b commit dd928f0

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/Java.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,15 @@ jobs:
247247
name: Java OSX (Universal)
248248
runs-on: macos-14
249249
needs: java-linux-amd64
250+
env:
251+
GEN: ninja
250252
steps:
251253
- uses: actions/checkout@v4
252254
with:
253255
fetch-depth: 0
254256

255-
- uses: actions/setup-python@v5
256-
with:
257-
python-version: "3.12"
257+
- name: Install Ninja
258+
run: brew install ninja
258259

259260
- name: Build
260261
shell: bash

scripts/upload-assets-to-staging.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
# <folder> : Folder to upload to
77
# <file> : File to be uploaded
88

9+
set -e
10+
set -x
11+
912
if [ -z "$1" ] || [ -z "$2" ]; then
1013
echo "Usage: ./scripts/upload-staging-asset.sh <folder> <file1> [... <fileN>]"
1114
exit 1
@@ -56,8 +59,6 @@ if [ "$OVERRIDE_GIT_DESCRIBE" ]; then
5659
TARGET="$TARGET/$OVERRIDE_GIT_DESCRIBE"
5760
fi
5861

59-
python3 -m pip install awscli
60-
6162
for var in "${@: 2}"
6263
do
6364
aws s3 cp $var s3://duckdb-staging/$TARGET/$GITHUB_REPOSITORY/$FOLDER/ $DRY_RUN_PARAM --region us-east-2

0 commit comments

Comments
 (0)