Skip to content

Commit

Permalink
use manylinux_2_28_${arch}
Browse files Browse the repository at this point in the history
- eigen-devel not available on manylinux2014
- was considering using 2_34 but we use older for potential compatibility issues
- 2_28 based on alma linux, uses dnf
- changed "latest" version of cmake. dnf installs 3.26.
- TMP for testing, only use aarch64 in builds
  • Loading branch information
swelborn committed Dec 19, 2024
1 parent 63db45b commit 2d6f947
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
14 changes: 2 additions & 12 deletions .github/scripts/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
ARG BASE_IMAGE=quay.io/pypa/manylinux2014_x86_64
ARG BASE_IMAGE=quay.io/pypa/manylinux_2_28_x86_64
FROM ${BASE_IMAGE}

RUN yum install -y \
git \
wget \
eigen3-devel \
hdf5-devel

# Install the latest cmake
RUN VERSION=3.19.4 && \
wget -q https://github.com/Kitware/CMake/releases/download/v$VERSION/cmake-$VERSION-Linux-x86_64.sh && \
bash cmake-$VERSION-Linux-x86_64.sh --skip-license --prefix=/usr/local && \
rm cmake-$VERSION-Linux-x86_64.sh
RUN dnf install wget eigen3-devel hdf5-devel cmake -y
8 changes: 5 additions & 3 deletions .github/scripts/docker/build_and_push.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/usr/bin/env bash

image_base=quay.io/pypa/manylinux2014_x86_64
tag=openchemistry/stempy_wheel_builder
# arch=x86_64
arch=aarch64
image_base=quay.io/pypa/manylinux_2_28_${arch}
tag=samwelborn/stempy_wheel_builder

docker build . -t $tag --build-arg BASE_IMAGE=$image_base
docker build . -t $tag --build-arg BASE_IMAGE=$image_base --build-arg ARCH=$arch
docker push $tag
3 changes: 2 additions & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ env:

# This has some of the software we need pre-installed on it
CIBW_MANYLINUX_X86_64_IMAGE: openchemistry/stempy_wheel_builder
CIBW_MANYLINUX_AARCH64_IMAGE: samwelborn/stempy_wheel_builder

# Need to do some setup before repairing the wheel on linux...
CIBW_REPAIR_WHEEL_COMMAND_LINUX: bash .github/scripts/repair_command_linux.sh
Expand Down Expand Up @@ -75,7 +76,7 @@ jobs:
- name: Build wheels
run: cibuildwheel --output-dir wheelhouse
env:
CIBW_ARCHS_LINUX: auto aarch64
CIBW_ARCHS_LINUX: aarch64

- uses: actions/upload-artifact@v3
with:
Expand Down

0 comments on commit 2d6f947

Please sign in to comment.