From 7516a980a4bb9eac80ac486b356aaa88abdc35f0 Mon Sep 17 00:00:00 2001
From: Will Barber <WillB97@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:14:57 +0100
Subject: [PATCH] Build wheel using pushed image

Split image pull step
Run isn't interactive
---
 .github/workflows/build-wheels.yml | 10 +++++-----
 Makefile                           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index 54b7962..2b6e8d4 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -2,9 +2,6 @@ name: Build Wheels
 
 on:
   push:
-    branches: [ "master", "ci" ]
-  pull_request:
-    branches: [ "master" ]
 
 jobs:
   build-image:
@@ -15,9 +12,12 @@ jobs:
         submodules: recursive
         fetch-depth: 0
         fetch-tags: true
-    - name: Build the wheels (& Docker image)
-      run: make build
+    - name: Pull the latest image
+      run: docker pull ghcr.io/willb97/pyapriltags:latest
+    - name: Build the wheels
+      run: docker run --rm -v .:/apriltag -v ./dist:/out ghcr.io/willb97/pyapriltags:latest
     - uses: actions/upload-artifact@v4.3.6
+      if: always()
       with:
         name: wheels
         path: dist
diff --git a/Makefile b/Makefile
index 66b1efd..33451a2 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ build:
 	mkdir -p ${ROOT}/dist
 	# build wheel
 	docker run \
-		-it --rm \
+		--rm \
 		-v ${ROOT}:/apriltag \
 		-v ${ROOT}/dist:/out \
 		pyapriltags:wheel-python3