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

Jump to bottom

Use cargo-binstall as fallback in main.sh #8

Merged
merged 26 commits into from
Jun 10, 2022
Merged

Use cargo-binstall as fallback in main.sh #8

merged 26 commits into from
Jun 10, 2022

Conversation

NobodyXu
Copy link
Collaborator

Fixed #7

Signed-off-by: Jiahao XU Jiahao_XU@outlook.com

@NobodyXu
Use cargo-binstall as fallback in main.sh
129207f 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix download: Use curl with https >=tls1.2 with retry
71aaa21 
instead of `wget`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix typo in cargo_binstall of main.sh
59b2718 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Install cargo-binstall and cache it in cargo_bin of main.sh
c0d0c84 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix cargo_binstall: Add quoting for all variables
5067f75 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix cargo_binstall: rm rm cargo-binstall
0a98705 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix shfmt error
2519b8c 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
taiki-e
taiki-e reviewed Jun 2, 2022
View reviewed changes
Copy link
Owner

@taiki-e taiki-e left a comment

Choose a reason for hiding this comment

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

Thanks!

main.sh Outdated Show resolved Hide resolved
main.sh Outdated Show resolved Hide resolved
main.sh Show resolved Hide resolved
taiki-e
taiki-e reviewed Jun 2, 2022
View reviewed changes
main.sh Outdated Show resolved Hide resolved
@NobodyXu
Refactor code: Improve readbility of fn cargo_binstall
11ecb58 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add info logging to cargo_binstall
1f938cf 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Support target x86_64-pc-windows-gnu in fn cargo_binstall
bd6a7ff 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
taiki-e
taiki-e reviewed Jun 2, 2022
View reviewed changes
main.sh Show resolved Hide resolved
@NobodyXu
Refactor fn cargo_binstall: Extract install_cargo_binstall
2bada2f 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Support installing tool cargo-binstall in main.sh
f57c414 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Improve logging in install_cargo_binstall
cfd7dc3 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Rm workaround for target detection for cargo-binstall
6cbd0ee 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add unit test for cargo_binstall in main.sh
9d8d9f8 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Merge branch 'main' into feature/cargo-binstall
6f2c60c
@NobodyXu
Fix install_cargo_binstall in main.sh
27fb16f 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Test cargo-binstall on mac and win
0c7867a 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Copy link
Collaborator Author

NobodyXu commented Jun 8, 2022

@taiki-e I am clueless at what cause the error in the CI.

Can you help me with the error?

taiki-e
taiki-e reviewed Jun 8, 2022
View reviewed changes
main.sh Outdated Show resolved Hide resolved
main.sh Outdated Show resolved Hide resolved
main.sh Outdated Show resolved Hide resolved
main.sh Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
NobodyXu and others added 4 commits June 9, 2022 01:21
@NobodyXu @taiki-e
Update main.sh
4e18337 
Co-authored-by: Taiki Endo <te316e89@gmail.com>
@NobodyXu @taiki-e
Update main.sh
3a9f585 
Co-authored-by: Taiki Endo <te316e89@gmail.com>
@NobodyXu
Test cargo_binstall in main.sh using cargo-watch
5390063 
which is well maintained.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add debugging in install_cargo_binstall
0042249 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Copy link
Collaborator Author

NobodyXu commented Jun 8, 2022 •
edited
Loading

@taiki-e I am really confused at the err msg:

Debugging
total 9976
   0 drwxr-xr-x  16 runner  staff   512B Jun  8 15:31 .
   0 drwxr-xr-x   3 runner  staff    96B Jun  8 15:31 ..
   8 -rw-r--r--   1 runner  staff   331B Jun  8 15:31 .editorconfig
   0 drwxr-xr-x  13 runner  staff   416B Jun  8 15:31 .git
   8 -rw-r--r--   1 runner  staff    19B Jun  8 15:31 .gitattributes
   0 drwxr-xr-x   3 runner  staff    96B Jun  8 15:31 .github
   8 -rw-r--r--   1 runner  staff   277B Jun  8 15:31 .gitignore
  16 -rw-r--r--   1 runner  staff   5.2K Jun  8 15:31 CHANGELOG.md
  24 -rw-r--r--   1 runner  staff   9.9K Jun  8 15:31 LICENSE-APACHE
   8 -rw-r--r--   1 runner  staff   1.0K Jun  8 15:31 LICENSE-MIT
  16 -rw-r--r--   1 runner  staff   6.4K Jun  8 15:31 README.md
   8 -rw-r--r--   1 runner  staff   253B Jun  8 15:31 action.yml
9848 -rwxr-xr-x   1 runner  staff   4.8M Jun  8 05:26 cargo-binstall
   8 -rw-r--r--   1 runner  staff   335B Jun  8 15:31 main.js
  24 -rwxr-xr-x   1 runner  staff    11K Jun  8 15:31 main.sh
   0 drwxr-xr-x   4 runner  staff   128B Jun  8 15:31 tools
mv: rename cargo-binstall to ~/.cargo/bin: No such file or directory
Error: Command failed: bash --noprofile --norc /Users/runner/work/install-action/install-action/main.sh

Clearly cargo-binstall is extracted correctly and the mv also seems to be valid for linux and macos.

@NobodyXu
Try to fix final step of install_cargo_binstall
08ed50f 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@taiki-e
Copy link
Owner

taiki-e commented Jun 8, 2022

I believe the error is due to ~ being treated as just a string when quoted (I just remembered that I had encountered that problem before). You can remove the quote and disable SC2086 as follows, or you can use the HOME environment variable instead.

install-action/main.sh

Lines 80 to 82 in bc0a06a

# shellcheck disable=SC2086
retry curl --proto '=https' --tlsv1.2 -fsSL --retry 10 --retry-connrefused "${url}" \
| tar xzf - -C ${CARGO_HOME:-~/.cargo}/bin

@NobodyXu
Fix cargo_bin: Use $HOME instead of ~
836c0c8 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Copy link
Collaborator Author

NobodyXu commented Jun 8, 2022

@taiki-e Finally fixed it!

@NobodyXu
Rm debugging code in install_cargo_binstall
dbc2ebe 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Remove rebundant logging in main.sh
602ac3a 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu NobodyXu requested a review from taiki-e June 9, 2022 02:57
This was referenced Jun 9, 2022
Closed
Open
taiki-e
taiki-e approved these changes Jun 10, 2022
View reviewed changes
Copy link
Owner

@taiki-e taiki-e left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @NobodyXu!

@taiki-e taiki-e merged commit 2e2f046 into taiki-e:main Jun 10, 2022
@NobodyXu NobodyXu deleted the feature/cargo-binstall branch June 10, 2022 13:21
@taiki-e
Copy link
Owner

taiki-e commented Jun 10, 2022

Published in 1.4.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taiki-e taiki-e taiki-e approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Suggestion/Supporting cargo-binstall?
2 participants
@NobodyXu @taiki-e