Skip to content

Switch to manylinux_2_28 #106

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.

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
merged 1 commit into from
Apr 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
111 changes: 0 additions & 111 deletions .github/actions/manylinux_2014_setup/action.yml

This file was deleted.

100 changes: 0 additions & 100 deletions .github/actions/ubuntu_18_setup/action.yml

This file was deleted.

57 changes: 32 additions & 25 deletions .github/workflows/ODBC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
OVERRIDE_GIT_DESCRIBE: ${{ inputs.override_git_describe }}
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

concurrency:
group: ODBC-${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}-${{ inputs.override_git_describe }}
Expand All @@ -24,8 +23,8 @@ jobs:
name: ODBC Linux (amd64)
runs-on: ubuntu-latest
env:
GEN: ninja
DUCKDB_PLATFORM: linux_amd64
MANYLINUX_IMAGE: quay.io/pypa/manylinux_2_28_x86_64
MANYLINUX_PACKAGES: unixODBC-devel ninja-build
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -34,12 +33,22 @@ jobs:

- name: Build
shell: bash
run: docker run -v.:/duckdb quay.io/pypa/manylinux2014_x86_64 bash -c 'cd /duckdb && ./scripts/install_unixodbc.sh && ODBC_CONFIG=../../build/unixodbc/build/bin/odbc_config make release'
run: |
docker run \
-v.:/duckdb \
-e GEN=ninja \
${{ env.MANYLINUX_IMAGE }} \
bash -c 'dnf install ${{ env.MANYLINUX_PACKAGES }} -y && make -C /duckdb release'

- name: ODBC Tests
shell: bash
if: ${{ inputs.skip_tests != 'true' }}
run: docker run -v.:/duckdb quay.io/pypa/manylinux2014_x86_64 /duckdb/build/release/test/test_odbc
run: |
docker run \
-v.:/duckdb \
-e GEN=ninja \
${{ env.MANYLINUX_IMAGE }} \
bash -c 'dnf install ${{ env.MANYLINUX_PACKAGES }} -y && /duckdb/build/release/test/test_odbc'

- name: Deploy
shell: bash
Expand All @@ -57,37 +66,35 @@ jobs:

odbc-linux-aarch64:
name: ODBC Linux (aarch64)
runs-on: ubuntu-latest
container:
image: ubuntu:20.04
runs-on: ubuntu-24.04-arm
needs: odbc-linux-amd64
env:
GEN: ninja
DUCKDB_PLATFORM: linux_arm64
ODBC_CONFIG: ../../build/unixodbc/build/bin/odbc_config
MANYLINUX_IMAGE: quay.io/pypa/manylinux_2_28_aarch64
MANYLINUX_PACKAGES: unixODBC-devel ninja-build
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ inputs.git_ref }}

- uses: ./.github/actions/ubuntu_18_setup
with:
ccache: 1
aarch64_cross_compile: 1

- name: Install unixODBC
- name: Build
shell: bash
run: | # we need an x86 odbc_config tool to run cmake. fun.
apt-get remove -y unixodbc unixodbc-dev
CC=gcc ./scripts/install_unixodbc.sh
cp build/unixodbc/build/bin/odbc_config .
CC=aarch64-linux-gnu-gcc ./scripts/install_unixodbc.sh --host aarch64-linux-gnu
cp odbc_config build/unixodbc/build/bin/odbc_config
run: |
docker run \
-v.:/duckdb \
-e GEN=ninja \
${{ env.MANYLINUX_IMAGE }} \
bash -c 'dnf install ${{ env.MANYLINUX_PACKAGES }} -y && make -C /duckdb release'

- name: Build
- name: ODBC Tests
shell: bash
run: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ make release
if: ${{ inputs.skip_tests != 'true' }}
run: |
docker run \
-v.:/duckdb \
-e GEN=ninja \
${{ env.MANYLINUX_IMAGE }} \
bash -c 'dnf install ${{ env.MANYLINUX_PACKAGES }} -y && /duckdb/build/release/test/test_odbc'

- name: Deploy
shell: bash
Expand Down
Loading