Skip to content

Commit

Permalink
ci: Update .app installer path (#225)
Browse files Browse the repository at this point in the history
Issue #, if available:

*Description of changes:*
After change Finch to .app structure, github action params need update
to new path: image path and uninstall script path
*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: Kevin Li <[email protected]>
  • Loading branch information
KevinLiAWS authored Feb 17, 2023
1 parent 7480222 commit 4404caa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release-installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
# 1. Ssh to the arm64 hosts.
# 2. Run `cd ar/_work/finch/finch`.
# 3. Run `INSTALLED=true make test-e2e` to complete the installer e2e tests.
# 4. Run `sudo /Applications/Finch/uninstall.sh` to uninstall Finch.
# 4. Run `sudo bash /Applications/Finch.app/Contents/Resources/resources/uninstall.sh` to uninstall Finch.
# 5. Run `rm -rf Finch-<version>-aarch64.pkg` to delete the pkg.
macos-arm64-test-installer:
strategy:
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Run e2e tests
run: INSTALLED=true make test-e2e
- name: Silently uninstall
run: echo 'y' | sudo bash /Applications/Finch/uninstall.sh
run: echo 'y' | sudo bash /Applications/Finch.app/Contents/Resources/resources/uninstall.sh
- name: Delete installer
run: rm -rf Finch-${GITHUB_REF_NAME}-aarch64.pkg

Expand Down Expand Up @@ -115,6 +115,6 @@ jobs:
- name: Run e2e tests
run: INSTALLED=true make test-e2e
- name: Silently uninstall
run: echo 'y' | sudo bash /Applications/Finch/uninstall.sh
run: echo 'y' | sudo bash /Applications/Finch.app/Contents/Resources/resources/uninstall.sh
- name: Delete installer
run: rm -rf Finch-${GITHUB_REF_NAME}-x86_64.pkg
4 changes: 2 additions & 2 deletions .github/workflows/upload-build-to-s3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
brew install go lz4 automake autoconf libtool
make clean
make download-licenses
make FINCH_OS_IMAGE_LOCATION_ROOT=/Applications/Finch
make FINCH_OS_IMAGE_LOCATION_ROOT=/Applications/Finch.app/Contents/Resources/resources
tar -zcvf finch.arm64."$(date '+%s').tar.gz" _output
- name: Upload macos arm64 build
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
brew install go lz4 automake autoconf libtool
make clean
make download-licenses
make FINCH_OS_IMAGE_LOCATION_ROOT=/Applications/Finch
make FINCH_OS_IMAGE_LOCATION_ROOT=/Applications/Finch.app/Contents/Resources/resources
tar -zcvf finch.amd64."$(date '+%s').tar.gz" _output
- name: Upload macos amd64 build
Expand Down

0 comments on commit 4404caa

Please sign in to comment.