Compare commits

...

6 Commits

Author SHA1 Message Date
Taiki Endo
309ee82715 Release 2.38.5 2024-06-13 09:43:25 +09:00
Taiki Endo
d5ce3a6de4 Update typos@latest to 1.22.7 2024-06-13 03:58:19 +09:00
Taiki Endo
9531aeedc3 Update espup@latest to 0.12.0 2024-06-13 03:58:19 +09:00
Taiki Endo
07a34f8347 Release 2.38.4 2024-06-12 02:16:44 +09:00
Taiki Endo
e626313db4 Workaround Cygwin bash's buggy behavior 2024-06-12 02:15:37 +09:00
Taiki Endo
01c63d291f Improve diagnostics for non-default bash on Windows 2024-06-12 00:58:48 +09:00
6 changed files with 112 additions and 46 deletions

View File

@@ -2,8 +2,10 @@ almalinux
archlinux
bindgen
binstall
choco
coreutils
cyclonedx
cygdrive
deepsource
distro
doas
@@ -23,6 +25,7 @@ pwsh
quickinstall
rclone
rdme
requirechecksums
sccache
syft
udeps

View File

@@ -53,6 +53,11 @@ jobs:
- os: macos-14
- os: windows-2019
- os: windows-2022
# https://github.com/taiki-e/install-action/pull/518#issuecomment-2160736760
- os: windows-2022
bash: msys64
- os: windows-2022
bash: cygwin
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
@@ -62,6 +67,18 @@ jobs:
- name: Generate tool list
id: tool-list
run: tools/ci/tool-list.sh "${{ matrix.tool }}" >>"${GITHUB_OUTPUT}"
- run: |
set -eEuxo pipefail
echo "C:\msys64\mingw32\bin" >> $GITHUB_PATH
echo "C:\msys64\usr\bin" >> $GITHUB_PATH
if: matrix.bash == 'msys64'
- run: |
set -eEuxo pipefail
choco install --no-progress --requirechecksums cygwin
echo "C:\tools\cygwin\bin" >> $GITHUB_PATH
echo "C:\tools\cygwin\usr\bin" >> $GITHUB_PATH
if: matrix.bash == 'cygwin'
- run: env
- uses: ./
with:
tool: ${{ steps.tool-list.outputs.tool }}
@@ -92,43 +109,7 @@ jobs:
if [[ "$(cargo binstall -V)" != "$(jq -r '.latest.version' manifests/cargo-binstall.json)" ]]; then
exit 1
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
if: matrix.bash != 'cygwin'
test-container:
strategy:

View File

@@ -10,9 +10,24 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
## [Unreleased]
## [2.38.5] - 2024-06-13
- Update `typos@latest` to 1.22.7.
- Update `espup@latest` to 0.12.0.
## [2.38.4] - 2024-06-11
- Workaround Cygwin bash's buggy behavior. ([#534](https://github.com/taiki-e/install-action/pull/534))
This fixes an installation issue when default bash was overridden like the following:
```sh
echo "C:\tools\cygwin\bin" >> $GITHUB_PATH
```
## [2.38.3] - 2024-06-11
- Workaround msys64 bash's buggy behavior. ([#533](https://github.com/taiki-e/install-action/pull/533))
- 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
@@ -2309,7 +2324,9 @@ Note: This release is considered a breaking change because installing on version
Initial release
[Unreleased]: https://github.com/taiki-e/install-action/compare/v2.38.3...HEAD
[Unreleased]: https://github.com/taiki-e/install-action/compare/v2.38.5...HEAD
[2.38.5]: https://github.com/taiki-e/install-action/compare/v2.38.4...v2.38.5
[2.38.4]: https://github.com/taiki-e/install-action/compare/v2.38.3...v2.38.4
[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.1]: https://github.com/taiki-e/install-action/compare/v2.38.0...v2.38.1

15
main.sh
View File

