Merge pull request #216 from coryodaniel/upgrade-elixir-in-ci

upgrade elixir in ci
coryodaniel · Jun 21, 2023 · 7b3b5da · 7b3b5da
2 parents ec81019 + c9e3560
commit 7b3b5da
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,8 +15,6 @@ jobs:
     strategy:
       matrix:
         k8s_version: [v1.26.0]
-        elixir: [1.14.x]
-        otp: [26.x]
     steps:
       - uses: actions/checkout@v3.5.3
 
@@ -30,8 +28,8 @@ jobs:
         id: beam
         uses: erlef/setup-beam@v1
         with:
-          elixir-version: ${{matrix.elixir}}
-          otp-version: ${{matrix.otp}}
+          version-file: .tool-versions
+          version-type: strict
           install-rebar: true
           install-hex: true
 

diff --git a/.github/workflows/elixir_matrix.yaml b/.github/workflows/elixir_matrix.yaml
@@ -13,7 +13,11 @@ jobs:
       matrix:
         # See https://hexdocs.pm/elixir/1.13/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
         otp: ["23.x", "24.x", "25.x", "26.x"]
-        elixir: ["1.14.x"]
+        elixir: ["1.14.x", "1.15.x"]
+        exclude:
+          # OTP 23
+          - elixir: "1.15.x"
+            otp: "23.x"
     steps:
       - uses: actions/checkout@v3.5.3
       - uses: erlef/setup-beam@v1

diff --git a/.github/workflows/k8s_matrix.yaml b/.github/workflows/k8s_matrix.yaml
@@ -14,8 +14,6 @@ jobs:
     strategy:
       matrix:
         k8s_version: [v1.22.15, v1.23.13, v1.24.7, v1.25.3, v1.26.0]
-        otp: [26.x]
-        elixir: [1.14.x]
     steps:
       - uses: engineerd/setup-kind@v0.5.0
         id: kind
@@ -25,8 +23,8 @@ jobs:
       - uses: actions/checkout@v3.5.3
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: ${{matrix.otp}}
-          elixir-version: ${{matrix.elixir}}
+          version-file: .tool-versions
+          version-type: strict
           install-rebar: true
           install-hex: true
 
@@ -35,14 +33,14 @@ jobs:
         id: build-folder-cache
         with:
           path: _build
-          key: ${{ runner.os }}-${{ matrix.otp }}-${{ matrix.elixir }}-build-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
+          key: ${{ runner.os }}-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-build-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
 
       - name: Retrieve Mix Dependencies Cache
         uses: actions/cache@v3
         id: mix-cache
         with:
           path: deps
-          key: ${{ runner.os }}-${{ matrix.otp }}-${{ matrix.elixir }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
+          key: ${{ runner.os }}-${{ steps.beam.outputs.otp-version }}-${{ steps.beam.outputs.elixir-version }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
 
       - run: mix deps.get
       - name: Run Integration Tests

diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,7 @@
 erlang 26.0.1
+<<<<<<< HEAD
 elixir 1.14.5
+=======
+elixir 1.15.0
+>>>>>>> fb2e613 (upgrade elixir in ci)
 kind 0.17.0
diff --git a/lib/bonny/operator/leader_elector.ex b/lib/bonny/operator/leader_elector.ex
@@ -135,7 +135,7 @@ defmodule Bonny.Operator.LeaderElector do
         {:DOWN, ref, :process, pid, _reason},
         %__MODULE__{operator_pid: {pid, ref}} = state
       ) do
-    Logger.warn(
+    Logger.warning(
       "{Operator=#{inspect(state.operator)}} - Uh-oh! Our operator just went down. Guess that means I have to give up leadership. Boohoo!",
       library: :bonny
     )
@@ -145,7 +145,7 @@ defmodule Bonny.Operator.LeaderElector do
   end
 
   def handle_info({:DOWN, _ref, :process, _pid, _reason}, state) do
-    Logger.warn(
+    Logger.warning(
       "{Operator=#{inspect(state.operator)}} - Very strange. A process I'm monitoring went down. But I'm not the leader. Looks like a bug in Bonny. Anyway, releaseing the lock if I have it.",
       library: :bonny
     )

diff --git a/mix.lock b/mix.lock
@@ -28,7 +28,7 @@
   "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
   "pluggable": {:hex, :pluggable, "1.0.1", "ffd91303879d0ccfde2cbf2b5609f4f602608653e6165c44f5867c32e645e337", [:mix], [], "hexpm", "bce3403fe24dd5e14846b97e64ffa424b7ccda327829a4f6d1067cfc7a87d4a2"},
   "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
-  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
+  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "yamerl": {:hex, :yamerl, "0.10.0", "4ff81fee2f1f6a46f1700c0d880b24d193ddb74bd14ef42cb0bcf46e81ef2f8e", [:rebar3], [], "hexpm", "346adb2963f1051dc837a2364e4acf6eb7d80097c0f53cbdc3046ec8ec4b4e6e"},