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.

Sign up for GitHub

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

ci(release): fix MSI release build rootfs path #1009

Merged
merged 5 commits into from
Jul 2, 2024
Merged

ci(release): fix MSI release build rootfs path #1009

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bc2e94
ci(release): fix MSI release build rootfs path
pendo324 Jul 2, 2024
7335ef0
remove leading slash
pendo324 Jul 2, 2024
0ac1a6c
also remove slash from docs
pendo324 Jul 2, 2024
4e415ef
fix variable
pendo324 Jul 2, 2024
e2e86f4
add input to workflow_dispatch so this workflow can be manually run o…
pendo324 Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-msi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
cd deps/finch-core && make clean
- name: Build project
run: |
make FINCH_ROOTFS_LOCATION_ROOT=/__INSTALLFOLDER__
make FINCH_OS_IMAGE_LOCATION_ROOT=/__INSTALLFOLDER__
- name: generate and download signed msi
run: |
$version="${{ needs.get-tag-name.outputs.version }}"
Expand Down
2 changes: 1 addition & 1 deletion Makefile.darwin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ FINCH_OS_BASENAME=$(AARCH64_ARTIFACT)
FINCH_OS_DIGEST=$(AARCH64_512_DIGEST)
endif

# This variable is used to generate release builds, where the OS iamge path should be overwritten
# This variable is used to generate release builds, where the OS image path should be overwritten
# to /Applications/Finch/...
FINCH_OS_IMAGE_LOCATION_ROOT ?= $(DEST)
FINCH_IMAGE_LOCATION := $(FINCH_OS_IMAGE_LOCATION_ROOT)/os/$(FINCH_OS_BASENAME)
Expand Down
5 changes: 4 additions & 1 deletion Makefile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ else
$(error Finch on Windows ARM not supported)
endif

FINCH_IMAGE_LOCATION := $(OS_OUTDIR)/$(FINCH_ROOTFS_BASENAME)
# This variable is used to generate release builds, where the OS rootfs path should be overwritten
# to C:/Program Files/Finch/...
FINCH_OS_IMAGE_LOCATION_ROOT ?= $(DEST)
FINCH_IMAGE_LOCATION := $(FINCH_OS_IMAGE_LOCATION_ROOT)/os/$(FINCH_ROOTFS_BASENAME)
FINCH_IMAGE_DIGEST := "sha512:$(FINCH_ROOTFS_DIGEST)"

$(OS_OUTDIR)/finch.yaml: $(OS_OUTDIR) finch.yaml.d/common.yaml finch.yaml.d/windows.yaml
Expand Down
2 changes: 1 addition & 1 deletion msi-builder/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Finch Windows MSI Tool to generate MSI installer from Finch build

## Instructions

[1] Build finch: `make FINCH_ROOTFS_LOCATION_ROOT=/__INSTALLFOLDER__`
[1] Build finch: `make FINCH_OS_IMAGE_LOCATION_ROOT=/__INSTALLFOLDER__`

- It will inject the placeholder `__INSTALLFOLDER__` into `os\finch.yaml` for the rootfs location

Expand Down
Loading