@@ -400,7 +400,7 @@ init_install_action_bin_dir() {
}
canonicalize_windows_path() {
case "${host_os}" in
windows) sed <<<"$1" 's/^\/c\//C:\\/; s/\//\\/g' ;;
windows) sed <<<"$1" 's/^\/cygdrive\//\//; s/^\/c\//C:\\/; s/\//\\/g' ;;
*) echo "$1" ;;
esac
}
@@ -517,8 +517,17 @@ info "host platform: ${host_arch}_${host_os}"
home="${HOME}"
if [[ "${host_os}" == "windows" ]]; then
# https://github.com/taiki-e/install-action/pull/518#issuecomment-2160736760
home="${home/\/home\//\/c\/Users\/}"
if [[ "${home}" == "/home/"* ]]; then
if [[ -d "${home/\/home\//\/c\/Users\/}" ]]; then
# MSYS2 https://github.com/taiki-e/install-action/pull/518#issuecomment-2160736760
home="${home/\/home\//\/c\/Users\/}"
elif [[ -d "${home/\/home\//\/cygdrive\/c\/Users\/}" ]]; then
# Cygwin https://github.com/taiki-e/install-action/issues/224#issuecomment-1720196288
home="${home/\/home\//\/cygdrive\/c\/Users\/}"
else
warn "\$HOME starting /home/ (${home}) on Windows bash is usually fake path, this may cause installation issue"
fi
fi
fi
install_action_dir="${home}/.install-action"
tmp_dir="${install_action_dir}/tmp"

22
manifests/espup.json generated
View File

@@ -19,7 +19,27 @@
},
"license_markdown": "[MIT](https://github.com/esp-rs/espup/blob/main/LICENSE-MIT) OR [Apache-2.0](https://github.com/esp-rs/espup/blob/main/LICENSE-APACHE)",
"latest": {
"version": "0.11.0"
"version": "0.12.0"
},
"0.12": {
"version": "0.12.0"
},
"0.12.0": {
"x86_64_linux_gnu": {
"checksum": "2c89370a2cf2eaf2d300439d5f15fa89ae71d635b027965b1325effc8d84b383"
},
"x86_64_macos": {
"checksum": "00867da14720005dc0ef174e93164ca2934126840be7ddb7a9eaa2c17e940555"
},
"x86_64_windows": {
"checksum": "a7d128180d30e1d351c63a02436de8a75a8b90479fb49ce23b4eaadf03e637d1"
},
"aarch64_linux_gnu": {
"checksum": "b7259c225ad713f94b73e4f86f7daf37e7c02ba959b00a3f2f8327fbab639247"
},
"aarch64_macos": {
"checksum": "a91717477c816bc10b75a250a3d415ee1eea329dcc9a8bddb70d73bc4ebc521e"
}
},
"0.11": {
"version": "0.11.0"

42
manifests/typos.json generated
View File

@@ -16,13 +16,49 @@
},
"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": {
"version": "1.22.4"
"version": "1.22.7"
},
"1": {
"version": "1.22.4"
"version": "1.22.7"
},
"1.22": {
"version": "1.22.4"
"version": "1.22.7"
},
"1.22.7": {
"x86_64_linux_musl": {
"checksum": "a706a74f970f660e8aa24c6b3a46b8e213974d4317dc163b03d5e05c20e561a8"
},
"x86_64_macos": {
"checksum": "28f40f958f37cab2b24308142f404dba22d0e18757b511e0a16100fb4fd41547"
},
"x86_64_windows": {
"checksum": "912951a701c2c55dac499f908775126735aa2b59b41c488da18093e2b2d3aa69"
},
"aarch64_macos": {
"checksum": "c5857dec27e38ed996e76b2d8c4545006905ea750ab015ab72bd66cadb00b376"
}
},
"1.22.6": {
"x86_64_macos": {
"checksum": "ba16199129ddd81e1c720d39fb35c41369a9c78c15b2e39126e8b02e875e11f7"
},
"x86_64_windows": {
"checksum": "aae44abc76ba77556cfc7d576ced87a716f420b09fa357cebbdf0a9a040a2492"
},
"aarch64_macos": {
"checksum": "31a335e695fc9749ddd95bc9154616ccb07c94df77bcc9156acc41d258219f64"
}
},
"1.22.5": {
"x86_64_macos": {
"checksum": "1023d1323b98103d45ffd293515a2515c14493c57c5035c76106ec344aab6a4b"
},
"x86_64_windows": {
"checksum": "b727570571472fbab9029d4bcc09a1cbcafece02907fa7a25a46d6feb426bb5a"
},
"aarch64_macos": {
"checksum": "96024e189bce99b25bbc2a4165a76832637c231f1163d57581a080bbb5bfbd22"
}
},
"1.22.4": {
"x86_64_linux_musl": {