Skip to content

Use ninja for macOS CI builds #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
staticlibs merged 1 commit into from
Jun 6, 2025
Merged

Use ninja for macOS CI builds #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/Java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,15 @@ jobs:
name: Java OSX (Universal)
runs-on: macos-14
needs: java-linux-amd64
env:
GEN: ninja
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Install Ninja
run: brew install ninja

- name: Build
shell: bash
Expand Down
5 changes: 3 additions & 2 deletions scripts/upload-assets-to-staging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
# <folder> : Folder to upload to
# <file> : File to be uploaded

set -e
set -x

if [ -z "$1" ] || [ -z "$2" ]; then
echo "Usage: ./scripts/upload-staging-asset.sh <folder> <file1> [... <fileN>]"
exit 1
Expand Down Expand Up @@ -56,8 +59,6 @@ if [ "$OVERRIDE_GIT_DESCRIBE" ]; then
TARGET="$TARGET/$OVERRIDE_GIT_DESCRIBE"
fi

python3 -m pip install awscli

for var in "${@: 2}"
do
aws s3 cp $var s3://duckdb-staging/$TARGET/$GITHUB_REPOSITORY/$FOLDER/ $DRY_RUN_PARAM --region us-east-2
Expand Down
Loading