Commit 66955cc
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
3 files changed
Lines changed: 5 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -47,13 +47,12 @@ jobs: | |||
| 47 | 47 | # and cause subsequent tests to fail | |
| 48 | 48 | cat test/fixtures/.gitconfig >> ~/.gitconfig | |
| 49 | 49 | ||
| 50 | - - name: Set up virtualenv | ||
| 50 | + - name: Set up virtual environment | ||
| 51 | 51 | run: | | |
| 52 | 52 | python -m venv .venv | |
| 53 | 53 | ||
| 54 | 54 | - name: Update PyPA packages | |
| 55 | 55 | run: | | |
| 56 | - # Get the latest pip, wheel, and prior to Python 3.12, setuptools. | ||
| 57 | 56 | . .venv/bin/activate | |
| 58 | 57 | python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel | |
| 59 | 58 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,8 +7,6 @@ permissions: | |||
| 7 | 7 | ||
| 8 | 8 | jobs: | |
| 9 | 9 | test: | |
| 10 | - runs-on: windows-latest | ||
| 11 | - | ||
| 12 | 10 | strategy: | |
| 13 | 11 | matrix: | |
| 14 | 12 | selection: [fast, perf] | |
@@ -20,6 +18,8 @@ jobs: | |||
| 20 | 18 | ||
| 21 | 19 | fail-fast: false | |
| 22 | 20 | ||
| 21 | + runs-on: windows-latest | ||
| 22 | + | ||
| 23 | 23 | env: | |
| 24 | 24 | CHERE_INVOKING: "1" | |
| 25 | 25 | CYGWIN_NOWINPATH: "1" | |
@@ -32,7 +32,7 @@ jobs: | |||
| 32 | 32 | - name: Force LF line endings | |
| 33 | 33 | run: | | |
| 34 | 34 | 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. | ||
| 36 | 36 | ||
| 37 | 37 | - uses: actions/checkout@v4 | |
| 38 | 38 | with: | |
@@ -67,7 +67,7 @@ jobs: | |||
| 67 | 67 | # and cause subsequent tests to fail | |
| 68 | 68 | cat test/fixtures/.gitconfig >> ~/.gitconfig | |
| 69 | 69 | ||
| 70 | - - name: Set up virtualenv | ||
| 70 | + - name: Set up virtual environment | ||
| 71 | 71 | run: | | |
| 72 | 72 | python3.9 -m venv --without-pip .venv | |
| 73 | 73 | echo 'BASH_ENV=.venv/bin/activate' >>"$GITHUB_ENV" | |
@@ -78,7 +78,6 @@ jobs: | |||
| 78 | 78 | ||
| 79 | 79 | - name: Update PyPA packages | |
| 80 | 80 | run: | | |
| 81 | - # Get the latest pip, wheel, and prior to Python 3.12, setuptools. | ||
| 82 | 81 | python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel | |
| 83 | 82 | ||
| 84 | 83 | - name: Install project and test dependencies | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -71,7 +71,6 @@ jobs: | |||
| 71 | 71 | ||
| 72 | 72 | - name: Update PyPA packages | |
| 73 | 73 | run: | | |
| 74 | - # Get the latest pip, wheel, and prior to Python 3.12, setuptools. | ||
| 75 | 74 | python -m pip install -U pip 'setuptools; python_version<"3.12"' wheel | |
| 76 | 75 | ||
| 77 | 76 | - name: Install project and test dependencies | |
0 commit comments