From b686e8c45bcc8b5e9dcffd4de7e95cfa0d04f6fa Mon Sep 17 00:00:00 2001
From: Alexander <4584443+DragonStuff@users.noreply.github.com>
Date: Sun, 29 Aug 2021 11:54:49 +0900
Subject: [PATCH 1/4] fix(ci): update latest to only run once

---
 .github/workflows/container_latest.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/container_latest.yml b/.github/workflows/container_latest.yml
index 6536805db..33cbf5153 100644
--- a/.github/workflows/container_latest.yml
+++ b/.github/workflows/container_latest.yml
@@ -8,10 +8,6 @@ on:
 jobs:
   build-latest:
     runs-on: [ubuntu-latest]
-    strategy:
-      matrix:
-        platform: [ linux ]
-        arch: [ amd64, arm, arm64, 386 ]
 
     steps:
       -
@@ -60,16 +56,12 @@ jobs:
           context: ./docker
           push: ${{ github.event_name != 'pull_request' }}
           file: ./docker/Dockerfile
-          platforms: ${{ matrix.platform }}/${{ matrix.arch }}
+          platforms: linux/amd64, linux/arm, linux/arm64, linux/386
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
 
   build-dev:
     runs-on: [ubuntu-latest]
-    strategy:
-      matrix:
-        platform: [ linux ]
-        arch: [ amd64, arm, arm64, 386 ]
 
     steps:
       -
@@ -119,6 +111,6 @@ jobs:
           context: ./docker
           push: ${{ github.event_name != 'pull_request' }}
           file: ./docker/Dockerfile.go_build
-          platforms: ${{ matrix.platform }}/${{ matrix.arch }}
+          platforms: linux/amd64, linux/arm, linux/arm64, linux/386
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}

From 16f0cdc1bf02b8c0cbd37c6e1b2a64f69cb7a1f7 Mon Sep 17 00:00:00 2001
From: Alexander <4584443+DragonStuff@users.noreply.github.com>
Date: Sun, 29 Aug 2021 11:57:08 +0900
Subject: [PATCH 2/4] fix(ci): never try to push on test pull request

---
 .github/workflows/container_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/container_test.yml b/.github/workflows/container_test.yml
index 410d1d21a..d787b988b 100644
--- a/.github/workflows/container_test.yml
+++ b/.github/workflows/container_test.yml
@@ -47,7 +47,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./docker
-          push: ${{ github.event_name != 'pull_request' }}
+          push: false
           file: ./docker/Dockerfile
           platforms: ${{ matrix.platform }}/${{ matrix.arch }}
           tags: ${{ steps.docker_meta.outputs.tags }}

From bfb66b88b1d714c2d24e0de0f35fb807e381fa25 Mon Sep 17 00:00:00 2001
From: Alexander <4584443+DragonStuff@users.noreply.github.com>
Date: Sun, 29 Aug 2021 12:02:58 +0900
Subject: [PATCH 3/4] fix(ci): do not run on mainline branch

---
 .github/workflows/binary_test.yml    | 4 ++++
 .github/workflows/container_test.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/binary_test.yml b/.github/workflows/binary_test.yml
index 288abc848..1cad91f82 100644
--- a/.github/workflows/binary_test.yml
+++ b/.github/workflows/binary_test.yml
@@ -2,6 +2,10 @@ name: Cross-platform binary build test
 
 on:
   push:
+    branches-ignore:
+      - master
+    tags-ignore:
+      - *
   pull_request:
   workflow_dispatch: []
 
diff --git a/.github/workflows/container_test.yml b/.github/workflows/container_test.yml
index d787b988b..2590f09e3 100644
--- a/.github/workflows/container_test.yml
+++ b/.github/workflows/container_test.yml
@@ -2,6 +2,10 @@ name: Test Building Container Images
 
 on:
   push:
+    branches-ignore:
+      - master
+    tags-ignore:
+      - *
   pull_request:
   workflow_dispatch: []
 

From 7cfaa1a3652fc6703402cb5699ec674f14337ec8 Mon Sep 17 00:00:00 2001
From: Alexander <4584443+DragonStuff@users.noreply.github.com>
Date: Sun, 29 Aug 2021 12:06:10 +0900
Subject: [PATCH 4/4] fix(ci): further testing of CI logic

---
 .github/workflows/binary_test.yml    | 5 -----
 .github/workflows/container_test.yml | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/.github/workflows/binary_test.yml b/.github/workflows/binary_test.yml
index 1cad91f82..d9e726292 100644
--- a/.github/workflows/binary_test.yml
+++ b/.github/workflows/binary_test.yml
@@ -1,11 +1,6 @@
 name: Cross-platform binary build test
 
 on:
-  push:
-    branches-ignore:
-      - master
-    tags-ignore:
-      - *
   pull_request:
   workflow_dispatch: []
 
diff --git a/.github/workflows/container_test.yml b/.github/workflows/container_test.yml
index 2590f09e3..94d5965fc 100644
--- a/.github/workflows/container_test.yml
+++ b/.github/workflows/container_test.yml
@@ -1,11 +1,6 @@
 name: Test Building Container Images
 
 on:
-  push:
-    branches-ignore:
-      - master
-    tags-ignore:
-      - *
   pull_request:
   workflow_dispatch: []