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

Bump elixir to 1.17.3 and OTP to 27.2.1 #5040

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 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
2 changes: 1 addition & 1 deletion .github/workflows/elixir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:
cancel-in-progress: true

env:
CACHE_VERSION: v8
CACHE_VERSION: v9
PERSISTENT_CACHE_DIR: cached

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
erlang 27.0
elixir 1.17.1-otp-27
erlang 27.2.1
elixir 1.17.3-otp-27
nodejs 21.7.3
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# platform specific, it makes sense to build it in the docker

#### Builder
FROM hexpm/elixir:1.17.1-erlang-27.0-alpine-3.20.1 AS buildcontainer
FROM hexpm/elixir:1.17.3-erlang-27.2.1-alpine-3.20.5 AS buildcontainer
ruslandoga marked this conversation as resolved.
Show resolved Hide resolved

ARG MIX_ENV=ce

Expand Down Expand Up @@ -54,7 +54,7 @@ COPY rel rel
RUN mix release plausible

# Main Docker Image
FROM alpine:3.20.1
FROM alpine:3.20.5
LABEL maintainer="plausible.io <[email protected]>"

ARG BUILD_METADATA={}
Expand Down
3 changes: 2 additions & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ defmodule Plausible.MixProject do
{:odgn_json_pointer, "~> 3.0.1"},
{:phoenix_bakery, "~> 0.1.2", only: [:ce, :ce_dev, :ce_test]},
{:site_encrypt, github: "sasa1977/site_encrypt", only: [:ce, :ce_dev, :ce_test]},
{:phoenix_storybook, "~> 0.8"}
{:phoenix_storybook, "~> 0.8"},
{:unzip, "~> 0.12", only: [:test, :ce_test]}
]
end

Expand Down
1 change: 1 addition & 0 deletions mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
"tzdata": {:hex, :tzdata, "1.1.2", "45e5f1fcf8729525ec27c65e163be5b3d247ab1702581a94674e008413eef50b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "cec7b286e608371602318c414f344941d5eb0375e14cfdab605cca2fe66cba8b"},
"ua_inspector": {:git, "https://github.com/plausible/ua_inspector.git", "25cba4c910e80d7c34bbb1bbb939372260d088e8", [branch: "sanitize-pre"]},
"unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
"unzip": {:hex, :unzip, "0.12.0", "beed92238724732418b41eba77dcb7f51e235b707406c05b1732a3052d1c0f36", [:mix], [], "hexpm", "95655b72db368e5a84951f0bed586ac053b55ee3815fd96062fce10ce4fc998d"},
"websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
"websock_adapter": {:hex, :websock_adapter, "0.5.8", "3b97dc94e407e2d1fc666b2fb9acf6be81a1798a2602294aac000260a7c4a47d", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "315b9a1865552212b5f35140ad194e67ce31af45bcee443d4ecb96b5fd3f3782"},
"x509": {:hex, :x509, "0.8.9", "03c47e507171507d3d3028d802f48dd575206af2ef00f764a900789dfbe17476", [:mix], [], "hexpm", "ea3fb16a870a199cb2c45908a2c3e89cc934f0434173dc0c828136f878f11661"},
Expand Down
9 changes: 7 additions & 2 deletions test/plausible/exports_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,13 @@ defmodule Plausible.ExportsTest do
|> Stream.run()
end)

assert {:ok, files} =
:zip.unzip(to_charlist(Path.join(tmp_dir, "numbers.zip")), cwd: tmp_dir)
ruslandoga marked this conversation as resolved.
Show resolved Hide resolved
{:ok, unzip} =
tmp_dir
|> Path.join("plausible-export.zip")
|> Unzip.LocalFile.open()
|> Unzip.new()

files = unzip |> Unzip.list_entries() |> Enum.map(& &1.file_name)

assert Enum.map(files, &Path.basename/1) == ["1.csv", "2.csv"]

Expand Down
9 changes: 7 additions & 2 deletions test/plausible/imported/csv_importer_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@
end

@tag :tmp_dir
test "scroll_depth", %{conn: conn, user: user, tmp_dir: tmp_dir} do

Check failure on line 1035 in test/plausible/imported/csv_importer_test.exs

View workflow job for this annotation

GitHub Actions / Build and test (ce_test, postgres:16)

test export -> import scroll_depth (Plausible.Imported.CSVImporterTest)
exported_site = new_site(owner: user)
imported_site = new_site(owner: user)

Expand Down Expand Up @@ -1233,8 +1233,13 @@
end

defp unzip_archive(%{tmp_dir: tmp_dir} = context) do
assert {:ok, files} =
:zip.unzip(to_charlist(Path.join(tmp_dir, "plausible-export.zip")), cwd: tmp_dir)
{:ok, unzip} =
tmp_dir
|> Path.join("plausible-export.zip")
|> Unzip.LocalFile.open()
|> Unzip.new()

files = unzip |> Unzip.list_entries() |> Enum.map(& &1.file_name)

Map.put(context, :exported_files, files)
end
ruslandoga marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading