Merge branch 'master' into monitors

rusterlium · Feb 13, 2024 · 64ba826 · 64ba826
2 parents c8a8b3d + 3dd242a
commit 64ba826
Show file tree

Hide file tree

Showing 35 changed files with 637 additions and 1,035 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,8 +23,8 @@ jobs:
       - name: Install Erlang/Elixir
         uses: erlef/setup-beam@v1
         with:
-          otp-version: "25"
-          elixir-version: "1.14"
+          otp-version: "26"
+          elixir-version: "1.15"
 
       - name: Check cargo fmt
         run: cargo fmt --all -- --check
@@ -85,7 +85,8 @@ jobs:
     strategy:
       matrix:
         pair:
-          - { erlang: "26", elixir: "1.14", latest: true }
+          - { erlang: "26", elixir: "1.15", latest: true }
+          - { erlang: "26", elixir: "1.14" }
           - { erlang: "25", elixir: "1.14" }
           - { erlang: "24", elixir: "1.13" }
         rust:
@@ -95,11 +96,6 @@ jobs:
           - macos
           - windows
           - ubuntu
-        exclude:
-          # TODO Remove this once setup-beam is fixed to work around OTP26's
-          # regression
-          - os: windows
-            pair: { erlang: "26", elixir: "1.14", latest: true }
     runs-on: ${{matrix.os}}-latest
 
     steps: