updates

.github/workflows/build.yml

@@ -23,29 +23,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [ x86_64, i686, aarch64 ]
+        arch: [
+          x86_64,
+          aarch64
+        ]
         version: [
-          #13.0.1,
-          #14.0.6,
-          15.0.7,
+          17.0.6,
         ]
     steps:
       - uses: actions/checkout@v3
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
-          platforms: "386,arm64"
+          platforms: "arm64"
 
       - name: Build and push image
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           push: true

Dockerfile

@@ -1,10 +1,12 @@
 ARG ARCH=x86_64
+
 FROM quay.io/pypa/manylinux2014_$ARCH
 
 WORKDIR /ws
 
 ## Install Ninja
-RUN git clone --depth 1 --branch v1.11.1 https://github.com/ninja-build/ninja.git &&\
+RUN \
+    git clone --depth 1 --branch v1.11.1 https://github.com/ninja-build/ninja.git && \
     cmake -S ninja -B build -DCMAKE_BUILD_TYPE=Release && \
     cmake --build build --target install -j "$(nproc)" && \
     rm -rf ninja build

README.md

@@ -4,7 +4,7 @@ This repository contains a number of Dockerfiles that are used by Halide's
 continuous integration system to speed up packaging (and maybe someday testing)
 workflows.
 
-At the moment, the six-hour time limit on GitHub Actions makes the i686 and
+At the moment, the six-hour time limit on GitHub Actions makes the
 aarch64 copies of `manylinux2014-*-llvm` unable to be built and deployed
 automatically. Instead, until a cross-compiling solution can be devised, these
 images will have to be constructed and pushed locally.

build-images.sh

@@ -8,8 +8,12 @@ LLVM_TAG=$1
 
 build_image() {
   ARCH="$1"
-  docker build -t "ghcr.io/halide/manylinux2014_$ARCH-llvm:$LLVM_TAG" --build-arg "LLVM_TAG=llvmorg-$LLVM_TAG" --build-arg "ARCH=$ARCH" .
+  docker build \
+    --tag "ghcr.io/halide/manylinux2014_$ARCH-llvm:$LLVM_TAG" \
+    --build-arg "LLVM_TAG=llvmorg-$LLVM_TAG" \
+    --build-arg "ARCH=$ARCH" \
+    .
 }
 
-build_image x86_64
 build_image aarch64
+build_image x86_64