From 662f950b4d374eae5fafb95a489f9ca75d1c42f3 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Thu, 21 Dec 2023 11:09:18 -0300 Subject: [PATCH 1/4] ci: bump ubuntu version for slim packages --- .github/workflows/build_slim_packages.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index a2b6131f4..81e936136 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -51,8 +51,8 @@ jobs: fail-fast: false matrix: profile: - - ["emqx", "26.1.2-2", "ubuntu20.04", "elixir"] - - ["emqx-enterprise", "26.1.2-2", "ubuntu20.04", "erlang"] + - ["emqx", "26.1.2-2", "ubuntu22.04", "elixir"] + - ["emqx-enterprise", "26.1.2-2", "ubuntu22.04", "erlang"] container: "ghcr.io/emqx/emqx-builder/${{ inputs.builder_vsn }}:${{ inputs.elixir_vsn }}-${{ matrix.profile[1] }}-${{ matrix.profile[2] }}" From 6ce84d606c7d2423ab368ff66e395df1a515af17 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 22 Dec 2023 09:48:44 -0300 Subject: [PATCH 2/4] ci: add arm64 package to slim packages workflow --- .github/workflows/build_slim_packages.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 81e936136..167af2246 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -43,7 +43,7 @@ on: jobs: linux: - runs-on: ${{ endsWith(github.repository, '/emqx') && 'ubuntu-22.04' || fromJSON('["self-hosted","ephemeral","linux","x64"]') }} + runs-on: ${{ github.repository_owner == 'emqx' && fromJSON(format('["self-hosted","ephemeral","linux",{0}]'), ${{ matrix.profile[3] }}) || 'ubuntu-22.04' }} env: EMQX_NAME: ${{ matrix.profile[0] }} @@ -51,8 +51,9 @@ jobs: fail-fast: false matrix: profile: - - ["emqx", "26.1.2-2", "ubuntu22.04", "elixir"] - - ["emqx-enterprise", "26.1.2-2", "ubuntu22.04", "erlang"] + - ["emqx", "26.1.2-2", "ubuntu22.04", "elixir", "x64"] + - ["emqx", "26.1.2-2", "ubuntu22.04", "elixir", "arm64"] + - ["emqx-enterprise", "26.1.2-2", "ubuntu22.04", "erlang", "x64"] container: "ghcr.io/emqx/emqx-builder/${{ inputs.builder_vsn }}:${{ inputs.elixir_vsn }}-${{ matrix.profile[1] }}-${{ matrix.profile[2] }}" From 602d2ec88ab08834ae9f1828f8b0c1e5298e78f0 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Tue, 9 Jan 2024 09:09:11 -0300 Subject: [PATCH 3/4] fix: remove unnecessary interpolation Co-authored-by: Ivan Dyachkov --- .github/workflows/build_slim_packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 167af2246..51356d566 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -43,7 +43,7 @@ on: jobs: linux: - runs-on: ${{ github.repository_owner == 'emqx' && fromJSON(format('["self-hosted","ephemeral","linux",{0}]'), ${{ matrix.profile[3] }}) || 'ubuntu-22.04' }} + runs-on: ${{ github.repository_owner == 'emqx' && fromJSON(format('["self-hosted","ephemeral","linux",{0}]', matrix.profile[3])) || 'ubuntu-22.04' }} env: EMQX_NAME: ${{ matrix.profile[0] }} From e6557386bb1a959c45e07566b570046b9aaf6520 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Tue, 9 Jan 2024 13:49:20 -0300 Subject: [PATCH 4/4] fix(ci): bad interpolation and tag Co-authored-by: Ivan Dyachkov --- .github/workflows/build_slim_packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 51356d566..c89d2ab06 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -43,7 +43,7 @@ on: jobs: linux: - runs-on: ${{ github.repository_owner == 'emqx' && fromJSON(format('["self-hosted","ephemeral","linux",{0}]', matrix.profile[3])) || 'ubuntu-22.04' }} + runs-on: ${{ github.repository_owner == 'emqx' && fromJSON(format('["self-hosted","ephemeral","linux","{0}"]', matrix.profile[4])) || 'ubuntu-22.04' }} env: EMQX_NAME: ${{ matrix.profile[0] }}