From 7df1e6cb364eee108ead5d7049ed8b0576ae8e28 Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Tue, 27 Dec 2022 18:38:12 +0300 Subject: [PATCH 1/2] fix(ci): bump to jq v0.3.9 with OTP-25 prebuilt binaries This should heal OTP-25 package builds targeting amzn2. --- mix.exs | 2 +- rebar.config.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mix.exs b/mix.exs index 1bf30486e..67ccc9354 100644 --- a/mix.exs +++ b/mix.exs @@ -640,7 +640,7 @@ defmodule EMQXUmbrella.MixProject do defp jq_dep() do if enable_jq?(), - do: [{:jq, github: "emqx/jq", tag: "v0.3.8", override: true}], + do: [{:jq, github: "emqx/jq", tag: "v0.3.9", override: true}], else: [] end diff --git a/rebar.config.erl b/rebar.config.erl index 1770fc66f..e8b1271f2 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -42,7 +42,7 @@ quicer() -> {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.16"}}}. jq() -> - {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.8"}}}. + {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.9"}}}. deps(Config) -> {deps, OldDeps} = lists:keyfind(deps, 1, Config), From 9aeb5a15a0646f50d1f109c92ab6cb104b826d4e Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Wed, 28 Dec 2022 12:10:42 +0300 Subject: [PATCH 2/2] ci: reenable OTP-25 package builds targeting amzn2 --- .github/workflows/build_packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 92ddc8933..36deef717 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -233,7 +233,7 @@ jobs: elixir: 1.13.4 release_with: elixir - profile: emqx - otp: 24.3.4.2-1 # TODO: 25.1.2-2 + otp: 25.1.2-2 arch: amd64 os: amzn2 build_machine: ubuntu-20.04