Skip to content

Commit

Permalink
update duckdb to main repo
Browse files Browse the repository at this point in the history
  • Loading branch information
samansmink committed Jul 12, 2023
1 parent 617a4b1 commit 6326af9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@ jobs:
matrix:
# Add commits/tags to build against other DuckDB versions
duckdb_version: [ '<submodule_version>' ]
arch: ['linux_amd64', 'linux_arm64']
arch: ['linux_amd64', 'linux_arm64', 'linux_amd64_gcc4']
vcpkg_version: [ '2023.04.15' ]
include:
- arch: 'linux_amd64'
- arch: 'linux_amd64_gcc4'
container: 'quay.io/pypa/manylinux2014_x86_64'
vcpkg_triplet: 'x64-linux'
- arch: 'linux_amd64'
container: 'ubuntu:18.04'
vcpkg_triplet: 'x64-linux'
- arch: 'linux_arm64'
container: 'ubuntu:18.04'
vcpkg_triplet: 'arm64-linux'
Expand All @@ -32,7 +35,7 @@ jobs:

steps:
- name: Install required ubuntu packages
if: ${{ matrix.arch == 'linux_arm64' }}
if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }}
run: |
apt-get update -y -qq
apt-get install -y -qq software-properties-common
Expand All @@ -42,7 +45,7 @@ jobs:
apt-get install -y -qq tar pkg-config
- name: Install Git 2.18.5
if: ${{ matrix.arch == 'linux_arm64' }}
if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }}
run: |
wget https://github.com/git/git/archive/refs/tags/v2.18.5.tar.gz
tar xvf v2.18.5.tar.gz
Expand All @@ -63,12 +66,13 @@ jobs:
git checkout ${{ matrix.duckdb_version }}
- name: Setup ManyLinux2014
if: ${{ matrix.arch == 'linux_amd64' }}
if: ${{ matrix.arch == 'linux_amd64_gcc4' }}
run: |
./duckdb/scripts/setup_manylinux2014.sh general aws-cli ccache ssh openssl python_alias
- if: ${{ matrix.arch == 'linux_arm64' }}
uses: ./duckdb/.github/actions/ubuntu_16_setup
- name: Setup Ubuntu
if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }}
uses: ./duckdb/.github/actions/ubuntu_18_setup
with:
aarch64_cross_compile: 1

Expand All @@ -88,10 +92,7 @@ jobs:
make release
- name: Test extension
if: ${{ matrix.arch != 'linux_arm64'}}
env:
AWS_ACCESS_KEY_ID: minio_duckdb_user
AWS_SECRET_ACCESS_KEY: minio_duckdb_user_password
if: ${{ matrix.arch == 'linux_amd64_gcc4' || matrix.arch == 'linux_amd64'}}
run: |
make test
Expand Down
2 changes: 1 addition & 1 deletion duckdb
Submodule duckdb updated 409 files

0 comments on commit 6326af9

Please sign in to comment.