Skip to content

Commit a9cb354

Browse files
akinseyakinsey
authored
Merge pull request #42 from epochtalk/update-versions-2
Update versions 2
2 parents 979c09d + 08e53a5 commit a9cb354

File tree

6 files changed

+65
-55
lines changed

6 files changed

+65
-55
lines changed

‎.github/workflows/main.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
elixir: ['1.14.0']
16-
otp: ['25.0.4']
15+
elixir: ['1.14.4']
16+
otp: ['25.3.1']
1717
steps:
1818
- name: Cancel previous runs
1919
uses: styfle/[email protected]
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
ref: ${{ github.event.client_payload.branch }}
2929
- name: Sets up an Erlang/OTP environment
30-
uses: erlef/setup-beam@v1.14.0
30+
uses: erlef/setup-beam@v1
3131
with:
3232
elixir-version: ${{ matrix.elixir }}
3333
otp-version: ${{ matrix.otp }}
@@ -51,8 +51,8 @@ jobs:
5151
runs-on: ubuntu-latest
5252
strategy:
5353
matrix:
54-
elixir: ['1.14.0']
55-
otp: ['25.0.4']
54+
elixir: ['1.14.4']
55+
otp: ['25.3.1']
5656
steps:
5757
- name: Cancel previous runs
5858
uses: styfle/[email protected]
@@ -63,7 +63,7 @@ jobs:
6363
with:
6464
ref: ${{ github.event.client_payload.branch }}
6565
- name: Sets up an Erlang/OTP environment
66-
uses: erlef/setup-beam@v1.14.0
66+
uses: erlef/setup-beam@v1
6767
with:
6868
elixir-version: ${{ matrix.elixir }}
6969
otp-version: ${{ matrix.otp }}
@@ -113,8 +113,8 @@ jobs:
113113
runs-on: ubuntu-latest
114114
strategy:
115115
matrix:
116-
elixir: ['1.14.0']
117-
otp: ['25.0.4']
116+
elixir: ['1.14.4']
117+
otp: ['25.3.1']
118118
services:
119119
postgres:
120120
image: postgres:14.2
@@ -153,7 +153,7 @@ jobs:
153153
with:
154154
ref: ${{ github.event.client_payload.branch }}
155155
- name: Sets up an Erlang/OTP environment
156-
uses: erlef/setup-beam@v1.14.0
156+
uses: erlef/setup-beam@v1
157157
with:
158158
elixir-version: ${{ matrix.elixir }}
159159
otp-version: ${{ matrix.otp }}
@@ -208,13 +208,13 @@ jobs:
208208
runs-on: ubuntu-latest
209209
strategy:
210210
matrix:
211-
elixir: ['1.14.0']
212-
otp: ['25.0.4']
211+
elixir: ['1.14.4']
212+
otp: ['25.3.1']
213213
steps:
214214
- name: Checkout
215215
uses: actions/[email protected]
216216
- name: Sets up an Erlang/OTP environment
217-
uses: erlef/setup-beam@v1.14.0
217+
uses: erlef/setup-beam@v1
218218
with:
219219
elixir-version: ${{ matrix.elixir }}
220220
otp-version: ${{ matrix.otp }}

‎.tool-versions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
elixir 1.14.0-rc.1-otp-25
2-
erlang 25.0.4
1+
elixir 1.14.4-otp-25
2+
erlang 25.3.1

‎lib/epochtalk_server/models/role.ex‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ defmodule EpochtalkServer.Models.Role do
159159
query =
160160
from ru in RoleUser,
161161
join: r in Role,
162+
on: true,
162163
where: ru.user_id == ^user_id and r.id == ru.role_id,
163164
select: r,
164165
order_by: [asc: r.priority]

‎lib/epochtalk_server/models/thread.ex‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,8 @@ defmodule EpochtalkServer.Models.Thread do
362362
^opts[:user_id],
363363
tlist.id,
364364
tlist.id
365-
)
365+
),
366+
on: true
366367
)
367368
# join thread title and author info
368369
|> join(
@@ -379,7 +380,8 @@ defmodule EpochtalkServer.Models.Thread do
379380
LIMIT 1
380381
""",
381382
tlist.id
382-
)
383+
),
384+
on: true
383385
)
384386
# join post id and post position
385387
|> join(
@@ -395,7 +397,8 @@ defmodule EpochtalkServer.Models.Thread do
395397
""",
396398
tlist.id,
397399
t.time
398-
)
400+
),
401+
on: true
399402
)
400403
# join last post info
401404
|> join(
@@ -413,7 +416,8 @@ defmodule EpochtalkServer.Models.Thread do
413416
LIMIT 1
414417
""",
415418
tlist.id
416-
)
419+
),
420+
on: true
417421
)
418422
|> select([tlist, t, p, tv, pl], %{
419423
id: tlist.id,
@@ -445,7 +449,7 @@ defmodule EpochtalkServer.Models.Thread do
445449
|> order_by([tlist], [{^sort_order, field(tlist, ^field)}])
446450
end
447451

448-
defp handle_create_poll(thread_id, nil), do: nil
452+
defp handle_create_poll(_thread_id, nil), do: nil
449453

450454
defp handle_create_poll(thread_id, poll_attrs) when is_map(poll_attrs) do
451455
# append thread_id

‎mix.exs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,27 @@ defmodule EpochtalkServer.MixProject do
3333
# Type `mix help deps` for examples and options.
3434
defp deps do
3535
[
36-
{:argon2_elixir, "~> 3.0.0"},
37-
{:corsica, "~> 1.2.0"},
36+
{:argon2_elixir, "~> 3.1.0"},
37+
{:corsica, "~> 1.3.0"},
3838
{:credo, "~> 1.6", only: [:dev, :test], runtime: false},
3939
{:dialyxir, "~> 1.2", only: [:dev], runtime: false},
4040
{:ecto_sql, "~> 3.6"},
41-
{:ex_doc, "~> 0.28.5"},
41+
{:ex_doc, "~> 0.29.4"},
4242
{:gen_smtp, "~> 1.2"},
4343
{:guardian, "~> 2.2"},
4444
{:guardian_phoenix, "~> 2.0"},
4545
{:guardian_db, "~> 2.1"},
4646
{:guardian_redis, "~> 0.1"},
4747
{:iteraptor, git: "https://github.com/epochtalk/elixir-iteraptor.git", tag: "1.13.1"},
48-
{:jason, "~> 1.3.0"},
49-
{:phoenix, "~> 1.6.11"},
48+
{:jason, "~> 1.4.0"},
49+
{:phoenix, "~> 1.7.2"},
5050
{:phoenix_ecto, "~> 4.4"},
5151
{:phoenix_html, "~> 3.0"},
52+
{:phoenix_view, "~> 2.0"},
5253
{:plug_cowboy, "~> 2.5"},
53-
{:postgrex, ">= 0.0.0"},
54-
{:redix, "~> 1.1.5"},
55-
{:remote_ip, "~> 1.0.0"},
54+
{:postgrex, "~> 0.17.1"},
55+
{:redix, "~> 1.2.2"},
56+
{:remote_ip, "~> 1.1.0"},
5657
{:swoosh, "~> 1.8"},
5758
{:telemetry_metrics, "~> 0.6"},
5859
{:telemetry_poller, "~> 1.0"}

0 commit comments

Comments
 (0)