Merge pull request #1092 from PragTob/upgrade-ci

Upgrade CI (Test against OTP 26, 24.3 instead of 24, 1.16 rc)
rrrene · Nov 17, 2023 · a3c0608 · a3c0608
2 parents 0d68085 + e12e6c9
commit a3c0608
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [23.3, 24.2, 25.3]
+        otp: [23.3, 24.3, 25.3]
         elixir: [1.11.4, 1.12.3, 1.13.4, 1.14.5, 1.15.7]
         exclude:
           - elixir: 1.11.4
@@ -24,12 +24,15 @@ jobs:
             otp: 25.3
           - elixir: 1.14.5
             otp: 25.3
-          - elixir: 1.15.7
-            otp: 26.1
           - elixir: 1.15.7
             otp: 23.3
           - elixir: 1.15.7
-            otp: 24.2
+            otp: 24.3
+        include:
+          - elixir: 1.15.7
+            otp: 26.1
+          - elixir: 1.16.0-rc.0
+            otp: 26.1
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/compatibility-elixir.yml b/.github/workflows/compatibility-elixir.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [23.3, 24.2, 25.3]
+        otp: [23.3, 24.3, 25.3]
         elixir: [1.11.4, 1.12.3, 1.13.4, 1.14.5, 1.15.7]
         exclude:
           - elixir: 1.11.4
@@ -22,12 +22,15 @@ jobs:
             otp: 25.3
           - elixir: 1.14.5
             otp: 25.3
-          - elixir: 1.15.7
-            otp: 26.1
           - elixir: 1.15.7
             otp: 23.3
           - elixir: 1.15.7
-            otp: 24.2
+            otp: 24.3
+        include:
+          - elixir: 1.15.7
+            otp: 26.1
+          - elixir: 1.16.0-rc.0
+            otp: 26.1
         repo_url: ["https://github.com/elixir-lang/elixir.git"]
         repo_branch: ["v1.13", "main"]
     steps:

diff --git a/.github/workflows/compatibility-phoenix.yml b/.github/workflows/compatibility-phoenix.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [23.3, 24.2, 25.3]
+        otp: [23.3, 24.3, 25.3]
         elixir: [1.11.4, 1.12.3, 1.13.4, 1.14.5, 1.15.7]
         exclude:
           - elixir: 1.11.4
@@ -21,12 +21,15 @@ jobs:
             otp: 25.3
           - elixir: 1.14.5
             otp: 25.3
-          - elixir: 1.15.7
-            otp: 26.1
           - elixir: 1.15.7
             otp: 23.3
           - elixir: 1.15.7
-            otp: 24.2
+            otp: 24.3
+        include:
+          - elixir: 1.15.7
+            otp: 26.1
+          - elixir: 1.16.0-rc.0
+            otp: 26.1
         repo_url: ["https://github.com/phoenixframework/phoenix.git"]
         repo_branch: ["v1.6", "main"]
     steps:
@@ -47,10 +50,10 @@ jobs:
     name: "[${{matrix.otp}}/${{matrix.elixir}}] new Phoenix app analysed by Credo [OTP/Elixir]"
     strategy:
       matrix:
-        otp: [21.3, 22.3, 23.3, 24.2]
+        otp: [21.3, 22.3, 23.3, 24.3]
         elixir: [1.10.4, 1.11.4, 1.12.3, 1.13.4, 1.14.5, 1.15.7]
         exclude:
-          - otp: 24.2
+          - otp: 24.3
             elixir: 1.10.4
           - otp: 21.3
             elixir: 1.12.3

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-erlang 26.0
-elixir 1.16.0-rc.0
+erlang 26.1.2
+elixir 1.16.0-rc.0-otp-26