Merge pull request #44 from emqx/otp26

OTP 26
emqx · Nov 28, 2023 · 504b771 · 504b771
2 parents 1b6f52d + be2de17
commit 504b771
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/eunit.yaml b/.github/workflows/eunit.yaml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         otp:
-          - 25.3.2-1
+          - 26.1.2-1
         os:
           - macos-12-arm64
     runs-on: ${{ matrix.os }}
@@ -35,11 +35,11 @@ jobs:
       fail-fast: false
       matrix:
         builder:
-          - 5.1-3
+          - 5.2-7
         otp:
-          - 25.3.2-1
+          - 26.1.2-1
         elixir:
-          - 1.14.5
+          - 1.15.7
         os:
           - ubuntu22.04
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,7 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         otp:
-          - 25.3.2-1
+          - 25.3.2-2
+          - 26.1.2-1
         os:
           - macos-11
           - macos-12
@@ -53,11 +54,8 @@ jobs:
       fail-fast: false
       matrix:
         builder:
-          - 5.1-3
-        otp:
-          - 25.3.2-1
-        elixir:
-          - 1.14.5
+          - 5.1-3:1.14.5-25.3.2-1
+          - 5.2-7:1.15.7-26.1.2-1
         arch:
           - amd64
           - arm64
@@ -78,7 +76,7 @@ jobs:
           - alpine3.15.1
     runs-on: ubuntu-latest
     env:
-      IMAGE: ghcr.io/emqx/emqx-builder/${{ matrix.builder }}:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
+      IMAGE: ghcr.io/emqx/emqx-builder/${{ matrix.builder }}-${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3

diff --git a/c_src/Makefile b/c_src/Makefile
@@ -44,12 +44,12 @@ endif
 
 LIBJQ_NAME := $(LIBJQ_DIR)/$(LIBJQ)
 
-ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~ts/erts-~ts/include/\", [code:root_dir(), erlang:system_info(version)]).")
-ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, include)]).")
+ERTS_INCLUDE_DIR ?= $(shell erl -noshell -eval "io:format(\"~ts/erts-~ts/include/\", [code:root_dir(), erlang:system_info(version)]), erlang:halt().")
+ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, include)]), erlang:halt().")
 JQ_INCLUDE_DIR ?= $(JQSRC_DIR)/src
 DS_INCLUDE_DIR ?= libs/c_reusable_data_structures
 
-ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, lib)]).")
+ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, lib)]), erlang:halt().")
 
 PRIV_DIR = ../priv
 C_SRC_DIR = ./

diff --git a/test/jq_tests.erl b/test/jq_tests.erl
@@ -298,7 +298,7 @@ concurrent_queries_t_() ->
      fun() ->
              NrOfScheds = erlang:system_info(schedulers),
              Qubes = qubes(NrOfScheds),
-             erlang:display_nl(),
+             io:format("~n", []),
              [(ok = concurrent_queries_test(NrOfTestProcess, true, 500, 5000))
               || NrOfTestProcess <- Qubes],
              ok = concurrent_queries_test(NrOfScheds, false, 0, 100),