Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion .formatter.exs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Used by "mix format"
[
inputs: ["{mix,.formatter}.exs", "{lib,test}/**/*.{ex,exs}"]
inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
]
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ on:

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
MIX_ENV: test
strategy:
fail-fast: false
matrix:
include:
- pair:
elixir: 1.9.4
otp: 20.3
elixir: "1.14"
otp: "25"
- pair:
elixir: 1.13.4
otp: 24.3
elixir: "1.19"
otp: "28"
lint: lint
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6

- uses: erlef/setup-beam@v1
with:
Expand Down
12 changes: 5 additions & 7 deletions lib/elixir_make/downloader/httpc.ex
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,11 @@ defmodule ElixirMake.Downloader.Httpc do
end

defp otp_cacerts do
if System.otp_release() >= "25" do
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# cacerts_get/0 raises if no certs found
try do
:public_key.cacerts_get()
rescue
_ -> nil
end
# cacerts_get/0 raises if no certs found
try do
:public_key.cacerts_get()
rescue
_ -> nil
end
end

Expand Down
4 changes: 3 additions & 1 deletion lib/mix/tasks/elixir_make.checksum.ex
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ defmodule Mix.Tasks.ElixirMake.Checksum do

if Keyword.get(options, :print, false) do
artefacts
|> Enum.map(fn %Artefact{basename: basename, checksum: checksum} -> {basename, checksum} end)
|> Enum.map(fn %Artefact{basename: basename, checksum: checksum} ->
{basename, checksum}
end)
|> Enum.sort()
|> Enum.map_join("\n", fn {file, checksum} -> "#{checksum} #{file}" end)
|> IO.puts()
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defmodule ElixirMake.Mixfile do
[
app: :elixir_make,
version: @version,
elixir: "~> 1.9",
elixir: "~> 1.14",
description: "A Make compiler for Mix",
package: package(),
docs: docs(),
Expand Down