Compare commits

...

7 Commits

Author SHA1 Message Date
Taiki Endo
43f5aa7172 Release 2.38.3 2024-06-11 23:28:33 +09:00
Taiki Endo
1330af6455 Update changelog 2024-06-11 23:28:01 +09:00
Taiki Endo
01ad6befc0 Workaround msys64 bash's buggy behavior 2024-06-11 23:23:23 +09:00
Taiki Endo
0a18e2472c Update typos@latest to 1.22.4 2024-06-11 10:11:32 +09:00
Taiki Endo
ca13ba3e0d Update earthly@latest to 0.8.14 2024-06-11 05:42:24 +09:00
Taiki Endo
fa446e93ef Update cargo-rdme manifest 2024-06-11 05:42:24 +09:00
Taiki Endo
3c1a9d610d codegen: Mark cargo-rdme 1.4.4 as broken
Same as a86757441d.
2024-06-11 04:55:02 +09:00
7 changed files with 111 additions and 12 deletions

View File

@@ -93,6 +93,43 @@ jobs:
exit 1 exit 1
fi fi
# https://github.com/taiki-e/install-action/pull/518#issuecomment-2160736760
test-msys64:
strategy:
fail-fast: false
matrix:
include:
# - os: windows-2019
- os: windows-2022
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
- uses: taiki-e/checkout-action@v1
- run: |
echo "C:\msys64\mingw32\bin" >> $GITHUB_PATH
echo "C:\msys64\usr\bin" >> $GITHUB_PATH
# cross attempts to install rust-src when Cargo.toml is available even if `cross --version`
- run: rm Cargo.toml
- name: Generate tool list
id: tool-list
run: tools/ci/tool-list.sh >>"${GITHUB_OUTPUT}"
- uses: ./
with:
tool: ${{ steps.tool-list.outputs.tool }}
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
- name: Test bash
run: just --version && shfmt --version && protoc --version
shell: bash
- name: Test pwsh
run: just --version; shfmt --version; protoc --version
shell: pwsh
- name: Test powershell
run: just --version; shfmt --version; protoc --version
shell: powershell
- name: Test cmd
run: just --version & shfmt --version & protoc --version
shell: cmd
test-container: test-container:
strategy: strategy:
fail-fast: false fail-fast: false

View File

@@ -10,6 +10,19 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
## [Unreleased] ## [Unreleased]
## [2.38.3] - 2024-06-11
- Workaround msys64 bash's buggy behavior. ([#533](https://github.com/taiki-e/install-action/pull/533))
This fixes an installation issue when default bash was overridden like the following:
```sh
echo "C:\msys64\usr\bin" >> $GITHUB_PATH
```
- Update `typos@latest` to 1.22.4.
- Update `earthly@latest` to 0.8.14.
## [2.38.2] - 2024-06-10 ## [2.38.2] - 2024-06-10
- Update `syft@latest` to 1.6.0. - Update `syft@latest` to 1.6.0.
@@ -2296,7 +2309,8 @@ Note: This release is considered a breaking change because installing on version
Initial release Initial release
[Unreleased]: https://github.com/taiki-e/install-action/compare/v2.38.2...HEAD [Unreleased]: https://github.com/taiki-e/install-action/compare/v2.38.3...HEAD
[2.38.3]: https://github.com/taiki-e/install-action/compare/v2.38.2...v2.38.3
[2.38.2]: https://github.com/taiki-e/install-action/compare/v2.38.1...v2.38.2 [2.38.2]: https://github.com/taiki-e/install-action/compare/v2.38.1...v2.38.2
[2.38.1]: https://github.com/taiki-e/install-action/compare/v2.38.0...v2.38.1 [2.38.1]: https://github.com/taiki-e/install-action/compare/v2.38.0...v2.38.1
[2.38.0]: https://github.com/taiki-e/install-action/compare/v2.37.0...v2.38.0 [2.38.0]: https://github.com/taiki-e/install-action/compare/v2.37.0...v2.38.0

22
main.sh
View File

