Skip to content

Commit

Permalink
Mises à jour techniques (#2074)
Browse files Browse the repository at this point in the history
* Bump castore

* Bump earmark & earmark_parser

* Bump ecto, jason, postgrex

* Bump ex_aws/s3

* Bump ex_clr/gettext

* Bump geo

* Update finch (& use forked exvcr, see #1853)

* Update phoenix, liveview etc

* Tweak script

* Attempt to detect #1938 on CI

* Apply mix format

* Apply credo fix

* Update assets (yarn upgrade phoenix_live_view)

* Fix the test

* More credo fix
  • Loading branch information
thbar authored Jan 26, 2022
1 parent b59ff4e commit 81a91ab
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 26 deletions.
2 changes: 1 addition & 1 deletion apps/datagouvfr/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ defmodule Datagouvfr.MixProject do
{:shared, in_umbrella: true},
# Using master until https://github.com/CargoSense/vex/issues/68 is fixed
{:vex, github: "CargoSense/vex", ref: "328a39f7"},
{:exvcr, "~> 0.10", only: :test},
{:exvcr, "~> 0.10", only: :test, git: "https://github.com/thbar/exvcr.git", ref: "2794a4f"},
{:mox, "~> 1.0.0", only: :test},
{:sentry, "~> 8.0"}
]
Expand Down
2 changes: 1 addition & 1 deletion apps/gbfs/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ defmodule GBFS.MixProject do
# otherwise the tests won't run. Not sure if there's a better way for this,
# since the GBFS app itself does not currently rely on conditional encoding.
{:shared, in_umbrella: true},
{:exvcr, "~> 0.10", only: :test},
{:exvcr, "~> 0.10", only: :test, git: "https://github.com/thbar/exvcr.git", ref: "2794a4f"},
{:mock, "~> 0.3.6", only: :test},
{:bypass, "~> 2.1", only: :test}
]
Expand Down
6 changes: 3 additions & 3 deletions apps/transport/client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3626,13 +3626,13 @@ path-type@^4.0.0:
integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==

"phoenix@file:../../../deps/phoenix":
version "1.6.2"
version "1.6.6"

"phoenix_html@file:../../../deps/phoenix_html":
version "3.1.0"
version "3.2.0"

"phoenix_live_view@file:../../../deps/phoenix_live_view":
version "0.17.5"
version "0.17.6"

picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
version "2.2.3"
Expand Down
2 changes: 1 addition & 1 deletion apps/transport/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ defmodule Transport.Mixfile do
{:castore, "~> 0.1.0"},
{:phoenix_live_reload, "~> 1.2", only: :dev},
{:cors_plug, "~> 2.0"},
{:exvcr, "~> 0.10", only: :test},
{:exvcr, "~> 0.10", only: :test, git: "https://github.com/thbar/exvcr.git", ref: "2794a4f"},
{:credo, "~> 1.5.0", only: [:dev, :test], runtime: false},
# NOTE: we cannot upgrade to the very latest (2.2.x) because of
# https://github.com/parroty/exvcr/issues/153#issuecomment-874864317
Expand Down
17 changes: 17 additions & 0 deletions apps/transport/test/build_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,22 @@ defmodule TransportWeb.BuildTest do
version == expected_version |> to_string(),
"Your javascript package for phoenix_live_view is out of date.\nPlease update it with:\n\ncd apps/transport/client && yarn upgrade phoenix_live_view"
)

# extra fix for https://github.com/etalab/transport-site/issues/1938
# problem appears only locally, so probably linked to webpack or similar
lock_file =
"#{__DIR__}/../client/yarn.lock"
|> File.read!()
|> String.replace("\n", "")

[
[_, "phoenix", phoenix_yarn_version],
[_, "phoenix_html", phoenix_html_yarn_version],
[_, "phoenix_live_view", phoenix_yarn_live_view_version]
] = Regex.scan(~r/deps\/(phoenix_html|phoenix_live_view|phoenix)": version "([^"]+)"/, lock_file)

assert phoenix_yarn_version == :phoenix |> Application.spec(:vsn) |> to_string()
assert phoenix_html_yarn_version == :phoenix_html |> Application.spec(:vsn) |> to_string()
assert phoenix_yarn_live_view_version == :phoenix_live_view |> Application.spec(:vsn) |> to_string()
end
end
2 changes: 2 additions & 0 deletions generate_deps_changelogs.exs
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@ master
compare = repo |> String.replace(".git", "/compare/#{sha1}..#{sha2}")
IO.puts("* #{compare}")
end
{{:hex, v1}, {:git, repo, sha2}} ->
IO.puts("* Now using git-version #{repo} @ #{sha2}")
end
end)
40 changes: 20 additions & 20 deletions mix.lock

Large diffs are not rendered by default.

0 comments on commit 81a91ab

Please sign in to comment.