Skip to content

Commit

Permalink
Merge pull request #353 from batteries-included/elliott/bump_elixir_ver
Browse files Browse the repository at this point in the history
Update asdf elixir version for gradual typing
  • Loading branch information
mruoss authored Jan 8, 2025
2 parents 68c96d9 + fe80a40 commit 46a509d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:

- name: Setup elixir
uses: erlef/setup-beam@v1
id: beam
with:
version-file: .tool-versions
version-type: strict
Expand All @@ -52,8 +53,6 @@ jobs:
with:
key: |
${{ runner.os }}-${{ steps.beam.outputs.elixir-version }}-${{ steps.beam.outputs.otp-version }}-plt
restore-keys: |
${{ runner.os }}-${{ steps.beam.outputs.elixir-version }}-${{ steps.beam.outputs.otp-version }}-plt
path: |
priv/plts
Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/elixir_matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,24 @@ jobs:
fail-fast: false
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", "1.15.x", "1.16.x"]
otp: ["23.x", "26.x", "27.x"]
elixir: ["1.14.x", "1.17.x", "1.18.x"]
exclude:
# OTP 23
- elixir: "1.15.x"
otp: "23.x"
- elixir: "1.16.x"
- elixir: "1.17.x"
otp: "23.x"
- elixir: "1.18.x"
otp: "23.x"
# OTP 26
# - Users on recent elixir likely updated OTP versions
- elixir: "1.18.x"
otp: "26.x"
# OTP 27 - Elixir 1.14.x is not compatible with OTP 27
- elixir: "1.14.x"
otp: "27.x"


steps:
- uses: actions/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
erlang 26.0.2
elixir 1.15.2
erlang 27.1.2
elixir 1.18.1-otp-27
k3d 5.4.6
kind 0.19.0
kind 0.25.0
3 changes: 0 additions & 3 deletions lib/k8s/client/runner/stream/list_request.ex
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ defmodule K8s.Client.Runner.Stream.ListRequest do
{:ok, items} <- Map.fetch(response, "items") do
{items, struct!(state, continue: cont)}
else
:halt ->
{:halt, nil}

:error ->
{:halt, nil}

Expand Down

0 comments on commit 46a509d

Please sign in to comment.