From 25e6fec2a48a44d4b47670ab9137d3097034e9ef Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Fri, 17 Nov 2023 13:10:11 -0700 Subject: [PATCH 1/7] Set specific otp versions --- .github/workflows/w3c_interop.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/w3c_interop.yml b/.github/workflows/w3c_interop.yml index ea272336..1769d76c 100644 --- a/.github/workflows/w3c_interop.yml +++ b/.github/workflows/w3c_interop.yml @@ -12,13 +12,13 @@ jobs: interop_tests: name: Run W3C Trace Context Interop Tests runs-on: ubuntu-20.04 - env: - OTP_VERSION: steps: - uses: actions/checkout@v4 - uses: erlef/setup-beam@v1 with: - otp-version: '26.0' + otp-version: '26.1.2' + version-type: strict + rebar3-version: '3.22.1' - uses: actions/cache@v3 name: Cache with: From 7384a31da99ad95518765b021845710ccd8902c3 Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Fri, 17 Nov 2023 13:13:34 -0700 Subject: [PATCH 2/7] Update erlang.yml --- .github/workflows/erlang.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml index 9a7f8d7b..3359f4cb 100644 --- a/.github/workflows/erlang.yml +++ b/.github/workflows/erlang.yml @@ -18,11 +18,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - otp_version: ['26.0', '25.0.3', '24.1.2'] + otp_version: ['26.1.2', '25.3.2.7', '24.3.4.14'] rebar3_version: ['3.22.1'] os: [ubuntu-20.04] include: - - otp_version: '23.3' + - otp_version: '23.3.4.19' rebar3_version: '3.17.0' os: ubuntu-20.04 env: @@ -91,7 +91,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - otp_version: ['26.0'] + otp_version: ['26.1.2'] rebar3_version: ['3.22.1'] os: [ubuntu-20.04] steps: @@ -119,7 +119,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - otp_version: ['26.0'] + otp_version: ['26.1.2'] rebar3_version: ['3.22.1'] os: [ubuntu-20.04] steps: From a899ca290c8e2a3d7846b451aea009222580f4f2 Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Fri, 17 Nov 2023 13:17:41 -0700 Subject: [PATCH 3/7] Update elixir.yml --- .github/workflows/elixir.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index f73deecd..b7e279d5 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -15,8 +15,8 @@ jobs: - uses: actions/checkout@v4 - uses: erlef/setup-beam@v1 with: - otp-version: '25.0' - elixir-version: '1.13.4' + otp-version: '26.1.2' + elixir-version: '1.15.7' version-type: 'strict' - uses: actions/cache@v3 name: Cache @@ -34,9 +34,9 @@ jobs: name: Test SDK on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }}) and ${{ matrix.os }} strategy: matrix: - otp_version: ['25.0.3', '24.1.2'] - elixir_version: ['1.14', '1.13.4'] - rebar3_version: ['3.20.0'] + otp_version: ['26.1.2', '24.3.4.14'] + elixir_version: ['1.15.7', '1.12.3'] + rebar3_version: ['3.22.1'] os: [ubuntu-20.04] env: OTP_VERSION: ${{ matrix.otp_version }} @@ -60,9 +60,9 @@ jobs: name: Test API on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }}) and ${{ matrix.os }} strategy: matrix: - otp_version: ['25.0.3', '24.1.2'] - elixir_version: ['1.14', '1.13.4'] - rebar3_version: ['3.20.0'] + otp_version: ['26.1.2', '24.3.4.14'] + elixir_version: ['1.15.7', '1.12.3'] + rebar3_version: ['3.22.1'] os: [ubuntu-20.04] env: OTP_VERSION: ${{ matrix.otp_version }} @@ -104,8 +104,9 @@ jobs: name: Dialyze on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }}) and ${{ matrix.os }} strategy: matrix: - otp_version: ['25.0'] - elixir_version: ['1.14'] + otp_version: ['26.1.2'] + elixir_version: ['1.15.7'] + rebar_version: ['3.22.1'] os: [ubuntu-20.04] env: OTP_VERSION: ${{ matrix.otp_version }} From d024b6c99f1c4cf6529cb83c42d49c0940abbeb4 Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Fri, 17 Nov 2023 14:22:54 -0700 Subject: [PATCH 4/7] Update elixir.yml --- .github/workflows/elixir.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index b7e279d5..744bcf8a 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -38,6 +38,9 @@ jobs: elixir_version: ['1.15.7', '1.12.3'] rebar3_version: ['3.22.1'] os: [ubuntu-20.04] + exclude: + - elixir_version: "1.12.3" + - otp_version": "26.1.2" env: OTP_VERSION: ${{ matrix.otp_version }} ELIXIR_VERSION: ${{ matrix.elixir_version }} @@ -64,6 +67,9 @@ jobs: elixir_version: ['1.15.7', '1.12.3'] rebar3_version: ['3.22.1'] os: [ubuntu-20.04] + exclude: + - elixir_version: "1.12.3" + - otp_version": "26.1.2" env: OTP_VERSION: ${{ matrix.otp_version }} ELIXIR_VERSION: ${{ matrix.elixir_version }} From 41d391932bdc9f267cbf4d380bad9a867a5ca78c Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Fri, 17 Nov 2023 14:24:17 -0700 Subject: [PATCH 5/7] Update elixir.yml --- .github/workflows/elixir.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index 744bcf8a..49fb57f9 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -40,7 +40,7 @@ jobs: os: [ubuntu-20.04] exclude: - elixir_version: "1.12.3" - - otp_version": "26.1.2" + - otp_version: "26.1.2" env: OTP_VERSION: ${{ matrix.otp_version }} ELIXIR_VERSION: ${{ matrix.elixir_version }} @@ -69,7 +69,7 @@ jobs: os: [ubuntu-20.04] exclude: - elixir_version: "1.12.3" - - otp_version": "26.1.2" + - otp_version: "26.1.2" env: OTP_VERSION: ${{ matrix.otp_version }} ELIXIR_VERSION: ${{ matrix.elixir_version }} From 50406bc20cf04e6618e37c2836908dfc49ba74f1 Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Fri, 17 Nov 2023 14:26:00 -0700 Subject: [PATCH 6/7] Update mix.exs --- apps/opentelemetry_api/mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/opentelemetry_api/mix.exs b/apps/opentelemetry_api/mix.exs index b1f7af1d..fe282710 100644 --- a/apps/opentelemetry_api/mix.exs +++ b/apps/opentelemetry_api/mix.exs @@ -50,7 +50,7 @@ defmodule OpenTelemetry.MixProject do end defp load_app do - {:ok, [{:application, name, desc}]} = :file.consult('src/opentelemetry_api.app.src') + {:ok, [{:application, name, desc}]} = :file.consult(~c"src/opentelemetry_api.app.src") {name, desc} end From 64053a38e0c76cd9d7655870bfccbc106b5990ed Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Fri, 17 Nov 2023 14:53:01 -0700 Subject: [PATCH 7/7] Update api cover deps --- apps/opentelemetry_api/mix.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/opentelemetry_api/mix.lock b/apps/opentelemetry_api/mix.lock index badaab35..34024f8e 100644 --- a/apps/opentelemetry_api/mix.lock +++ b/apps/opentelemetry_api/mix.lock @@ -1,7 +1,7 @@ %{ "cmark": {:hex, :cmark, "0.10.0", "51217dc90fec459f34a30ea73345e6a7c1d2f3d618cb4a1738a2ebd0697a57a0", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "00abeadc6f3176e3941853122413082de95d57787777dd0400d64e568acf7c32"}, - "covertool": {:hex, :covertool, "2.0.3", "5d1ca6958482b9b7e718daf61f398e382426ed0f4689d5c8698a60ae3b5ba521", [:rebar3], [], "hexpm", "5c13170a55dbd6bd9efc722bc7fa32caff6f3c9cde9c692bd4a88bfc9ac4f029"}, - "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"}, + "covertool": {:hex, :covertool, "2.0.6", "4a291b4e3449025b0595d8f44c8d7635d4f48f033be2ce88d22a329f36f94a91", [:rebar3], [], "hexpm", "5db3fcd82180d8ea4ad857d4d1ab21a8d31b5aee0d60d2f6c0f9e25a411d1e21"}, + "dialyxir": {:hex, :dialyxir, "1.4.2", "764a6e8e7a354f0ba95d58418178d486065ead1f69ad89782817c296d0d746a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"}, "earmark": {:hex, :earmark, "1.4.14", "d04572cef64dd92726a97d92d714e38d6e130b024ea1b3f8a56e7de66ec04e50", [:mix], [{:earmark_parser, ">= 1.4.12", [hex: :earmark_parser, repo: "hexpm", optional: false]}], "hexpm", "df338b8b1852ee425180b276c56c6941cb12220e04fe8718fe4acbdd35fd699f"}, "earmark_parser": {:hex, :earmark_parser, "1.4.19", "de0d033d5ff9fc396a24eadc2fcf2afa3d120841eb3f1004d138cbf9273210e8", [:mix], [], "hexpm", "527ab6630b5c75c3a3960b75844c314ec305c76d9899bb30f71cb85952a9dc45"}, "elixir_make": {:hex, :elixir_make, "0.6.2", "7dffacd77dec4c37b39af867cedaabb0b59f6a871f89722c25b28fcd4bd70530", [:mix], [], "hexpm", "03e49eadda22526a7e5279d53321d1cced6552f344ba4e03e619063de75348d9"},