From 5c40b1dffd5eb3a374d3243b54962db7041d0c02 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 25 Nov 2022 13:09:02 +0100 Subject: [PATCH 1/2] ci: build macos release packages for apple silicon (arm64) --- .github/workflows/build_packages.yaml | 9 ++++----- changes/v5.0.11-en.md | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index b738ab999..5149b5d46 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -74,7 +74,7 @@ jobs: esac ;; esac - echo "::set-output name=BUILD_PROFILE::$PROFILE" + echo "BUILD_PROFILE=$PROFILE" >> $GITHUB_OUTPUT - name: get_all_deps run: | make -C source deps-all @@ -143,8 +143,10 @@ jobs: - 24.3.4.2-1 os: - macos-11 + - macos-12-arm64 runs-on: ${{ matrix.os }} steps: + - uses: emqx/self-hosted-cleanup-action@v1.0.3 - uses: actions/download-artifact@v3 with: name: source @@ -152,11 +154,8 @@ jobs: - name: unzip source code run: | ln -s . source - unzip -q source.zip + unzip -o -q source.zip rm source source.zip - - name: prepare - run: | - git config --global credential.helper store - uses: ./.github/actions/package-macos with: profile: ${{ matrix.profile }} diff --git a/changes/v5.0.11-en.md b/changes/v5.0.11-en.md index e53c5785e..3bf1c6aa7 100644 --- a/changes/v5.0.11-en.md +++ b/changes/v5.0.11-en.md @@ -23,6 +23,8 @@ - Keep MQTT v5 User-Property pairs from bridge ingested MQTT messsages to bridge target [#9398](https://github.com/emqx/emqx/pull/9398). +- Start building MacOS packages for Apple Silicon hadrdware [#9423](https://github.com/emqx/emqx/pull/9423). + ## Bug fixes - Fix `ssl.existingName` option of helm chart not working [#9307](https://github.com/emqx/emqx/issues/9307). From a14d40e596a6ab9e29ea74c0848991c8a1575f5e Mon Sep 17 00:00:00 2001 From: firest Date: Fri, 25 Nov 2022 21:39:12 +0800 Subject: [PATCH 2/2] chore: update changes --- changes/v5.0.11-en.md | 2 -- changes/v5.0.12-en.md | 2 ++ changes/v5.0.12-zh.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changes/v5.0.11-en.md b/changes/v5.0.11-en.md index 3bf1c6aa7..e53c5785e 100644 --- a/changes/v5.0.11-en.md +++ b/changes/v5.0.11-en.md @@ -23,8 +23,6 @@ - Keep MQTT v5 User-Property pairs from bridge ingested MQTT messsages to bridge target [#9398](https://github.com/emqx/emqx/pull/9398). -- Start building MacOS packages for Apple Silicon hadrdware [#9423](https://github.com/emqx/emqx/pull/9423). - ## Bug fixes - Fix `ssl.existingName` option of helm chart not working [#9307](https://github.com/emqx/emqx/issues/9307). diff --git a/changes/v5.0.12-en.md b/changes/v5.0.12-en.md index e3217a89a..5f72cb174 100644 --- a/changes/v5.0.12-en.md +++ b/changes/v5.0.12-en.md @@ -4,4 +4,6 @@ - Improve the CLI to avoid waste atom table when typing erros [#9416](https://github.com/emqx/emqx/pull/9416). +- Start building MacOS packages for Apple Silicon hadrdware [#9423](https://github.com/emqx/emqx/pull/9423). + ## Bug fixes diff --git a/changes/v5.0.12-zh.md b/changes/v5.0.12-zh.md index 0254619c4..ea7c8793d 100644 --- a/changes/v5.0.12-zh.md +++ b/changes/v5.0.12-zh.md @@ -6,3 +6,4 @@ - 优化命令行实现, 避免输入错误指令时, 产生不必要的原子表消耗 [#9416](https://github.com/emqx/emqx/pull/9416)。 +- 支持在 Apple Silicon 架构下编译苹果系统的发行版本 [#9423](https://github.com/emqx/emqx/pull/9423)。