Просмотр исходного кода

fix: remove bison from the required tools when building emqx

Shawn 3 лет назад
Родитель
Сommit
7bc2d9edbb
4 измененных файлов с 4 добавлено и 4 удалено
  1. 1 1
      apps/emqx_rule_engine/i18n/emqx_rule_engine_schema.conf
  2. 1 1
      mix.exs
  3. 1 1
      rebar.config.erl
  4. 1 1
      scripts/prepare-build-deps.sh

+ 1 - 1
apps/emqx_rule_engine/i18n/emqx_rule_engine_schema.conf

@@ -242,7 +242,7 @@ of the rule, then the string "undefined" is used.
     rule_engine_jq_function_default_timeout {
     rule_engine_jq_function_default_timeout {
       desc {
       desc {
           en: "Default timeout for the `jq` rule engine function"
           en: "Default timeout for the `jq` rule engine function"
-          zh: “规则引擎内建函数 `jq` 默认时间限制”
+          zh: "规则引擎内建函数 `jq` 默认时间限制"
       }
       }
       label: {
       label: {
           en: "Rule engine jq function default timeout"
           en: "Rule engine jq function default timeout"

+ 1 - 1
mix.exs

@@ -611,7 +611,7 @@ defmodule EMQXUmbrella.MixProject do
 
 
   defp jq_dep() do
   defp jq_dep() do
     if enable_jq?(),
     if enable_jq?(),
-      do: [{:jq, github: "emqx/jq", tag: "v0.3.0", override: true}],
+      do: [{:jq, github: "emqx/jq", tag: "v0.3.1", override: true}],
       else: []
       else: []
   end
   end
 
 

+ 1 - 1
rebar.config.erl

@@ -41,7 +41,7 @@ quicer() ->
     {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.9"}}}.
     {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.9"}}}.
 
 
 jq() ->
 jq() ->
-    {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.0"}}}.
+    {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.1"}}}.
 
 
 deps(Config) ->
 deps(Config) ->
     {deps, OldDeps} = lists:keyfind(deps, 1, Config),
     {deps, OldDeps} = lists:keyfind(deps, 1, Config),

+ 1 - 1
scripts/prepare-build-deps.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 
 AUTO_INSTALL_BUILD_DEPS="${AUTO_INSTALL_BUILD_DEPS:-0}"
 AUTO_INSTALL_BUILD_DEPS="${AUTO_INSTALL_BUILD_DEPS:-0}"
 
 
-required_packages_mac_osx="freetds unixodbc bison"
+required_packages_mac_osx="freetds unixodbc"
 required_cmds_mac_osx="curl zip unzip autoconf automake cmake openssl"
 required_cmds_mac_osx="curl zip unzip autoconf automake cmake openssl"
 
 
 dependency_missing() {
 dependency_missing() {