diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index 4401e72..2b07673 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -4,7 +4,6 @@ on: [push, pull_request] jobs: build: - name: Build and test runs-on: ubuntu-20.04 @@ -44,62 +43,73 @@ jobs: otp: '23' - elixir: '1.13' otp: '24' - lint: lint - - elixir: '1.13' + - elixir: '1.14' + otp: '23' + - elixir: '1.14' otp: '24' + - elixir: '1.14' + otp: '25' + - elixir: '1.15' + otp: '24' + - elixir: '1.15' + otp: '25' + - elixir: '1.15' + otp: '26' + lint: lint + - elixir: '1.15' + otp: '26' deps: latest - steps: - - uses: actions/checkout@v2 - - uses: nanasess/setup-chromedriver@v2 + - uses: actions/checkout@v2 + - uses: nanasess/setup-chromedriver@v2 - - name: Set up Elixir - uses: erlef/setup-beam@v1 - with: - elixir-version: ${{ matrix.elixir }} - otp-version: ${{ matrix.otp }} + - name: Set up Elixir + uses: erlef/setup-beam@v1 + with: + elixir-version: ${{ matrix.elixir }} + otp-version: ${{ matrix.otp }} - - name: Retrieve Mix Dependencies Cache - if: matrix.deps != 'latest' - uses: actions/cache@v1 - id: mix-cache - with: - path: deps - key: ${{ runner.os }}-${{ matrix.otp }}-${{ matrix.elixir }}-mix-${{ hashFiles('mix.lock') }} + - name: Retrieve Mix Dependencies Cache + if: matrix.deps != 'latest' + uses: actions/cache@v1 + id: mix-cache + with: + path: deps + key: ${{ runner.os }}-${{ matrix.otp }}-${{ matrix.elixir }}-mix-${{ hashFiles('mix.lock') }} - - name: Remove mix.lock - if: matrix.deps == 'latest' - run: rm mix.lock + - name: Remove mix.lock + if: matrix.deps == 'latest' + run: rm mix.lock - - name: Install dependencies - if: steps.mix-cache.outputs.cache-hit != 'true' - run: mix deps.get + - name: Install dependencies + if: steps.mix-cache.outputs.cache-hit != 'true' + run: mix deps.get - - name: Retrieve PLT Cache - uses: actions/cache@v1 - id: plt-cache - with: - path: priv/plts - key: ${{ runner.os }}-${{ matrix.otp }}-${{ matrix.elixir }}-plts-v2-${{ hashFiles('mix.lock') }} - if: ${{ matrix.lint }} + - name: Retrieve PLT Cache + uses: actions/cache@v1 + id: plt-cache + with: + path: priv/plts + key: ${{ runner.os }}-${{ matrix.otp }}-${{ matrix.elixir }}-plts-v2-${{ hashFiles('mix.lock') }} + if: ${{ matrix.lint }} - - name: Create PLTs - run: | - mkdir -p priv/plts - mix dialyzer --plt - if: ${{ matrix.lint }} + - name: Create PLTs + run: | + mkdir -p priv/plts + mix dialyzer --plt + if: ${{ matrix.lint }} - - name: Check quality - run: | - mix format --check-formatted - mix credo --strict - mix dialyzer --no-check - mix e2e - if: ${{ matrix.lint }} + - name: Check quality + run: | + mix format --check-formatted + mix credo --strict + mix dialyzer --no-check + mix e2e + if: ${{ matrix.lint }} - - name: Run tests - run: mix test + - name: Run tests + run: mix test - - name: Run e2e test - run: mix e2e - if: ${{ matrix.lint }} + - name: Run e2e test + run: mix e2e + if: ${{ matrix.lint }} diff --git a/.tool-versions b/.tool-versions index 1c29dcf..5aaf93a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -elixir 1.12.2-otp-24 -erlang 24.0.4 +elixir 1.15.8-otp-26 +erlang 26.2.1 diff --git a/config/config.exs b/config/config.exs index bded96b..6ee7fc7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -1,6 +1,6 @@ # This file is responsible for configuring your application # and its dependencies with the aid of the Mix.Config module. -use Mix.Config +import Config # This configuration is loaded before any dependency and is restricted # to this project. If another project depends on this project, this diff --git a/lib/boom_notifier/error_storage.ex b/lib/boom_notifier/error_storage.ex index 019ac4d..e2510de 100644 --- a/lib/boom_notifier/error_storage.ex +++ b/lib/boom_notifier/error_storage.ex @@ -138,7 +138,7 @@ defmodule BoomNotifier.ErrorStorage do # the crc32 algorithm that was taken from the Exception Notification library # for Rails @spec generate_error_key(ErrorInfo.t()) :: non_neg_integer() - defp generate_error_key(error_info) do + def generate_error_key(error_info) do error_info |> Map.delete(:request) |> Map.delete(:metadata) diff --git a/lib/boom_notifier/mail_notifier/templates/email_body.html.eex b/lib/boom_notifier/mail_notifier/templates/email_body.html.eex index 3f53a21..7b686c4 100644 --- a/lib/boom_notifier/mail_notifier/templates/email_body.html.eex +++ b/lib/boom_notifier/mail_notifier/templates/email_body.html.eex @@ -105,10 +105,10 @@ Metadata: