From 420bc17c056b03166cc7ecce078ad941af689ab9 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Sat, 18 Jun 2022 02:05:28 +0200
Subject: [PATCH] ci: delete arm from manifset merge job

---
 .../build_and_push_docker_images.yaml         | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml
index 86a8a9274..eb2656c1f 100644
--- a/.github/workflows/build_and_push_docker_images.yaml
+++ b/.github/workflows/build_and_push_docker_images.yaml
@@ -105,6 +105,9 @@ jobs:
           - ${{ needs.prepare.outputs.BUILD_PROFILE }}
         build_elixir:
           - no_elixir
+        registry:
+          - 'docker.io'
+         #- 'public.ecr.aws'
         os:
           - [alpine3.15.1, "alpine:3.15.1", "deploy/docker/Dockerfile.alpine"]
           - [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
@@ -117,30 +120,28 @@ jobs:
         build_machine:
           - aws-arm64
           - ubuntu-20.04
-        registry:
-          - 'docker.io'
         exclude:
           - arch: arm64
             build_machine: ubuntu-20.04
           - arch: amd64
             build_machine: aws-arm64
         include:
-          - os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
+          - arch: amd64
             profile: emqx
+            build_elixir: with_elixir
+            registry: 'docker.io'
+            os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
             otp: 24.2.1-1
             elixir: 1.13.4
-            arch: amd64
-            build_elixir: with_elixir
             build_machine: ubuntu-20.04
-            registry: 'docker.io'
-          - os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
+          - arch: arm64
             profile: emqx
+            build_elixir: with_elixir
+            registry: 'docker.io'
+            os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
             otp: 24.2.1-1
             elixir: 1.13.4
-            arch: arm64
-            build_elixir: with_elixir
             build_machine: aws-arm64
-            registry: 'docker.io'
 
     steps:
     - uses: AutoModality/action-clean@v1
@@ -246,29 +247,22 @@ jobs:
           - aws-arm64
           - ubuntu-20.04
         registries:
-          - docker.io
+          - 'docker.io'
+         #- 'public.ecr.aws'
         exclude:
           - arch: arm64
             build_machine: ubuntu-20.04
           - arch: amd64
             build_machine: aws-arm64
         include:
-          - os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
+          - arch: amd64
             profile: emqx
+            build_elixir: with_elixir
+            os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
             otp: 24.2.1-1
             elixir: 1.13.4
-            arch: amd64
-            build_elixir: with_elixir
             build_machine: ubuntu-20.04
             registry: docker.io
-          - os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
-            profile: emqx
-            otp: 24.2.1-1
-            elixir: 1.13.4
-            arch: arm64
-            build_elixir: with_elixir
-            build_machine: aws-arm64
-            registry: docker.io
 
     steps:
       - uses: actions/download-artifact@v2