Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade Elixir #2244

Merged
merged 8 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions .github/workflows/elixir-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,23 @@ on:
pull_request:
branches: [main]
paths:
- 'lib/**'
- 'config/**'
- '*.exs'
- '*.lock'
- 'docs/docs.logflare.com/docs/**'
- 'native/**'
- 'priv/**'
- 'test/**'
- "lib/**"
- "config/**"
- "*.exs"
- "*.lock"
- "docs/docs.logflare.com/docs/**"
- "native/**"
- "priv/**"
- "test/**"
# Run suite when this file is changed
- '.github/workflows/elixir-ci.yml'
- ".github/workflows/elixir-ci.yml"

permissions:
contents: read

env:
MIX_ENV: test


jobs:
check:
name: Checks
Expand All @@ -34,8 +33,8 @@ jobs:
run: mix lint --only warnings
- name: Code Quality - Formatting
run: mix test.format
- name: Compilation Warnings
run: mix test.compile
# - name: Compilation Warnings
# run: mix test.compile
- name: Tests
run: mix do ecto.create, ecto.migrate, test
# - name: Security - Sobelow Code Scan
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
elixir 1.16.0-otp-26
elixir 1.17.3-otp-27
nodejs 18.13.0
rust 1.64.0
erlang 26.2.1
erlang 27.1.2
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ELIXIR_VERSION=1.16.0
ARG OTP_VERSION=26.2.1
ARG DEBIAN_VERSION=bullseye-20231009-slim
ARG ELIXIR_VERSION=1.17.3
ARG OTP_VERSION=27.1.2
ARG DEBIAN_VERSION=bullseye-20241016-slim

ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.3
1.9.4
3 changes: 2 additions & 1 deletion lib/logflare/erl_sys_mon.ex
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ defmodule Logflare.ErlSysMon do
:busy_dist_port,
:busy_port,
{:long_gc, 250},
{:long_schedule, 100}
{:long_schedule, 100},
{:long_message_queue, {0, 1_000}}
])

{:ok, []}
Expand Down
2 changes: 1 addition & 1 deletion lib/logflare/logs/validators/bq_schema_change_validator.ex
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ defmodule Logflare.Logs.Validators.BigQuerySchemaChange do
:ok
rescue
e ->
{:error, e.message}
{:error, Exception.message(e)}
end
end

Expand Down
5 changes: 3 additions & 2 deletions lib/logflare_web/open_api.ex
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,16 @@ defmodule LogflareWeb.OpenApi do

def response(module) do
{
"#{module.schema.title} List Response",
"#{module.schema().title} List Response",
"application/json",
%Schema{type: :array, items: module}
}
end
end

defmodule One do
def response(module), do: {"#{module.schema.title} One Response", "application/json", module}
def response(module),
do: {"#{module.schema().title} One Response", "application/json", module}
end

defmodule Created do
Expand Down
2 changes: 1 addition & 1 deletion lib/logflare_web/templates/application/show.html.eex
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</td>
<tr>
<td>
<%= link "Authorize", to: Routes.oauth_authorization_path(@conn, :new, client_id: @application.uid, redirect_uri: redirect_uri, response_type: "code", scope: @application.scopes), target: '_blank' %>
<%= link "Authorize", to: Routes.oauth_authorization_path(@conn, :new, client_id: @application.uid, redirect_uri: redirect_uri, response_type: "code", scope: @application.scopes), target: "_blank" %>
</td>
</tr>
<% end %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<code><%= redirect_uri %></code>
</td>
<td>
<%= link "Authorize", to: Routes.oauth_authorization_path(@conn, :new, client_id: @application.uid, redirect_uri: redirect_uri, response_type: "code", scope: @application.scopes), target: '_blank' %>
<%= link "Authorize", to: Routes.oauth_authorization_path(@conn, :new, client_id: @application.uid, redirect_uri: redirect_uri, response_type: "code", scope: @application.scopes), target: "_blank" %>
</td>
</tr>
<% end %>
Expand Down
Loading