Skip to content

Commit 66955cc

Browse files
committed
Minor CI clarifications
- In the Cygwin CI workflow, move `runs-on` below `strategy`, for greater consistency with other workflows. - In the Cygwin CI jobs, use `pwsh` rather than `bash` for the `git config` command run outside of Cygwin, since `pwsh` is the default shell for such commands, it's the shell the Cygwin setup action uses, and it avoids creating the wrong impression that `bash` is needed. - Use "virtual environment" instead of "virtualenv" in some step names to avoid possible confusion with the `virtualenv` pacakge. - Remove comments in the PyPA package upgrade steps, which are more self-documenting since 727f4e9 (#2043).
1 parent d885bea commit 66955cc

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/alpine-test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,12 @@ jobs:
4747
# and cause subsequent tests to fail
4848
cat test/fixtures/.gitconfig >> ~/.gitconfig
4949
50-
- name: Set up virtualenv
50+
- name: Set up virtual environment
5151
run: |
5252
python -m venv .venv
5353
5454
- name: Update PyPA packages
5555
run: |
56-
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
5756
. .venv/bin/activate
5857
python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel
5958

.github/workflows/cygwin-test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ permissions:
77

88
jobs:
99
test:
10-
runs-on: windows-latest
11-
1210
strategy:
1311
matrix:
1412
selection: [fast, perf]
@@ -20,6 +18,8 @@ jobs:
2018

2119
fail-fast: false
2220

21+
runs-on: windows-latest
22+
2323
env:
2424
CHERE_INVOKING: "1"
2525
CYGWIN_NOWINPATH: "1"
@@ -32,7 +32,7 @@ jobs:
3232
- name: Force LF line endings
3333
run: |
3434
git config --global core.autocrlf false # Affects the non-Cygwin git.
35-
shell: bash # Use Git Bash instead of Cygwin Bash for this step.
35+
shell: pwsh # Do this outside Cygwin, to affect actions/checkout.
3636

3737
- uses: actions/checkout@v4
3838
with:
@@ -67,7 +67,7 @@ jobs:
6767
# and cause subsequent tests to fail
6868
cat test/fixtures/.gitconfig >> ~/.gitconfig
6969
70-
- name: Set up virtualenv
70+
- name: Set up virtual environment
7171
run: |
7272
python3.9 -m venv --without-pip .venv
7373
echo 'BASH_ENV=.venv/bin/activate' >>"$GITHUB_ENV"
@@ -78,7 +78,6 @@ jobs:
7878
7979
- name: Update PyPA packages
8080
run: |
81-
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
8281
python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel
8382
8483
- name: Install project and test dependencies

.github/workflows/pythonpackage.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ jobs:
7171
7272
- name: Update PyPA packages
7373
run: |
74-
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
7574
python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel
7675
7776
- name: Install project and test dependencies

0 commit comments

Comments
 (0)