yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: fix build_packages workflows

This commit is contained in:
Ivan Dyachkov 2023-10-05 12:56:53 +02:00
parent 72720389ff
commit 9f4afcaa5c
3 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/_push-entrypoint.yaml vendored
View File

@ -11,9 +11,7 @@ on:
- 'e*' - 'e*'
branches: branches:
- 'master' - 'master'
- 'release-51' - 'release-5?'
- 'release-52'
- 'release-53'
- 'ci/**' - 'ci/**'
env: env:
@ -21,7 +19,7 @@ env:
jobs: jobs:
prepare: prepare:
runs-on: ${{ fromJSON(github.repository_owner == 'emqx' && '["aws-amd64"]' || '["ubuntu-22.04"]') }} runs-on: ${{ fromJSON(github.repository_owner == 'emqx' && '["self-hosted", "ephemeral"]' || '["ubuntu-22.04"]') }}
container: 'ghcr.io/emqx/emqx-builder/5.1-4:1.14.5-25.3.2-2-ubuntu22.04' container: 'ghcr.io/emqx/emqx-builder/5.1-4:1.14.5-25.3.2-2-ubuntu22.04'
outputs: outputs:
profile: ${{ steps.parse-git-ref.outputs.profile }} profile: ${{ steps.parse-git-ref.outputs.profile }}
@ -95,7 +93,6 @@ jobs:
otp_vsn: ${{ needs.prepare.outputs.otp_vsn }} otp_vsn: ${{ needs.prepare.outputs.otp_vsn }}
elixir_vsn: ${{ needs.prepare.outputs.elixir_vsn }} elixir_vsn: ${{ needs.prepare.outputs.elixir_vsn }}
builder_vsn: ${{ needs.prepare.outputs.builder_vsn }} builder_vsn: ${{ needs.prepare.outputs.builder_vsn }}
runner_labels: ${{ needs.prepare.outputs.runner_labels }}
secrets: inherit secrets: inherit
build_and_push_docker_images: build_and_push_docker_images:

22
.github/workflows/build_packages.yaml vendored
View File

@ -19,9 +19,6 @@ on:
elixir_vsn: elixir_vsn:
required: true required: true
type: string type: string
runner_labels:
required: true
type: string
builder_vsn: builder_vsn:
required: true required: true
type: string type: string
@ -62,10 +59,6 @@ on:
required: false required: false
type: string type: string
default: '1.14.5' default: '1.14.5'
runner_labels:
required: false
type: string
default: '["self-hosted","ephemeral"]'
builder_vsn: builder_vsn:
required: false required: false
type: string type: string
@ -158,7 +151,7 @@ jobs:
path: _packages/${{ matrix.profile }}/ path: _packages/${{ matrix.profile }}/
linux: linux:
runs-on: ${{ matrix.build_machine }} runs-on: ['self-hosted', 'linux', "${{ matrix.arch }}"]
# always run in builder container because the host might have the wrong OTP version etc. # always run in builder container because the host might have the wrong OTP version etc.
# otherwise buildx.sh does not run docker if arch and os matches the target arch and os. # otherwise buildx.sh does not run docker if arch and os matches the target arch and os.
container: container:
@ -172,7 +165,7 @@ jobs:
otp: otp:
- ${{ inputs.otp_vsn }} - ${{ inputs.otp_vsn }}
arch: arch:
- amd64 - x64
- arm64 - arm64
os: os:
- ubuntu22.04 - ubuntu22.04
@ -186,26 +179,17 @@ jobs:
- el7 - el7
- amzn2 - amzn2
- amzn2023 - amzn2023
build_machine:
- aws-arm64
- aws-amd64
builder: builder:
- ${{ inputs.builder_vsn }} - ${{ inputs.builder_vsn }}
elixir: elixir:
- ${{ inputs.elixir_vsn }} - ${{ inputs.elixir_vsn }}
with_elixir: with_elixir:
- 'no' - 'no'
exclude:
- arch: arm64
build_machine: aws-amd64
- arch: amd64
build_machine: aws-arm64
include: include:
- profile: emqx - profile: emqx
otp: ${{ inputs.otp_vsn }} otp: ${{ inputs.otp_vsn }}
arch: amd64 arch: x64
os: ubuntu22.04 os: ubuntu22.04
build_machine: aws-amd64
builder: ${{ inputs.builder_vsn }} builder: ${{ inputs.builder_vsn }}
elixir: ${{ inputs.elixir_vsn }} elixir: ${{ inputs.elixir_vsn }}
with_elixir: 'yes' with_elixir: 'yes'

2
.github/workflows/build_packages_cron.yaml vendored
View File

@ -12,7 +12,7 @@ on:
jobs: jobs:
linux: linux:
if: github.repository_owner == 'emqx' if: github.repository_owner == 'emqx'
runs-on: ['self-hosted', 'linux', 'x64', 'ephemeral'] runs-on: ['self-hosted', 'linux', "${{ matrix.arch }}", 'ephemeral']
container: container:
image: "ghcr.io/emqx/emqx-builder/${{ matrix.builder }}:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" image: "ghcr.io/emqx/emqx-builder/${{ matrix.builder }}:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"