Skip to content

Commit 5f128e8

Browse files
committed
Move effect of "set -x" into default shell command
This also adds "--noprofile --norc" to the Cygwin shell command as a speed optimization (bash doesn't need to source its scripts). That only changes the Cygwin workflow; in the Ubuntu workflow, "--noprofile --norc" had already been included by default when no shell was specified, so having it there is to *keep* the optimized behavior that was already in use.
1 parent 4eef3ec commit 5f128e8

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

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

+3-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
TEMP: "/tmp"
1515
defaults:
1616
run:
17-
shell: bash.exe -eo pipefail -o igncr "{0}"
17+
shell: bash.exe --noprofile --norc -exo pipefail -o igncr "{0}"
1818

1919
steps:
2020
- name: Force LF line endings
@@ -31,23 +31,19 @@ jobs:
3131

3232
- name: Show python and git versions
3333
run: |
34-
set -x
3534
/usr/bin/python --version
3635
/usr/bin/git version
3736
3837
- name: Tell git to trust this repo
3938
run: |
40-
/usr/bin/git config --global --add safe.directory "$(pwd)"
39+
/usr/bin/git config --global --add safe.directory "$(pwd)"
4140
4241
- name: Prepare this repo for tests
4342
run: |
44-
set -x
4543
TRAVIS=yes ./init-tests-after-clone.sh
4644
4745
- name: Further prepare git configuration for tests
4846
run: |
49-
set -x
50-
5147
/usr/bin/git config --global user.email "[email protected]"
5248
/usr/bin/git config --global user.name "Travis Runner"
5349
# If we rewrite the user's config by accident, we will mess it up
@@ -56,14 +52,13 @@ jobs:
5652
5753
- name: Update PyPA packages
5854
run: |
59-
set -x
6055
/usr/bin/python -m pip install --upgrade pip setuptools wheel
6156
6257
- name: Install project and test dependencies
6358
run: |
64-
set -x
6559
/usr/bin/python -m pip install ".[test]"
6660
6761
- name: Test with pytest
6862
run: |
63+
set +x
6964
/usr/bin/python -m pytest

Diff for: .github/workflows/pythonpackage.yml

+3-10
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
- experimental: false
2121
- python-version: "3.12"
2222
experimental: true
23+
defaults:
24+
run:
25+
shell: /bin/bash --noprofile --norc -exo pipefail {0}
2326

2427
steps:
2528
- uses: actions/checkout@v4
@@ -35,19 +38,15 @@ jobs:
3538

3639
- name: Show python and git versions
3740
run: |
38-
set -x
3941
python --version
4042
git version
4143
4244
- name: Prepare this repo for tests
4345
run: |
44-
set -x
4546
TRAVIS=yes ./init-tests-after-clone.sh
4647
4748
- name: Prepare git configuration for tests
4849
run: |
49-
set -x
50-
5150
git config --global user.email "[email protected]"
5251
git config --global user.name "Travis Runner"
5352
# If we rewrite the user's config by accident, we will mess it up
@@ -56,8 +55,6 @@ jobs:
5655
5756
- name: Update PyPA packages
5857
run: |
59-
set -x
60-
6158
python -m pip install --upgrade pip
6259
if pip freeze --all | grep --quiet '^setuptools=='; then
6360
# Python prior to 3.12 ships setuptools. Upgrade it if present.
@@ -67,25 +64,21 @@ jobs:
6764
6865
- name: Install project and test dependencies
6966
run: |
70-
set -x
7167
pip install ".[test]"
7268
7369
- name: Check types with mypy
7470
run: |
75-
set -x
7671
mypy -p git
7772
# With new versions of mypy new issues might arise. This is a problem if there is nobody able to fix them,
7873
# so we have to ignore errors until that changes.
7974
continue-on-error: true
8075

8176
- name: Test with pytest
8277
run: |
83-
set -x
8478
pytest
8579
continue-on-error: false
8680

8781
- name: Documentation
8882
run: |
89-
set -x
9083
pip install -r doc/requirements.txt
9184
make -C doc html

0 commit comments

Comments
 (0)