@@ -515,17 +515,29 @@ case "$(uname -m)" in
esac esac
info "host platform: ${host_arch}_${host_os}" info "host platform: ${host_arch}_${host_os}"
install_action_dir="${HOME}/.install-action" home="${HOME}"
if [[ "${host_os}" == "windows" ]]; then
# https://github.com/taiki-e/install-action/pull/518#issuecomment-2160736760
home="${home/\/home\//\/c\/Users\/}"
fi
install_action_dir="${home}/.install-action"
tmp_dir="${install_action_dir}/tmp" tmp_dir="${install_action_dir}/tmp"
cargo_bin="${CARGO_HOME:-"${HOME}/.cargo"}/bin" cargo_bin="${CARGO_HOME:-"${home}/.cargo"}/bin"
# If $CARGO_HOME does not exist, or cargo installed outside of $CARGO_HOME/bin # If $CARGO_HOME does not exist, or cargo installed outside of $CARGO_HOME/bin
# is used ($CARGO_HOME/bin is most likely not included in the PATH), fallback to # is used ($CARGO_HOME/bin is most likely not included in the PATH), fallback to
# /usr/local/bin or $install_action_dir/bin. # /usr/local/bin or $install_action_dir/bin.
if [[ ! -e "${cargo_bin}" ]] || [[ "$(type -P cargo || true)" != "${cargo_bin}/cargo"* ]]; then if [[ "${host_os}" == "windows" ]]; then
if type -P cargo &>/dev/null; then
info "cargo is located at $(type -P cargo)"
cargo_bin=$(dirname "$(type -P cargo)")
else
cargo_bin="${install_action_dir}/bin"
fi
elif [[ ! -e "${cargo_bin}" ]] || [[ "$(type -P cargo || true)" != "${cargo_bin}/cargo"* ]]; then
if type -P cargo &>/dev/null; then if type -P cargo &>/dev/null; then
info "cargo is located at $(type -P cargo)" info "cargo is located at $(type -P cargo)"
fi fi
if [[ "${host_os}" == "windows" ]] || [[ ! -e /usr/local/bin ]]; then if [[ ! -e /usr/local/bin ]]; then
cargo_bin="${install_action_dir}/bin" cargo_bin="${install_action_dir}/bin"
else else
cargo_bin=/usr/local/bin cargo_bin=/usr/local/bin
@@ -808,7 +820,7 @@ if [[ ${#unsupported_tools[@]} -gt 0 ]]; then
# min tls version to be 1.2 # min tls version to be 1.2
cargo-binstall binstall --force --no-confirm --locked "${unsupported_tools[@]}" cargo-binstall binstall --force --no-confirm --locked "${unsupported_tools[@]}"
if ! type -P cargo >/dev/null; then if ! type -P cargo >/dev/null; then
_bin_dir=$(canonicalize_windows_path "${HOME}/.cargo/bin") _bin_dir=$(canonicalize_windows_path "${home}/.cargo/bin")
# TODO: avoid this when already added # TODO: avoid this when already added
info "adding '${_bin_dir}' to PATH" info "adding '${_bin_dir}' to PATH"
echo "${_bin_dir}" >>"${GITHUB_PATH}" echo "${_bin_dir}" >>"${GITHUB_PATH}"

View File

@@ -21,6 +21,11 @@
"1.4": { "1.4": {
"version": "1.4.2" "version": "1.4.2"
}, },
"1.4.4": {
"x86_64_windows": {
"checksum": "ff9b7a4d56a89451e8e0ae40716d47534fb08c5723a08fd560a66227b49e2694"
}
},
"1.4.3": { "1.4.3": {
"x86_64_windows": { "x86_64_windows": {
"checksum": "408ffb657c99bf4142521632306edc4ed130dd991a0cd4b62cf370c28b307daf" "checksum": "408ffb657c99bf4142521632306edc4ed130dd991a0cd4b62cf370c28b307daf"

21
manifests/earthly.json generated
View File

@@ -19,10 +19,27 @@
}, },
"license_markdown": "[MPL-2.0](https://github.com/earthly/earthly/blob/main/LICENSE)", "license_markdown": "[MPL-2.0](https://github.com/earthly/earthly/blob/main/LICENSE)",
"latest": { "latest": {
"version": "0.8.13" "version": "0.8.14"
}, },
"0.8": { "0.8": {
"version": "0.8.13" "version": "0.8.14"
},
"0.8.14": {
"x86_64_linux_gnu": {
"checksum": "9c184536faccf2e16e92ad06d2a2579e4b3ff6aaf6bf4c2f72b21228a6903bc2"
},
"x86_64_macos": {
"checksum": "09d749a4f5b9d71acb803ba229086b28f447ac2080492106f6f51536a64a0760"
},
"x86_64_windows": {
"checksum": "3244284dc9648d7cd3af350ab4a8bfd4c63b0e0e16e656c3e249fc1d58fe7e5f"
},
"aarch64_linux_gnu": {
"checksum": "a88786778964eb74b6b5db44734a4630dcedab49c4ed21fe432e9e6d08ff116c"
},
"aarch64_macos": {
"checksum": "0a0154bb94ef4c8692737156a74534d369947be1a4558e81603be3d2b4328d7b"
}
}, },
"0.8.13": { "0.8.13": {
"x86_64_linux_gnu": { "x86_64_linux_gnu": {

20
manifests/typos.json generated
View File

@@ -16,13 +16,27 @@
}, },
"license_markdown": "[MIT](https://github.com/crate-ci/typos/blob/master/LICENSE-MIT) OR [Apache-2.0](https://github.com/crate-ci/typos/blob/master/LICENSE-APACHE)", "license_markdown": "[MIT](https://github.com/crate-ci/typos/blob/master/LICENSE-MIT) OR [Apache-2.0](https://github.com/crate-ci/typos/blob/master/LICENSE-APACHE)",
"latest": { "latest": {
"version": "1.22.3" "version": "1.22.4"
}, },
"1": { "1": {
"version": "1.22.3" "version": "1.22.4"
}, },
"1.22": { "1.22": {
"version": "1.22.3" "version": "1.22.4"
},
"1.22.4": {
"x86_64_linux_musl": {
"checksum": "aa4be101267b74c7ba0a8d506362c8b5ed75351afe35c86e2de3b2dfad1092b7"
},
"x86_64_macos": {
"checksum": "3761bc4c3bbc0367fbb691e600d09f92a2b641f98158b13c78b469c36afa6a67"
},
"x86_64_windows": {
"checksum": "94473d6765f59ea970deb2377e5a42c6d4bf7a37441fab52a2a6eb1ee6d49f77"
},
"aarch64_macos": {
"checksum": "5328764dc79e25e65615698236ff8842bb4a1bfd95e2d4e84171d7df5b216489"
}
}, },
"1.22.3": { "1.22.3": {
"x86_64_linux_musl": { "x86_64_linux_musl": {

View File

@@ -2,7 +2,7 @@
"repository": "https://github.com/orium/cargo-rdme", "repository": "https://github.com/orium/cargo-rdme",
"tag_prefix": "v", "tag_prefix": "v",
"rust_crate": "${package}", "rust_crate": "${package}",
"broken": ["1.4.3"], "broken": ["1.4.3", "1.4.4"],
"platform": { "platform": {
"x86_64_linux_musl": { "x86_64_linux_musl": {
"asset_name": "${package}_v${version}_${rust_target}.tar.bz2" "asset_name": "${package}_v${version}_${rust_target}.tar.bz2"