From 170f9940719c4beaea1e880e45b9b42230b9450f Mon Sep 17 00:00:00 2001 From: "Paulo F. Oliveira" Date: Fri, 14 May 2021 10:15:10 +0100 Subject: [PATCH 1/3] Tweak CI versions (add 24.0) --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e897bc..36041ec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - otp_version: [19.3.6, 20.3.8.26, 21.3.8.16, 22.3.4.2, 23.0.2] + otp_version: ['19.3.6', '20.3.8.26', '21.3.8.16', '22.3.4.2', '23.0.2', '24.0'] os: [ubuntu-18.04] steps: From 9ccf51167b7a258272ab58c783b87388bff76818 Mon Sep 17 00:00:00 2001 From: "Paulo F. Oliveira" Date: Fri, 14 May 2021 10:28:13 +0100 Subject: [PATCH 2/3] Try to solve an issue via a ver.bump (I'm not sure this will fix it, but IIRC gleam-lang/setup-erlang is pulling from ESL and that contains a proper 24.0) --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36041ec..fd76f33 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: gleam-lang/setup-erlang@v1.0.0 + - uses: gleam-lang/setup-erlang@v1.1.2 with: otp-version: ${{ matrix.otp_version }} From 6513aa3b05326233920e3fb663b8c52b7bcb49ed Mon Sep 17 00:00:00 2001 From: "Paulo F. Oliveira" Date: Fri, 14 May 2021 10:42:35 +0100 Subject: [PATCH 3/3] Adapt to OTP 24 --- src/jsx_to_json.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jsx_to_json.erl b/src/jsx_to_json.erl index d20add6..5b877e2 100644 --- a/src/jsx_to_json.erl +++ b/src/jsx_to_json.erl @@ -325,7 +325,8 @@ encode_test_() -> }, {"1.0e23", ?_assert(encode(float, 1.0e23, #config{}) =:= ["1.0e23"])}, {"0.3", ?_assert(encode(float, 3.0/10.0, #config{}) =:= ["0.3"])}, - {"0.0001", ?_assert(encode(float, 0.0001, #config{}) =:= ["0.0001"])}, + {"0.0001", ?_assert(encode(float, 0.0001, #config{}) =:= ["0.0001"] + orelse encode(float, 0.0001, #config{}) =:= ["1.0e-4"])}, % OTP-24 {"0.00001", ?_assert(encode(float, 0.00001, #config{}) =:= ["1.0e-5"])}, {"0.00000001", ?_assert(encode(float, 0.00000001, #config{}) =:= ["1.0e-8"])}, {"1.0e-323", ?_assert(encode(float, 1.0e-323, #config{}) =:= ["1.0e-323"])},