Skip to content

Commit

Permalink
fix: lima-template path in Makefile, OS images (#179)
Browse files Browse the repository at this point in the history
Issue #, if available:

*Description of changes:*

Failure seen in mac e2e tests on branch `windev`:
https://github.com/runfinch/finch/actions/runs/6413564599/job/17412684261?pr=584

update OS image refs. hashes are already correct in windev branch.
revert a change to the fedora lima template path. This `lima-template`
rule is only used on macOS:

https://github.com/runfinch/finch-core/blob/22af4e43c95b2ac591754fc817228b8aff9deddf/Makefile#L79-L93

*Testing done:*

On both windows and macOS dev machines:

```
# .gitmodules
[submodule "finch-core"]
	path = deps/finch-core
	url = https://github.com/ginglis13/finch-core.git
	branch = makefile-fix
```

```
make
./_output/bin/finch vm init
```

- [x] I've reviewed the guidance in CONTRIBUTING.md

#### License Acceptance

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

Signed-off-by: Gavin Inglis <[email protected]>
Signed-off-by: Vishwas Siravara <[email protected]>
  • Loading branch information
ginglis13 authored and vsiravar committed Oct 17, 2023
1 parent 74d1952 commit 375adea
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ BUILD_TS := $(shell date +%s)
# Set these variables if they aren't set, or if they are set to ""
# Allows callers to override these default values
# From https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images/
FINCH_OS_x86_URL := $(or $(FINCH_OS_x86_URL),https://deps.runfinch.com/Fedora-Cloud-Base-38-1.6.x86_64-20230830214712.qcow2)
FINCH_OS_x86_DIGEST := $(or $(FINCH_OS_x86_DIGEST),"sha256:e8d5872454cf25155ce5f19381f27ef096ce89efcbb5ecc639dcb6bf44e16bf8")
FINCH_OS_x86_URL := $(or $(FINCH_OS_x86_URL),https://deps.runfinch.com/Fedora-Cloud-Base-38-1.6.x86_64-20230918164920.qcow2)
FINCH_OS_x86_DIGEST := $(or $(FINCH_OS_x86_DIGEST),"sha256:214cce00ce5f6ac402a0a5a5269013eae201bf143ad8dbb9d50cfd5e22acd991")
# From https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/aarch64/images/
FINCH_OS_AARCH64_URL := $(or $(FINCH_OS_AARCH64_URL),https://deps.runfinch.com/Fedora-Cloud-Base-38-1.6.aarch64-20230830214718.qcow2)
FINCH_OS_AARCH64_DIGEST := $(or $(FINCH_OS_AARCH64_DIGEST),"sha256:219a30f1409f8757eaf654dabf378fe0412b9499f877e5c69ad2f24327b1a5f4")
FINCH_OS_AARCH64_URL := $(or $(FINCH_OS_AARCH64_URL),https://deps.runfinch.com/Fedora-Cloud-Base-38-1.6.aarch64-20230918164937.qcow2)
FINCH_OS_AARCH64_DIGEST := $(or $(FINCH_OS_AARCH64_DIGEST),"sha256:ad4c2fa3f80736cb6ea8e46f1a6ccf1f5f578e56de462bb60fcbc241786478d2")

FINCH_ROOTFS_x86_URL := $(or $(FINCH_ROOTFS_x86_URL),https://deps.runfinch.com/common/x86-64/finch-rootfs-production-amd64-1694791577.tar.gz)
FINCH_ROOTFS_x86_DIGEST := $(or $(FINCH_ROOTFS_x86_DIGEST),"sha256:2d4d2e7386450899c6d0587fd0db21afadb31d974fa744aa9365c883935c5341")
Expand Down Expand Up @@ -127,7 +127,7 @@ install.lima-dependencies: download.lima-dependencies
.PHONY: lima-template
lima-template: download
mkdir -p $(OUTDIR)/lima-template
cp $(OUTDIR)/lima-template/$(FEDORA_YAML) $(OUTDIR)/lima-template/fedora.yaml
cp lima-template/fedora.yaml $(OUTDIR)/lima-template
# using -i.bak is very intentional, it allows the following commands to succeed for both GNU / BSD sed
# this sed command uses the alternative separator of "|" because the image location uses "/"
sed -i.bak -e "s|<image_location>|$(FINCH_IMAGE_LOCATION)|g" $(OUTDIR)/lima-template/fedora.yaml
Expand Down

0 comments on commit 375adea

Please sign in to comment.