diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index 9f24459b93fb..e030c49fcfde 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -103,8 +103,7 @@ jobs: - run: mix deps.get --only $MIX_ENV - run: mix compile --warnings-as-errors --all-warnings - run: mix do ecto.create, ecto.migrate - # 2024b is buggy, so we need to use 2024a - # - run: mix run -e "Tzdata.ReleaseUpdater.poll_for_update" + - run: mix run -e "Tzdata.ReleaseUpdater.poll_for_update" - run: make minio if: env.MIX_ENV == 'test' diff --git a/config/runtime.exs b/config/runtime.exs index 296f50c435ee..810f13dc7329 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -848,7 +848,6 @@ else end config :tzdata, :data_dir, Path.join(persistent_cache_dir || System.tmp_dir!(), "tzdata_data") -config :tzdata, :autoupdate, :disabled promex_disabled? = config_dir diff --git a/mix.exs b/mix.exs index edfd125101a0..54c0f3467cf2 100644 --- a/mix.exs +++ b/mix.exs @@ -148,7 +148,6 @@ defmodule Plausible.MixProject do {:ex_json_schema, "~> 0.10.2"}, {:odgn_json_pointer, "~> 3.0.1"}, {:phoenix_bakery, "~> 0.1.2", only: [:ce, :ce_dev, :ce_test]}, - {:tzdata, github: "ruslandoga/tzdata", branch: "fix-for-2024b", override: true}, {:site_encrypt, github: "sasa1977/site_encrypt", only: [:ce, :ce_dev, :ce_test]} ] end diff --git a/mix.lock b/mix.lock index 3ee6535bcff1..37bca1572026 100644 --- a/mix.lock +++ b/mix.lock @@ -148,7 +148,7 @@ "telemetry_registry": {:hex, :telemetry_registry, "0.3.1", "14a3319a7d9027bdbff7ebcacf1a438f5f5c903057b93aee484cca26f05bdcba", [:mix, :rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6d0ca77b691cf854ed074b459a93b87f4c7f5512f8f7743c635ca83da81f939e"}, "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"}, "tls_certificate_check": {:hex, :tls_certificate_check, "1.21.0", "042ab2c0c860652bc5cf69c94e3a31f96676d14682e22ec7813bd173ceff1788", [:rebar3], [{:ssl_verify_fun, "~> 1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "6cee6cffc35a390840d48d463541d50746a7b0e421acaadb833cfc7961e490e7"}, - "tzdata": {:git, "https://github.com/ruslandoga/tzdata.git", "57e926ff3848455c32436a94f27cb7b8b27373d0", [branch: "fix-for-2024b"]}, + "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"}, "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},