Skip to content

Commit

Permalink
Merge branch 'release/v0.1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
zacksiri committed Mar 1, 2024
2 parents ade1b66 + b77a3e8 commit 13a9537
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ runs:
uses: actions/cache@v4
with:
path: ~/.mix
key: ${{ runner.arch }}-icepak-0.1.4
key: ${{ runner.arch }}-icepak-0.1.5

- name: Install Pakman
if: steps.cache-icepak.outputs.cache-hit != 'true'
run: |
mix local.rebar --force
mix local.hex --force
mix escript.install hex icepak 0.1.4 --force
mix escript.install hex icepak 0.1.5 --force
shell: alpine.sh {0}
env:
MIX_ENV: prod
5 changes: 4 additions & 1 deletion lib/icepak/push.ex
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defmodule Icepak.Push do
require Logger

def perform(options) do
base_path = Path.expand(Keyword.fetch!(options, :path))
base_path = Path.expand(Keyword.get(options, :path, "~/"))

os = Keyword.fetch!(options, :os)
arch = Keyword.fetch!(options, :arch)
Expand All @@ -34,6 +34,9 @@ defmodule Icepak.Push do

items =
File.ls!(base_path)
|> Enum.filter(fn file_name ->
file_name in ["incus.tar.xz", "rootfs.squashfs", "disk.qcow2"]
end)
|> Enum.flat_map(&Item.prepare(&1, item_params))
|> Upload.perform(polar_client: polar_client)

Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Icepak.MixProject do
def project do
[
app: :icepak,
version: "0.1.4",
version: "0.1.5",
elixir: "~> 1.14",
elixirc_paths: elixirc_paths(Mix.env()),
start_permanent: Mix.env() == :prod,
Expand Down

0 comments on commit 13a9537

Please sign in to comment.