ci: delete arm from manifset merge job

This commit is contained in:
Zaiming (Stone) Shi 2022-06-18 02:05:28 +02:00
parent 8deff722e4
commit 420bc17c05
1 changed files with 16 additions and 22 deletions

View File

@ -105,6 +105,9 @@ jobs:
- ${{ needs.prepare.outputs.BUILD_PROFILE }} - ${{ needs.prepare.outputs.BUILD_PROFILE }}
build_elixir: build_elixir:
- no_elixir - no_elixir
registry:
- 'docker.io'
#- 'public.ecr.aws'
os: os:
- [alpine3.15.1, "alpine:3.15.1", "deploy/docker/Dockerfile.alpine"] - [alpine3.15.1, "alpine:3.15.1", "deploy/docker/Dockerfile.alpine"]
- [debian11, "debian:11-slim", "deploy/docker/Dockerfile"] - [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
@ -117,30 +120,28 @@ jobs:
build_machine: build_machine:
- aws-arm64 - aws-arm64
- ubuntu-20.04 - ubuntu-20.04
registry:
- 'docker.io'
exclude: exclude:
- arch: arm64 - arch: arm64
build_machine: ubuntu-20.04 build_machine: ubuntu-20.04
- arch: amd64 - arch: amd64
build_machine: aws-arm64 build_machine: aws-arm64
include: include:
- os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"] - arch: amd64
profile: emqx profile: emqx
build_elixir: with_elixir
registry: 'docker.io'
os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
otp: 24.2.1-1 otp: 24.2.1-1
elixir: 1.13.4 elixir: 1.13.4
arch: amd64
build_elixir: with_elixir
build_machine: ubuntu-20.04 build_machine: ubuntu-20.04
registry: 'docker.io' - arch: arm64
- os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
profile: emqx profile: emqx
build_elixir: with_elixir
registry: 'docker.io'
os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
otp: 24.2.1-1 otp: 24.2.1-1
elixir: 1.13.4 elixir: 1.13.4
arch: arm64
build_elixir: with_elixir
build_machine: aws-arm64 build_machine: aws-arm64
registry: 'docker.io'
steps: steps:
- uses: AutoModality/action-clean@v1 - uses: AutoModality/action-clean@v1
@ -246,29 +247,22 @@ jobs:
- aws-arm64 - aws-arm64
- ubuntu-20.04 - ubuntu-20.04
registries: registries:
- docker.io - 'docker.io'
#- 'public.ecr.aws'
exclude: exclude:
- arch: arm64 - arch: arm64
build_machine: ubuntu-20.04 build_machine: ubuntu-20.04
- arch: amd64 - arch: amd64
build_machine: aws-arm64 build_machine: aws-arm64
include: include:
- os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"] - arch: amd64
profile: emqx profile: emqx
build_elixir: with_elixir
os: [debian11, "debian:11-slim", "deploy/docker/Dockerfile"]
otp: 24.2.1-1 otp: 24.2.1-1
elixir: 1.13.4 elixir: 1.13.4
arch: amd64
build_elixir: with_elixir
build_machine: ubuntu-20.04 build_machine: ubuntu-20.04
registry: docker.io 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: steps:
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2