From 647cb0b96fa029bfc3ffc6082778ab7afe1ab2b2 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Wed, 26 Feb 2025 16:13:39 -0500 Subject: [PATCH 1/8] update ex_doc --- mix.exs | 2 +- mix.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mix.exs b/mix.exs index fed7f93..751d05d 100644 --- a/mix.exs +++ b/mix.exs @@ -41,7 +41,7 @@ defmodule Statix.Mixfile do end defp deps() do - [{:ex_doc, "~> 0.34.2", only: :dev}] + [{:ex_doc, ">= 0.0.0", only: :dev}] end defp docs() do diff --git a/mix.lock b/mix.lock index 5d94884..779ed43 100644 --- a/mix.lock +++ b/mix.lock @@ -1,9 +1,9 @@ %{ "earmark": {:hex, :earmark, "1.4.3", "364ca2e9710f6bff494117dbbd53880d84bebb692dafc3a78eb50aa3183f2bfd", [:mix], [], "hexpm", "8cf8a291ebf1c7b9539e3cddb19e9cef066c2441b1640f13c34c1d3cfc825fec"}, - "earmark_parser": {:hex, :earmark_parser, "1.4.41", "ab34711c9dc6212dda44fcd20ecb87ac3f3fce6f0ca2f28d4a00e4154f8cd599", [:mix], [], "hexpm", "a81a04c7e34b6617c2792e291b5a2e57ab316365c2644ddc553bb9ed863ebefa"}, - "ex_doc": {:hex, :ex_doc, "0.34.2", "13eedf3844ccdce25cfd837b99bea9ad92c4e511233199440488d217c92571e8", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "5ce5f16b41208a50106afed3de6a2ed34f4acfd65715b82a0b84b49d995f95c1"}, - "makeup": {:hex, :makeup, "1.1.2", "9ba8837913bdf757787e71c1581c21f9d2455f4dd04cfca785c70bbfff1a76a3", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cce1566b81fbcbd21eca8ffe808f33b221f9eee2cbc7a1706fc3da9ff18e6cac"}, - "makeup_elixir": {:hex, :makeup_elixir, "0.16.2", "627e84b8e8bf22e60a2579dad15067c755531fea049ae26ef1020cad58fe9578", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "41193978704763f6bbe6cc2758b84909e62984c7752b3784bd3c218bb341706b"}, - "makeup_erlang": {:hex, :makeup_erlang, "1.0.1", "c7f58c120b2b5aa5fd80d540a89fdf866ed42f1f3994e4fe189abebeab610839", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "8a89a1eeccc2d798d6ea15496a6e4870b75e014d1af514b1b71fa33134f57814"}, - "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"}, + "earmark_parser": {:hex, :earmark_parser, "1.4.43", "34b2f401fe473080e39ff2b90feb8ddfeef7639f8ee0bbf71bb41911831d77c5", [:mix], [], "hexpm", "970a3cd19503f5e8e527a190662be2cee5d98eed1ff72ed9b3d1a3d466692de8"}, + "ex_doc": {:hex, :ex_doc, "0.37.2", "2a3aa7014094f0e4e286a82aa5194a34dd17057160988b8509b15aa6c292720c", [:mix], [{:earmark_parser, "~> 1.4.42", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "4dfa56075ce4887e4e8b1dcc121cd5fcb0f02b00391fd367ff5336d98fa49049"}, + "makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"}, + "makeup_elixir": {:hex, :makeup_elixir, "1.0.1", "e928a4f984e795e41e3abd27bfc09f51db16ab8ba1aebdba2b3a575437efafc2", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "7284900d412a3e5cfd97fdaed4f5ed389b8f2b4cb49efc0eb3bd10e2febf9507"}, + "makeup_erlang": {:hex, :makeup_erlang, "1.0.2", "03e1804074b3aa64d5fad7aa64601ed0fb395337b982d9bcf04029d68d51b6a7", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "af33ff7ef368d5893e4a267933e7744e46ce3cf1f61e2dccf53a111ed3aa3727"}, + "nimble_parsec": {:hex, :nimble_parsec, "1.4.2", "8efba0122db06df95bfaa78f791344a89352ba04baedd3849593bfce4d0dc1c6", [:mix], [], "hexpm", "4b21398942dda052b403bbe1da991ccd03a053668d147d53fb8c4e0efe09c973"}, } From 181412e7dd7285cb79d920c7b9d4cf46ff4076da Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Wed, 26 Feb 2025 16:15:00 -0500 Subject: [PATCH 2/8] add elixir and erlang versions in the strategy matrix --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c985db9..66c3157 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,8 @@ jobs: strategy: matrix: - otp: ["24"] - elixir: ["1.14"] + otp: ["24", "25", "26", "27"] + elixir: ["1.14", "1.15", "1.16", "1.17", "1.18"] runtime_config: [true, false] include: @@ -33,7 +33,7 @@ jobs: MIX_ENV: test steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Elixir environment uses: erlef/setup-beam@v1 From dff93cb5e062c519fd727f038a012d4dd6cc941b Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Wed, 26 Feb 2025 16:19:24 -0500 Subject: [PATCH 3/8] use ubuntu-latest --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66c3157..a1fbd06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: test: name: Test suite - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: From a42e43447a6a24be8c174b3e4f63533e63574fb3 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Wed, 26 Feb 2025 16:39:41 -0500 Subject: [PATCH 4/8] test only otp 25, 26 and 27 versions --- .github/workflows/ci.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1fbd06..5cd230b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,13 +20,23 @@ jobs: strategy: matrix: - otp: ["24", "25", "26", "27"] + otp: ["25", "26"] elixir: ["1.14", "1.15", "1.16", "1.17", "1.18"] runtime_config: [true, false] include: - - otp: "20" - elixir: "1.6" + # OTP 27 works with Elixir 1.17.0+ + - otp: "27" + elixir: "1.17" + runtime_config: true + - otp: "24" + elixir: "1.17" + runtime_config: false + - otp: "27" + elixir: "1.18" + runtime_config: true + - otp: "27" + elixir: "1.18" runtime_config: false env: From d9a3c2ed43a7ab07566aa210fef30b955586b096 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Wed, 26 Feb 2025 16:42:14 -0500 Subject: [PATCH 5/8] fix typo --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cd230b..b9d9d50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - otp: "27" elixir: "1.17" runtime_config: true - - otp: "24" + - otp: "27" elixir: "1.17" runtime_config: false - otp: "27" From 7988f1a1ff55e164a22bc11a9c36f1bc7ed3e224 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Wed, 26 Feb 2025 16:58:31 -0500 Subject: [PATCH 6/8] fix tests --- test/statix_test.exs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/statix_test.exs b/test/statix_test.exs index 077f0d9..9e87686 100644 --- a/test/statix_test.exs +++ b/test/statix_test.exs @@ -160,22 +160,22 @@ defmodule StatixTest do assert capture_log(fn -> assert {:error, :port_closed} == increment("sample") - end) =~ "counter metric \"sample\" lost value 1 error=:port_closed\n\e[0m" + end) =~ "counter metric \"sample\" lost value 1 error=:port_closed" assert capture_log(fn -> assert {:error, :port_closed} == decrement("sample") - end) =~ "counter metric \"sample\" lost value -1 error=:port_closed\n\e[0m" + end) =~ "counter metric \"sample\" lost value -1 error=:port_closed" assert capture_log(fn -> assert {:error, :port_closed} == gauge("sample", 2) - end) =~ "gauge metric \"sample\" lost value 2 error=:port_closed\n\e[0m" + end) =~ "gauge metric \"sample\" lost value 2 error=:port_closed" assert capture_log(fn -> assert {:error, :port_closed} == histogram("sample", 3) - end) =~ "histogram metric \"sample\" lost value 3 error=:port_closed\n\e[0m" + end) =~ "histogram metric \"sample\" lost value 3 error=:port_closed" assert capture_log(fn -> assert {:error, :port_closed} == timing("sample", 2.5) - end) =~ "timing metric \"sample\" lost value 2.5 error=:port_closed\n\e[0m" + end) =~ "timing metric \"sample\" lost value 2.5 error=:port_closed" end end From 1d3f0df2e8b74298f645671c96944c8a6644d040 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Wed, 26 Feb 2025 16:59:15 -0500 Subject: [PATCH 7/8] run lint on latest elixir and erlang versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9d9d50..ff5d0a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,8 @@ jobs: name: Code linting uses: lexmag/elixir-actions/.github/workflows/lint.yml@v2 with: - otp-version: "24" - elixir-version: "1.14" + otp-version: "27" + elixir-version: "1.18" test: name: Test suite From 3ebe9fff858ecc4e17a40178c0f68b090fe11a74 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Wed, 26 Feb 2025 17:00:30 -0500 Subject: [PATCH 8/8] unlock unused deps --- mix.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/mix.lock b/mix.lock index 779ed43..3d1836d 100644 --- a/mix.lock +++ b/mix.lock @@ -1,5 +1,4 @@ %{ - "earmark": {:hex, :earmark, "1.4.3", "364ca2e9710f6bff494117dbbd53880d84bebb692dafc3a78eb50aa3183f2bfd", [:mix], [], "hexpm", "8cf8a291ebf1c7b9539e3cddb19e9cef066c2441b1640f13c34c1d3cfc825fec"}, "earmark_parser": {:hex, :earmark_parser, "1.4.43", "34b2f401fe473080e39ff2b90feb8ddfeef7639f8ee0bbf71bb41911831d77c5", [:mix], [], "hexpm", "970a3cd19503f5e8e527a190662be2cee5d98eed1ff72ed9b3d1a3d466692de8"}, "ex_doc": {:hex, :ex_doc, "0.37.2", "2a3aa7014094f0e4e286a82aa5194a34dd17057160988b8509b15aa6c292720c", [:mix], [{:earmark_parser, "~> 1.4.42", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "4dfa56075ce4887e4e8b1dcc121cd5fcb0f02b00391fd367ff5336d98fa49049"}, "makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"},