Skip to content

Commit

Permalink
Merge branch 'release/v8.1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
zacksiri committed Oct 26, 2023
2 parents 968541f + 62d32f7 commit 610ca4b
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ pakman-*.tar

/tmp


/priv/plts
4 changes: 2 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ runs:
uses: actions/cache@v3
with:
path: ~/.mix
key: ${{ runner.arch }}-alpine-${{ inputs.alpine }}-pakman-8.1.4
key: ${{ runner.arch }}-alpine-${{ inputs.alpine }}-pakman-8.1.5

- name: Install Pakman
if: steps.cache-pakman.outputs.cache-hit != 'true'
run: |
mix local.rebar --force
mix local.hex --force
mix escript.install hex pakman 8.1.4 --force
mix escript.install hex pakman 8.1.5 --force
shell: alpine.sh {0}
env:
MIX_ENV: prod
4 changes: 3 additions & 1 deletion lib/pakman/instellar.ex
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ defmodule Pakman.Instellar do
if Application.get_env(:pakman, :env) == :test do
[
{Tesla.Middleware.BaseUrl, endpoint},
Tesla.Middleware.JSON
Tesla.Middleware.JSON,
{Tesla.Middleware.Logger,
debug: false, log_level: &custom_log_level/1}
]
else
[
Expand Down
18 changes: 9 additions & 9 deletions lib/pakman/push.ex
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ defmodule Pakman.Push do

{:ok, :pushed}
else
{:ok, %{"attributes" => %{"id" => _}}} ->
{:error, error} ->
raise Error, message: "[Pakman.Push] #{inspect(error)}"

{:ok, %{"attributes" => _}} ->
Logger.info("[Pakman.Push] Deployment already exists...")

{:ok, :already_exists}

{:error, body} ->
raise Error, message: "[Pakman.Push] #{inspect(body)}"

_ ->
raise Error, message: "[Pakman.Push] Deployment creation failed..."
end
Expand Down Expand Up @@ -166,17 +166,17 @@ defmodule Pakman.Push do
end

defp print_deployment_message(:created),
do: Logger.info("[Pakman.Deploy] Deployment successfully created...")
do: Logger.info("[Pakman.Push] Deployment successfully created...")

defp print_deployment_message(:already_exists),
do: Logger.info("[Pakman.Deploy] Deployment already exists...")
do: Logger.info("[Pakman.Push] Deployment already exists...")

defp print_configuration_message(:created),
do: Logger.info("[Pakman.Deploy] Configuration successfully created...")
do: Logger.info("[Pakman.Push] Configuration successfully created...")

defp print_configuration_message(:already_exists),
do: Logger.info("[Pakman.Deploy] Configuration already exists...")
do: Logger.info("[Pakman.Push] Configuration already exists...")

defp print_configuration_message(:no_configuration),
do: Logger.info("[Pakman.Deploy] Configuration not found...")
do: Logger.info("[Pakman.Push] Configuration not found...")
end
4 changes: 2 additions & 2 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Pakman.MixProject do
def project do
[
app: :pakman,
version: "8.1.4",
version: "8.1.5",
elixir: "~> 1.13",
elixirc_paths: elixirc_paths(Mix.env()),
start_permanent: Mix.env() == :prod,
Expand Down Expand Up @@ -51,7 +51,7 @@ defmodule Pakman.MixProject do
{:uniq, "~> 0.6"},
{:bypass, "~> 2.1", only: :test},
{:mox, "~> 1.0", only: :test},
{:dialyxir, "~> 1.3", only: [:dev], runtime: false},
{:dialyxir, "~> 1.4", only: [:dev], runtime: false},
{:ex_doc, ">= 0.0.0", only: :dev, runtime: false}
# {:dep_from_hexpm, "~> 0.3.0"},
# {:dep_from_git, git: "https://github.com/elixir-lang/my_dep.git", tag: "0.1.0"}
Expand Down
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
"cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"},
"decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
"dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
"dialyxir": {:hex, :dialyxir, "1.4.2", "764a6e8e7a354f0ba95d58418178d486065ead1f69ad89782817c296d0d746a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"},
"earmark_parser": {:hex, :earmark_parser, "1.4.37", "2ad73550e27c8946648b06905a57e4d454e4d7229c2dafa72a0348c99d8be5f7", [:mix], [], "hexpm", "6b19783f2802f039806f375610faa22da130b8edc21209d0bff47918bb48360e"},
"ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
"elixir_uuid": {:hex, :elixir_uuid, "1.2.1", "dce506597acb7e6b0daeaff52ff6a9043f5919a4c3315abb4143f0b00378c097", [:mix], [], "hexpm", "f7eba2ea6c3555cea09706492716b0d87397b88946e6380898c2889d68585752"},
Expand Down

0 comments on commit 610ca4b

Please sign in to comment.