Merge pull request #123 from appsignal/fix-ci-old-elixir

Fix CI for Elixir < 1.14 and lint issues

Author: unflxw

.github/workflows/ci.yml

@@ -96,40 +96,88 @@ jobs:
       fail-fast: false
       matrix:
         elixir:
-          - 1.17.x
+          - 1.19.x
         otp:
+          - 28.x
           - 27.x
           - 26.x
-          - 25.x
         phoenix:
           - "~> 1.6.0"
           - "~> 1.7.0"
-          - "~> 1.8.0"
+          - "~> 1.8"
         include:
           - elixir: main
+            otp: 28.x
+            phoenix: "~> 1.8"
+          - elixir: latest
+            otp: 28.x
+            phoenix: "~> 1.8"
+          - elixir: 1.18.x
+            otp: 27.x
+            phoenix: "~> 1.8"
+          - elixir: 1.18.x
             otp: 27.x
             phoenix: "~> 1.7.0"
-          - elixir: latest
+          - elixir: 1.18.x
+            otp: 27.x
+            phoenix: "~> 1.6.0"
+          - elixir: 1.17.x
+            otp: 27.x
+            phoenix: "~> 1.8"
+          - elixir: 1.17.x
             otp: 27.x
             phoenix: "~> 1.7.0"
+          - elixir: 1.17.x
+            otp: 27.x
+            phoenix: "~> 1.6.0"
           - elixir: 1.16.x
+            otp: 26.x
+            phoenix: "~> 1.8"
+          - elixir: 1.16.x
+            otp: 26.x
+            phoenix: "~> 1.7.0"
+          - elixir: 1.16.x
+            otp: 26.x
+            phoenix: "~> 1.6.0"
+          - elixir: 1.15.x
+            otp: 26.x
+            phoenix: "~> 1.8"
+          - elixir: 1.15.x
             otp: 26.x
             phoenix: "~> 1.7.0"
           - elixir: 1.15.x
             otp: 26.x
+            phoenix: "~> 1.6.0"
+          - elixir: 1.14.x
+            otp: 25.x
             phoenix: "~> 1.7.0"
           - elixir: 1.14.x
             otp: 25.x
             phoenix: "~> 1.6.0"
+          - elixir: 1.13.x
+            otp: 24.x
+            phoenix: "~> 1.7.0"
+            plug: "~> 1.18.0"
           - elixir: 1.13.x
             otp: 24.x
             phoenix: "~> 1.6.0"
+            plug: "~> 1.18.0"
+          - elixir: 1.12.x
+            otp: 24.x
+            phoenix: "~> 1.7.0"
+            plug: "~> 1.18.0"
           - elixir: 1.12.x
             otp: 24.x
             phoenix: "~> 1.6.0"
+            plug: "~> 1.18.0"
+          - elixir: 1.11.x
+            otp: 24.x
+            phoenix: "~> 1.7.0"
+            plug: "~> 1.18.0"
           - elixir: 1.11.x
             otp: 24.x
             phoenix: "~> 1.6.0"
+            plug: "~> 1.18.0"
 
     steps:
       - name: Set up Erlang and Elixir
@@ -143,7 +191,9 @@ jobs:
         run: mix deps.get
         env:
           _APPSIGNAL_CI_PHOENIX_VERSION: ${{matrix.phoenix}}
+          _APPSIGNAL_CI_PLUG_VERSION: ${{matrix.plug}}
       - name: Run tests
         run: mix test
         env:
           _APPSIGNAL_CI_PHOENIX_VERSION: ${{matrix.phoenix}}
+          _APPSIGNAL_CI_PLUG_VERSION: ${{matrix.plug}}

lib/appsignal_phoenix/view.ex

@@ -1,6 +1,4 @@
 defmodule Appsignal.Phoenix.View do
-  require Logger
-
   @moduledoc """
   AppSignal.Phoenix.View instruments template rendering.
 

mix.exs

@@ -59,6 +59,13 @@ defmodule Appsignal.Phoenix.MixProject do
 
     phoenix_version = System.get_env("_APPSIGNAL_CI_PHOENIX_VERSION") || "~> 1.7"
 
+    plug_override =
+      case System.get_env("_APPSIGNAL_CI_PLUG_VERSION") do
+        nil -> []
+        "" -> []
+        version -> [{:plug, version, override: true}]
+      end
+
     [
       {:appsignal, ">= 2.15.0 and < 3.0.0"},
       {:appsignal_plug, ">= 2.1.0 and < 3.0.0"},
@@ -69,6 +76,6 @@ defmodule Appsignal.Phoenix.MixProject do
       {:dialyxir, "~> 1.3.0", only: [:dev, :test], runtime: false},
       {:credo, credo_version, only: [:dev, :test], runtime: false},
       {:telemetry, "~> 0.4 or ~> 1.0"}
-    ]
+    ] ++ plug_override
   end
 end

test/support/phoenix_web.ex

@@ -12,6 +12,7 @@ defmodule PhoenixWeb.Endpoint do
 end
 
 defmodule PhoenixWeb.Controller do
+  @moduledoc false
   use Phoenix.Controller, formats: [:html]
   import Plug.Conn
 
@@ -28,6 +29,7 @@ end
 
 if function_exported?(Phoenix.View, :__info__, 1) do
   defmodule PhoenixWeb.View do
+    @moduledoc false
     use Phoenix.View,
       root: "test/support",
       namespace: AppsignalPhoenixExampleWeb
@@ -37,6 +39,7 @@ if function_exported?(Phoenix.View, :__info__, 1) do
 end
 
 defmodule PhoenixWeb.Channel do
+  @moduledoc false
   use Phoenix.Channel
   require Appsignal.Phoenix.Channel