From 60b36c3b19f07025f7e4cd6f347fa34cc069f7c1 Mon Sep 17 00:00:00 2001
From: Ben Busby <noreply+git@benbusby.com>
Date: Mon, 11 Oct 2021 20:11:31 -0600
Subject: [PATCH] Update buildx workflow

Buildx workflow now waits for tests to pass before building/uploading
new images.

There's also a separate step for building a properly formatted tag image
if triggered by a new tag.
---
 .github/workflows/buildx.yml | 20 +++++++++++++++++---
 .github/workflows/pypi.yml   |  4 +++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
index 0bfd5c4..eaa528d 100644
--- a/.github/workflows/buildx.yml
+++ b/.github/workflows/buildx.yml
@@ -1,13 +1,19 @@
 name: buildx
 
 on:
-  push:
-    branches: main
+  workflow_run:
+    workflows: ["tests"]
+    branches: [main]
+    types:
+      - completed
 
 jobs:
-  build:
+  on-success:
     runs-on: ubuntu-latest
     steps:
+      - name: Wait for tests to succeed
+        if: ${{ github.event.workflow_run.conclusion != 'success' }}
+        run: exit 1
       - name: checkout code
         uses: actions/checkout@v2
       - name: install buildx
@@ -26,3 +32,11 @@ jobs:
           docker buildx build --push \
             --tag benbusby/whoogle-search:latest \
             --platform linux/amd64,linux/arm/v7,linux/arm64 .
+      - name: build and push tag
+        if: startsWith(github.ref, 'refs/tags')
+        run: |
+          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+          docker buildx ls
+          docker buildx build --push \
+            --tag benbusby/whoogle-search:${GITHUB_REF#refs/*/v}\
+            --platform linux/amd64,linux/arm/v7,linux/arm64 .
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 44f4bcf..c2e12db 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -1,6 +1,8 @@
 name: pypi
 
-on: push
+on:
+  push:
+    branches: main
 
 jobs:
   publish-test: