Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add windows targets in makefile #192

Merged
merged 14 commits into from
Oct 17, 2023
Merged

feat: add windows targets in makefile #192

merged 14 commits into from
Oct 17, 2023

Conversation

vsiravar
Copy link
Contributor

Issue #, if available:

Description of changes:
finch-core changes for windev.

  • Makefile changes
  • rootfs dockerfile change
  • lima submodule updates

Testing done:
Yes

  • 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.

Copy link
Contributor

@ginglis13 ginglis13 left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
verify_hash.ps1 Outdated Show resolved Hide resolved
vsiravar and others added 14 commits October 17, 2023 11:48
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
…ream (#175)

Issue #, if available:

*Description of changes:*
Tracks a Lima fork until the SSH quoting issue is resolved upstream.

You probably need to run `git submodule set-url src/lima
https://github.com/pendo324/lima` and `git submodule update --init
--recursive` to get the latest changes

*Testing done:*

- [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: Justin Alvarez <alvajus@amazon.com>
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
Issue #, if available:

*Description of changes:*
- update to latest rootfs built by action
- don't extract rootfs, let Lima do it

*Testing done:*

- [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: Justin Alvarez <alvajus@amazon.com>
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
Issue #, if available:

*Description of changes:*
- Since the ssh quote fix is merged, we can track Lima's `master` branch
again

*Testing done:*

- [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: Justin Alvarez <alvajus@amazon.com>
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
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>
Issue #, if available:

*Description of changes:*
Add cosign binary to rootfs

*Testing done:*

- [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: Vishwas Siravara <siravara@amazon.com>
Issue #, if available:

*Description of changes:*
- Update rootfs archive
- Remove arm64 build for rootfs

*Testing done:*

- [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: Vishwas Siravara <siravara@amazon.com>
Issue #, if available:

*Description of changes:*
  - Adds all dependencies needed to run lima/finch standalone
  - This includes a lot of DLLs, need a better way to automate this
- TODO: after merge, need to modify Finch to set path when calling Lima
so that these executables are actually used

*Testing done:*
- All exes work with an empty `%PATH%` (e.g. `$env:Path = ""; ssh.exe
--help` works)

- [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: Justin Alvarez <alvajus@amazon.com>
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
Issue #, if available:

*Description of changes:*
- Accidentally removed from previous PR

*Testing done:*

- [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: Justin Alvarez <alvajus@amazon.com>
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
Issue #, if available:

*Description of changes:*
- Remove old version of msys-crypto
- Accidentally added because I looked at the DLLs required for an older
version of `ssh-keygen.exe`, newer versions don't need this file

*Testing done:*
- Tested on my windows machine

- [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: Justin Alvarez <alvajus@amazon.com>
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
Issue #, if available:

*Description of changes:*

tar option --force-local is used to instruct tar that the input is known
to be a local file even if it is interpreted by tar to be a remote file;
this appears to have been the case for the wingit local archive as seen
in
https://github.com/runfinch/finch/actions/runs/6501797014/job/17659749228

https://www.gnu.org/software/tar/manual/html_section/All-Options.html

*Testing done:*

`make` on windows instance

- [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>
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
@vsiravar vsiravar merged commit 9bc03a0 into main Oct 17, 2023
6 checks passed
@vsiravar vsiravar deleted the windev branch October 17, 2023 20:34
@vsiravar vsiravar restored the windev branch October 17, 2023 23:26
@austinvazquez austinvazquez deleted the windev branch July 8, 2024 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants