fix: lima-template path in Makefile, OS images #179
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
add conditional to check for lima-template copying logic. Signed-off-by: Gavin Inglis <giinglis@amazon.com>
pendo324
approved these changes
Oct 5, 2023
vsiravar
approved these changes
Oct 5, 2023
vsiravar
pushed a commit
that referenced
this pull request
Oct 14, 2023
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 <giinglis@amazon.com> Signed-off-by: Vishwas Siravara <siravara@amazon.com>
vsiravar
pushed a commit
that referenced
this pull request
Oct 17, 2023
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 <giinglis@amazon.com> Signed-off-by: Vishwas Siravara <siravara@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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=584update OS image refs. hashes are already correct in windev branch. revert a change to the fedora lima template path. This
lima-templaterule is only used on macOS:finch-core/Makefile
Lines 79 to 93 in 22af4e4
Testing done:
On both windows and macOS dev machines:
License Acceptance
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.