Skip to content

Commit 3276aac

Browse files
committed
Use Cygwin's bash and git for more CI steps
1 parent ceb4dd3 commit 3276aac

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

Diff for: .github/workflows/cygwin-test.yml

+20-14
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ jobs:
1414
TEMP: "/tmp"
1515
defaults:
1616
run:
17-
shell: bash.exe --noprofile --norc -exo pipefail -o igncr "{0}"
17+
shell: C:\cygwin\bin\bash.exe --noprofile --norc -exo pipefail -o igncr "{0}"
1818

1919
steps:
2020
- name: Force LF line endings
21-
run: git config --global core.autocrlf input
21+
run: |
22+
git config --global core.autocrlf input
23+
shell: bash
2224

2325
- uses: actions/checkout@v4
2426
with:
@@ -29,40 +31,44 @@ jobs:
2931
with:
3032
packages: python39 python39-pip python39-virtualenv git
3133

34+
- name: Limit $PATH to Cygwin
35+
run: echo 'C:\cygwin\bin' >"$GITHUB_PATH"
36+
3237
- name: Tell git to trust this repo
3338
run: |
34-
/usr/bin/git config --global --add safe.directory "$(pwd)"
39+
git config --global --add safe.directory "$(pwd)"
3540
3641
- name: Prepare this repo for tests
3742
run: |
3843
TRAVIS=yes ./init-tests-after-clone.sh
3944
4045
- name: Further prepare git configuration for tests
4146
run: |
42-
/usr/bin/git config --global user.email "[email protected]"
43-
/usr/bin/git config --global user.name "Travis Runner"
47+
git config --global user.email "[email protected]"
48+
git config --global user.name "Travis Runner"
4449
# If we rewrite the user's config by accident, we will mess it up
4550
# and cause subsequent tests to fail
4651
cat test/fixtures/.gitconfig >> ~/.gitconfig
4752
4853
- name: Update PyPA packages
4954
run: |
50-
/usr/bin/python -m pip install --upgrade pip setuptools wheel
55+
python -m pip install --upgrade pip setuptools wheel
5156
5257
- name: Install project and test dependencies
5358
run: |
54-
/usr/bin/python -m pip install ".[test]"
59+
python -m pip install ".[test]"
5560
5661
- name: Show version and platform information
5762
run: |
58-
/usr/bin/uname -a
59-
/usr/bin/git version
60-
/usr/bin/python --version
61-
/usr/bin/python -c 'import sys; print(sys.platform)'
62-
/usr/bin/python -c 'import os; print(os.name)'
63-
/usr/bin/python -c 'import git; print(git.compat.is_win)'
63+
uname -a
64+
command -v git python
65+
git version
66+
python --version
67+
python -c 'import sys; print(sys.platform)'
68+
python -c 'import os; print(os.name)'
69+
python -c 'import git; print(git.compat.is_win)'
6470
6571
- name: Test with pytest
6672
run: |
6773
set +x
68-
/usr/bin/python -m pytest --color=yes -p no:sugar --instafail -vv
74+
python -m pytest --color=yes -p no:sugar --instafail -vv

Diff for: .github/workflows/pythonpackage.yml

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ jobs:
6464
- name: Show version and platform information
6565
run: |
6666
uname -a
67+
command -v git python
6768
git version
6869
python --version
6970
python -c 'import sys; print(sys.platform)'

0 commit comments

Comments
 (0)