From bf2597a7c1fbabb82dbc7ecaa0955d4c3c30030a Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Tue, 2 Jul 2024 23:51:39 -0500
Subject: [PATCH 1/5] [ci] use manylinux_2_28 for aarch64 builds

---
 .github/workflows/publish_image.yml               |  4 ++--
 .../Dockerfile                                    | 15 +++------------
 2 files changed, 5 insertions(+), 14 deletions(-)
 rename images/{manylinux2014_aarch64 => manylinux_2_28_aarch64}/Dockerfile (68%)

diff --git a/.github/workflows/publish_image.yml b/.github/workflows/publish_image.yml
index a4cb98f..692926f 100644
--- a/.github/workflows/publish_image.yml
+++ b/.github/workflows/publish_image.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - docker_image: manylinux2014_aarch64
+          - docker_image: manylinux_2_28_aarch64
             arch: linux/arm64
           - docker_image: manylinux_2_28_x86_64
             arch: linux/amd64
@@ -40,7 +40,7 @@ jobs:
         uses: docker/setup-qemu-action@v3
         if: matrix.arch != 'linux/amd64'
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ${{ github.workspace }}/images/${{ matrix.docker_image }}/
           push: true
diff --git a/images/manylinux2014_aarch64/Dockerfile b/images/manylinux_2_28_aarch64/Dockerfile
similarity index 68%
rename from images/manylinux2014_aarch64/Dockerfile
rename to images/manylinux_2_28_aarch64/Dockerfile
index 34418c0..349def8 100644
--- a/images/manylinux2014_aarch64/Dockerfile
+++ b/images/manylinux_2_28_aarch64/Dockerfile
@@ -1,24 +1,15 @@
-FROM quay.io/pypa/manylinux2014_aarch64
+FROM quay.io/pypa/manylinux_2_28_aarch64
 
-RUN yum update \
+RUN yum update -y \
  && yum install -y \
     epel-release \
     gcc-c++ \
     hwloc-devel \
-    sudo \
- && yum clean all \
- && rm -rf /var/cache/yum
-
-RUN yum install -y \
-    llvm-toolset-7.0-clang-devel \
-    llvm-toolset-7.0-llvm-devel \
     ocl-icd-devel \
+    sudo \
  && yum clean all \
  && rm -rf /var/cache/yum
 
-ENV LD_LIBRARY_PATH "/opt/rh/llvm-toolset-7.0/root/usr/lib64:${LD_LIBRARY_PATH}"
-ENV PATH "/opt/rh/llvm-toolset-7.0/root/usr/bin:${PATH}"
-
 RUN git clone --depth 1 --branch v1.8 https://github.com/pocl/pocl.git \
  && cmake \
     -B pocl/build \

From 7de4e9c5d025cf8f86135d1c72206dea3ac2ab45 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Tue, 2 Jul 2024 23:58:30 -0500
Subject: [PATCH 2/5] try adding llvm-toolset

---
 images/manylinux_2_28_aarch64/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/manylinux_2_28_aarch64/Dockerfile b/images/manylinux_2_28_aarch64/Dockerfile
index 349def8..91d6d07 100644
--- a/images/manylinux_2_28_aarch64/Dockerfile
+++ b/images/manylinux_2_28_aarch64/Dockerfile
@@ -5,6 +5,7 @@ RUN yum update -y \
     epel-release \
     gcc-c++ \
     hwloc-devel \
+    llvm-toolset \
     ocl-icd-devel \
     sudo \
  && yum clean all \

From bd79cb129c3ac3ea1ae70d039fd4fa22b3886269 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Tue, 2 Jul 2024 23:58:55 -0500
Subject: [PATCH 3/5] comment out x86_64

---
 .github/workflows/publish_image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish_image.yml b/.github/workflows/publish_image.yml
index 692926f..7e39be7 100644
--- a/.github/workflows/publish_image.yml
+++ b/.github/workflows/publish_image.yml
@@ -18,8 +18,8 @@ jobs:
         include:
           - docker_image: manylinux_2_28_aarch64
             arch: linux/arm64
-          - docker_image: manylinux_2_28_x86_64
-            arch: linux/amd64
+          # - docker_image: manylinux_2_28_x86_64
+          #   arch: linux/amd64
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

From 13aae1b7702e907b1b6d6af32f6eb3bea999aa11 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Wed, 3 Jul 2024 00:07:01 -0500
Subject: [PATCH 4/5] module install

---
 images/manylinux_2_28_aarch64/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/images/manylinux_2_28_aarch64/Dockerfile b/images/manylinux_2_28_aarch64/Dockerfile
index 91d6d07..cfd4281 100644
--- a/images/manylinux_2_28_aarch64/Dockerfile
+++ b/images/manylinux_2_28_aarch64/Dockerfile
@@ -5,9 +5,10 @@ RUN yum update -y \
     epel-release \
     gcc-c++ \
     hwloc-devel \
-    llvm-toolset \
     ocl-icd-devel \
     sudo \
+ && yum module install -y \
+      llvm-toolset
  && yum clean all \
  && rm -rf /var/cache/yum
 

From 8211cc4ae10f9f67e39618549a027c03629c52b2 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Wed, 3 Jul 2024 00:08:51 -0500
Subject: [PATCH 5/5] typo

---
 images/manylinux_2_28_aarch64/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/manylinux_2_28_aarch64/Dockerfile b/images/manylinux_2_28_aarch64/Dockerfile
index cfd4281..b44bce2 100644
--- a/images/manylinux_2_28_aarch64/Dockerfile
+++ b/images/manylinux_2_28_aarch64/Dockerfile
@@ -8,7 +8,7 @@ RUN yum update -y \
     ocl-icd-devel \
     sudo \
  && yum module install -y \
-      llvm-toolset
+      llvm-toolset \
  && yum clean all \
  && rm -rf /var/cache/yum