Skip to content

Commit f623c57

Browse files
committed
Add a test of work-vol option
Also, disable fail-fast in all test matricies.
1 parent d3a7464 commit f623c57

File tree

1 file changed

+49
-5
lines changed

1 file changed

+49
-5
lines changed

Diff for: .github/workflows/test.yml

+49-5
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,26 @@ jobs:
3434
add-to-path: false
3535

3636
- name: Explicitly running shell
37-
run: C:\cygwin\bin\bash -lc "echo 'Explicitly run shell'"
37+
run: D:\cygwin\bin\bash -lc "echo 'Explicitly run shell'"
38+
39+
- name: Explicitly running shell via compat symlink
40+
run: C:\cygwin\bin\bash -lc "echo 'Explicitly run shell (compat)'"
3841

3942
- name: Single-line inline shell
4043
run: echo "Running in $(pwd)"
41-
shell: C:\cygwin\bin\bash.exe '{0}'
44+
shell: D:\cygwin\bin\bash.exe '{0}'
4245

4346
- name: Multiline inline shell
4447
run: >-
4548
echo "Running in $(pwd)" &&
4649
true
47-
shell: C:\cygwin\bin\bash.exe '{0}'
50+
shell: D:\cygwin\bin\bash.exe '{0}'
4851

4952
- name: Shell script
50-
run: C:\cygwin\bin\bash.exe tests/script.sh
53+
run: D:\cygwin\bin\bash.exe tests/script.sh
5154

5255
- name: Check requested packages got installed
53-
run: C:\cygwin\bin\sponge.exe tmp
56+
run: D:\cygwin\bin\sponge.exe tmp
5457
if: contains(matrix.packages, 'moreutils')
5558

5659
- name: Check PATH hasn't changed
@@ -119,6 +122,7 @@ jobs:
119122
include:
120123
- install-dir: C:\tools\cygwin
121124
- install-dir: D:\cygwin64
125+
fail-fast: false
122126

123127
steps:
124128
- run: git config --global core.autocrlf input
@@ -149,6 +153,45 @@ jobs:
149153
env:
150154
SHELLOPTS: igncr
151155

156+
work-vol-test:
157+
runs-on: windows-latest
158+
name: 'Check work volume behaviour'
159+
160+
strategy:
161+
matrix:
162+
include:
163+
- work-vol: 'C:'
164+
- work-vol: 'D:'
165+
fail-fast: false
166+
167+
steps:
168+
- run: git config --global core.autocrlf input
169+
170+
- uses: actions/checkout@v4
171+
172+
- name: Install Cygwin
173+
uses: ./
174+
with:
175+
work-vol: "${{ matrix.work-vol }}"
176+
177+
- name: Check directory use
178+
run: |
179+
root_dir=$(cygpath -aw /)
180+
echo "Installed in ${root_dir}"
181+
if [[ "${root_dir}" != "${{ matrix.work-vol }}\cygwin" ]]; then
182+
exit 1
183+
fi
184+
185+
setup_file=$(cygpath -au ${{ matrix.work-vol }}\setup.exe)
186+
echo "Setup should be stored at ${setup_file}"
187+
if [[ ! -f ${setup_file} ]]; then
188+
exit 1
189+
fi
190+
191+
shell: bash
192+
env:
193+
SHELLOPTS: igncr
194+
152195
symlink-test:
153196
runs-on: windows-latest
154197
name: 'Check symlink type control'
@@ -159,6 +202,7 @@ jobs:
159202
- symlink-type: native
160203
- symlink-type: sys
161204
- symlink-type: wsl
205+
fail-fast: false
162206

163207
env:
164208
CYGWIN: winsymlinks:${{ matrix.symlink-type }}

0 commit comments

Comments
 (0)