Merge branch 'master' into jowens/dep-updates

jakobht · Apr 23, 2024 · 684582b · 684582b
2 parents 960f59b + e9738f6
commit 684582b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
@@ -1,6 +1,12 @@
 name: Elixir CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
 
 jobs:
   build:
@@ -11,13 +17,20 @@ jobs:
     strategy:
       matrix:
         include:
+          - elixir: "1.16"
+            otp: "24"
+          - elixir: "1.16"
+            otp: "25"
+          - elixir: "1.16"
+            otp: "26"
+            should_lint: true
+
           - elixir: "1.15"
             otp: "24"
           - elixir: "1.15"
             otp: "25"
           - elixir: "1.15"
             otp: "26"
-            should_lint: true
 
           - elixir: "1.14"
             otp: "23"
@@ -42,13 +55,6 @@ jobs:
           - elixir: "1.12"
             otp: "24"
 
-          - elixir: "1.11"
-            otp: "22"
-          - elixir: "1.11"
-            otp: "23"
-          - elixir: "1.11"
-            otp: "24"
-
     steps:
       - uses: actions/checkout@v3
 

diff --git a/mix.exs b/mix.exs
@@ -5,7 +5,7 @@ defmodule Azurex.MixProject do
     [
       app: :azurex,
       version: "1.1.0",
-      elixir: "~> 1.11",
+      elixir: "~> 1.12",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
       description: description(),