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.

Sign up for GitHub

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

Phoenix upgrade 1.6 #111

Merged
merged 6 commits into from
Nov 14, 2022
Merged

Phoenix upgrade 1.6 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72d37d1
Basic Phoenix upgrade to 1.6
pbrudnick Nov 11, 2022
2e84cce
Migration to HEEx engine (Optional)
pbrudnick Nov 11, 2022
62fb627
Deps updates
pbrudnick Nov 11, 2022
4c33381
format code
pbrudnick Nov 11, 2022
eccbc42
Update CI versions
pbrudnick Nov 11, 2022
7f69ae2
Merge branch 'master' into phoenix_upgrade_1.6
pbrudnick Nov 14, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04]
otp: [22.0.7]
elixir: [1.9.4]
otp: [24.3.3]
elixir: [1.12]
node: [12.8.0]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: elixir:1.9.1-slim
image: elixir:1.12-slim

steps:
- uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
elixir 1.9.4
erlang 22.0.7
elixir 1.12.0
erlang 24.3.3
nodejs 12.8.0
4 changes: 1 addition & 3 deletions lib/coophub/cache_warmer.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ defmodule Coophub.CacheWarmer do
case Cachex.dump(@repos_cache_name, @repos_cache_dump_file) do
{:ok, true} ->
Logger.info(
"Saved repos cache dump with #{length(repos)} orgs to local file '#{
@repos_cache_dump_file
}'",
"Saved repos cache dump with #{length(repos)} orgs to local file '#{@repos_cache_dump_file}'",
ansi_color: :magenta
)

Expand Down
0 lib/coophub_web/templates/error/404.html.eex → ...coophub_web/templates/error/404.html.heex
View file
Open in desktop
File renamed without changes.
0 lib/coophub_web/templates/error/500.html.eex → ...coophub_web/templates/error/500.html.heex
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions ...coophub_web/templates/layout/app.html.eex → ...oophub_web/templates/layout/app.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>CoopHub · Open source from cooperatives over the world!</title>
<link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
<link rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")}/>

<link rel="apple-touch-icon" sizes="180x180" href="<%= Routes.static_path(@conn, "/icons/apple-touch-icon.png") %>">
<link rel="icon" type="image/png" sizes="32x32" href="<%= Routes.static_path(@conn, "/icons/favicon-32x32.png") %>">
<link rel="icon" type="image/png" sizes="16x16" href="<%= Routes.static_path(@conn, "/icons/favicon-16x16.png") %>">
<link rel="manifest" href="<%= Routes.static_path(@conn, "/icons/site.webmanifest") %>">
<link rel="mask-icon" href="<%= Routes.static_path(@conn, "/icons/safari-pinned-tab.svg") %>" color="#5bbad5">
<link rel="shortcut icon" href="<%= Routes.static_path(@conn, "/icons/favicon.ico") %>">
<link rel="apple-touch-icon" sizes="180x180" href={Routes.static_path(@conn, "/icons/apple-touch-icon.png")}>
<link rel="icon" type="image/png" sizes="32x32" href={Routes.static_path(@conn, "/icons/favicon-32x32.png")}>
<link rel="icon" type="image/png" sizes="16x16" href={Routes.static_path(@conn, "/icons/favicon-16x16.png")}>
<link rel="manifest" href={Routes.static_path(@conn, "/icons/site.webmanifest")}>
<link rel="mask-icon" href={Routes.static_path(@conn, "/icons/safari-pinned-tab.svg")} color="#5bbad5">
<link rel="shortcut icon" href={Routes.static_path(@conn, "/icons/favicon.ico")}>
<meta name="apple-mobile-web-app-title" content="CoopHub">
<meta name="application-name" content="CoopHub">
<meta name="msapplication-TileColor" content="#2d89ef">
<meta name="msapplication-config" content="<%= Routes.static_path(@conn, "/icons/browserconfig.xml") %>">
<meta name="msapplication-config" content={Routes.static_path(@conn, "/icons/browserconfig.xml")}>
<meta name="theme-color" content="#ffffff">

<meta property="og:title" content="CoopHub · Open source from worldwide cooperatives" />
Expand All @@ -29,6 +29,6 @@
</head>
<body id="page-top">
<%= @inner_content %>
<script type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
<script type="text/javascript" src={Routes.static_path(@conn, "/js/app.js")}></script>
</body>
</html>
0 ...coophub_web/templates/page/index.html.eex → ...oophub_web/templates/page/index.html.heex
View file
Open in desktop
File renamed without changes.
16 changes: 9 additions & 7 deletions mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule Coophub.MixProject do
[
app: :coophub,
version: File.read!("VERSION"),
elixir: "~> 1.5",
elixir: "~> 1.12",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
start_permanent: Mix.env() == :prod,
Expand Down Expand Up @@ -42,17 +42,19 @@ defmodule Coophub.MixProject do
# Type `mix help deps` for examples and options.
defp deps do
[
{:phoenix, "~> 1.5"},
{:phoenix, "~> 1.6"},
{:phoenix_pubsub, "~> 2.0"},
{:phoenix_html, "~> 2.14"},
{:phoenix_live_reload, "~> 1.3", only: :dev},
{:phoenix_html, "~> 3.0"},
{:phoenix_live_view, "~> 0.18"},
{:phoenix_live_reload, "~> 1.4", only: :dev},
{:gettext, "~> 0.18"},
{:jason, "~> 1.2"},
{:plug_cowboy, "~> 2.4"},
{:httpoison, "~> 1.8"},
{:yaml_elixir, "~> 2.6"},
{:cachex, "~> 3.1"},
{:dialyzex, "~> 1.2", only: :dev}
{:yaml_elixir, "~> 2.9"},
# TODO: for a 3.4 upgrade we need a ChildSpec change
{:cachex, "3.2.0"},
{:dialyzex, "~> 1.3", only: :dev}
]
end

Expand Down
Loading