Skip to content
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

Jump to bottom

Add additional versions #9

Merged
merged 5 commits into from
Feb 14, 2024
Merged

Add additional versions #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78511d4
Add additional versions
dacort Feb 13, 2024
43e79a8
Bump duckdb version to next minor and remove custom patch
dacort Feb 13, 2024
1ef7c71
Bump Ubuntu to 18 to match duckdb actions
dacort Feb 13, 2024
9df430e
OK just build for the current submodule version
dacort Feb 13, 2024
dca0f06
Add output to scripts
dacort Feb 14, 2024
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
15 changes: 4 additions & 11 deletions .github/workflows/Linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Linux
on: [push, pull_request,repository_dispatch]
on: [push, pull_request]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
cancel-in-progress: true
Expand All @@ -24,7 +24,7 @@ jobs:
arch: ['linux_amd64', 'linux_arm64'] # , 'linux_amd64_gcc4'
include:
- arch: 'linux_amd64'
container: 'ubuntu:16.04'
container: 'ubuntu:18.04'
- arch: 'linux_arm64'
container: 'ubuntu:18.04'
# - arch: 'linux_amd64_gcc4'
Expand Down Expand Up @@ -100,23 +100,16 @@ jobs:
run: |
cd duckdb
git checkout ${{ matrix.duckdb_version }}
cd duckdb-ext/duckdb
git checkout ${{ matrix.duckdb_version }}

- name: Patch DuckDB with named parameter support
run: |
cd duckdb
git apply ../duckdb-namedparams.patch
cd ../duckdb-ext/duckdb
git apply ../../duckdb-namedparams.patch
git checkout ${{ matrix.duckdb_version }}

- if: ${{ matrix.arch == 'linux_amd64_gcc4' }}
uses: ./duckdb/.github/actions/centos_7_setup
with:
openssl: 0

- if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }}
uses: ./duckdb/.github/actions/ubuntu_16_setup
uses: ./duckdb/.github/actions/ubuntu_18_setup
with:
aarch64_cross_compile: ${{ matrix.arch == 'linux_arm64' && 1 }}

Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/Windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Windows
on: [push, pull_request,repository_dispatch]
on: [push, pull_request]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
cancel-in-progress: true
Expand Down Expand Up @@ -40,13 +40,6 @@ jobs:
cd ../duckdb-ext/duckdb
git checkout ${{ matrix.duckdb_version }}

- name: Patch DuckDB with named parameter support
run: |
cd duckdb
git apply ../duckdb-namedparams.patch
cd ../duckdb-ext/duckdb
git apply ../../duckdb-namedparams.patch

- name: Build extension
run: |
dir duckdb-ext/duckdb/src/include
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/macOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: macOS
on: [push, pull_request,repository_dispatch]
on: [push, pull_request]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
cancel-in-progress: true
Expand Down Expand Up @@ -42,15 +42,8 @@ jobs:
run: |
cd duckdb
git checkout ${{ matrix.duckdb_version }}
cd duckdb-ext/duckdb
git checkout ${{ matrix.duckdb_version }}

- name: Patch DuckDB with named parameter support
run: |
cd duckdb
git apply ../duckdb-namedparams.patch
cd ../duckdb-ext/duckdb
git apply ../../duckdb-namedparams.patch
git checkout ${{ matrix.duckdb_version }}

# Build extension
- name: Build extension
Expand Down
2 changes: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 5545 files
2 changes: 1 addition & 1 deletion duckdb-ext/duckdb
Open in desktop
Submodule duckdb updated 5545 files
118 changes: 0 additions & 118 deletions duckdb-namedparams.patch
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions scripts/extension-upload.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ ext="build/release/extension/duckdb-athena-extension/$1.duckdb_extension"
gzip < $ext > "$1.duckdb_extension.gz"

# upload compressed extension binary to S3
echo "Uploading extension binary to s3://$5/artifacts/$1/$2/$3/$4/$1.duckdb_extension.gz"
aws s3 cp $1.duckdb_extension.gz s3://$5/artifacts/$1/$2/$3/$4/$1.duckdb_extension.gz

if [ $6 = 'true' ]
then
echo "Also copying to latest"
aws s3 cp $1.duckdb_extension.gz s3://$5/artifacts/$1/latest/$3/$4/$1.duckdb_extension.gz
fi
# also uplo
Loading