Skip to content

Commit f265c74

Browse files
committed
Fix Elixir
1 parent dbfcd28 commit f265c74

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

.github/workflows/master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
- name: Setup Elixir
4040
uses: erlef/setup-beam@v1
4141
with:
42-
otp-version: "27.2"
43-
elixir-version: "1.18.3"
42+
otp-version: "27.3"
43+
elixir-version: "1.18.4"
4444

4545
- name: Cache Dependencies
4646
uses: actions/cache@v4

.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ jobs:
4141
- name: Setup Elixir
4242
uses: erlef/setup-beam@v1
4343
with:
44-
otp-version: "27.2"
45-
elixir-version: "1.18.2"
44+
otp-version: "27.3"
45+
elixir-version: "1.18.4"
4646

4747
- name: Cache Dependencies
4848
uses: actions/cache@v4

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
elixir 1.18.2-otp-27
2-
erlang 27.2.2
1+
elixir 1.18.4-otp-27
2+
erlang 27.3.4.2
33
nodejs 18.15.0

services/app/Dockerfile.codebattle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ COPY apps/codebattle/priv/gettext ./priv/gettext
1313

1414
RUN yarn build
1515

16-
FROM elixir:1.18-alpine AS compile-image
16+
FROM elixir:1.18.4-otp-27-alpine AS compile-image
1717
ARG GIT_HASH
1818

1919
ENV APP_VERSION=$GIT_HASH
@@ -50,7 +50,7 @@ COPY nginx.conf /etc/nginx/conf.d/default.conf
5050

5151
COPY --from=compile-image /opt/release/lib/codebattle-0.1.0/priv/static/assets/ /var/www/assets
5252

53-
FROM elixir:1.18-alpine AS runtime-image
53+
FROM elixir:1.18.4-otp-27-alpine AS runtime-image
5454

5555
RUN apk add --no-cache ca-certificates chromium git make curl vim
5656

services/app/Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM elixir:1.18-alpine
1+
FROM elixir:1.18.4-otp-27-alpine
22
ENV DOCKER_CHANNEL stable
33
ENV DOCKER_VERSION 20.10.9
44

services/app/Dockerfile.runner

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM elixir:1.18-alpine AS compile-image
1+
FROM elixir:1.18.4-otp-27-alpine AS compile-image
22
ARG GIT_HASH
33

44
ENV APP_VERSION=$GIT_HASH
@@ -24,7 +24,7 @@ COPY ./apps/runner/ ./apps/runner/
2424
RUN mix release runner \
2525
&& mv _build/prod/rel/runner /opt/release
2626

27-
FROM elixir:1.18-alpine AS runtime-image
27+
FROM elixir:1.18.4-otp-27-alpine AS runtime-image
2828

2929
ENV DOCKER_CHANNEL stable
3030
ENV DOCKER_VERSION 24.0.9

services/app/apps/codebattle/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ defmodule Codebattle.MixProject do
4545
{:bcrypt_elixir, "~> 2.0"},
4646
{:cowboy, "~> 2.8"},
4747
{:delta, github: "slab/delta-elixir"},
48-
{:diff_match_patch, github: "vtm9/diff_match_patch", override: true},
48+
{:diff_match_patch, "~> 0.3.0"},
4949
{:earmark, "~> 1.4"},
5050
{:ecto_psql_extras, "~> 0.2"},
5151
{:ecto_sql, "~> 3.6"},

services/app/apps/runner/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ defmodule Runner.MixProject do
3838
defp deps do
3939
[
4040
{:bandit, "~> 1.0"},
41-
{:diff_match_patch, github: "vtm9/diff_match_patch", override: true},
41+
{:diff_match_patch, "~> 0.3.0"},
4242
{:ecto, "~> 3.7"},
4343
{:envy, "~> 1.1.1"},
4444
{:jason, "~> 1.2"},

services/app/mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"},
1616
"delta": {:git, "https://github.com/slab/delta-elixir.git", "b8e5d2c7ba56c587d04569c067aea6b5e121dfd8", []},
1717
"dialyxir": {:hex, :dialyxir, "1.4.6", "7cca478334bf8307e968664343cbdb432ee95b4b68a9cba95bdabb0ad5bdfd9a", [:mix], [{:erlex, ">= 0.2.7", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "8cf5615c5cd4c2da6c501faae642839c8405b49f8aa057ad4ae401cb808ef64d"},
18-
"diff_match_patch": {:git, "https://github.com/vtm9/diff_match_patch.git", "633417590d1ee3af5c3e9aab8b6af1811d1c67d2", []},
18+
"diff_match_patch": {:hex, :diff_match_patch, "0.3.0", "8741299f6e43d701dc160e28738440f53af0969e3cea79d2d8e57f8dcb631d26", [:mix], [], "hexpm", "cf377f0d7dc4d40cd68fc580c26047351f217be729565e944f8cea36b19013b7"},
1919
"diffy": {:hex, :diffy, "1.1.2", "7060e34fd512f210056b7e66e8d315cb90d06b97a6656d92fc299eb91692e36e", [:rebar3], [{:proper, "~> 1.2.0", [hex: :proper, repo: "hexpm", optional: false]}, {:zotonic_stdlib, "1.2.3", [hex: :zotonic_stdlib, repo: "hexpm", optional: false]}], "hexpm", "9a59bbdcafb6b115b5099711f7f114edb00be11658cef08ef26e04f8040c7149"},
2020
"earmark": {:hex, :earmark, "1.4.48", "5f41e579d85ef812351211842b6e005f6e0cef111216dea7d4b9d58af4608434", [:mix], [], "hexpm", "a461a0ddfdc5432381c876af1c86c411fd78a25790c75023c7a4c035fdc858f9"},
2121
"ecto": {:hex, :ecto, "3.13.2", "7d0c0863f3fc8d71d17fc3ad3b9424beae13f02712ad84191a826c7169484f01", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "669d9291370513ff56e7b7e7081b7af3283d02e046cf3d403053c557894a0b3e"},

0 commit comments

Comments
 (0)