Workaround Cygwin bash's buggy behavior

This commit is contained in:
Taiki Endo
2024-06-12 01:48:03 +09:00
parent 01c63d291f
commit e626313db4
4 changed files with 25 additions and 3 deletions

View File

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

View File

@@ -56,6 +56,8 @@ jobs:
# https://github.com/taiki-e/install-action/pull/518#issuecomment-2160736760 # https://github.com/taiki-e/install-action/pull/518#issuecomment-2160736760
- os: windows-2022 - os: windows-2022
bash: msys64 bash: msys64
- os: windows-2022
bash: cygwin
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
timeout-minutes: 60 timeout-minutes: 60
steps: steps:
@@ -70,6 +72,13 @@ jobs:
echo "C:\msys64\mingw32\bin" >> $GITHUB_PATH echo "C:\msys64\mingw32\bin" >> $GITHUB_PATH
echo "C:\msys64\usr\bin" >> $GITHUB_PATH echo "C:\msys64\usr\bin" >> $GITHUB_PATH
if: matrix.bash == 'msys64' 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: ./ - uses: ./
with: with:
tool: ${{ steps.tool-list.outputs.tool }} tool: ${{ steps.tool-list.outputs.tool }}
@@ -100,6 +109,7 @@ jobs:
if [[ "$(cargo binstall -V)" != "$(jq -r '.latest.version' manifests/cargo-binstall.json)" ]]; then if [[ "$(cargo binstall -V)" != "$(jq -r '.latest.version' manifests/cargo-binstall.json)" ]]; then
exit 1 exit 1
fi fi
if: matrix.bash != 'cygwin'
test-container: test-container:
strategy: strategy:

View File

@@ -10,9 +10,16 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
## [Unreleased] ## [Unreleased]
- 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 ## [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: This fixes an installation issue when default bash was overridden like the following:
```sh ```sh

View File

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