Commit 5f128e8

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 5f128e8Copy full SHA for 5f128e8

File tree

2 files changed

-18

lines changed

.github/workflows
- cygwin-test.yml
- pythonpackage.yml

2 files changed

-18

lines changed

`‎.github/workflows/cygwin-test.yml‎`

Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ jobs:`
`14`	`14`	`TEMP: "/tmp"`
`15`	`15`	`defaults:`
`16`	`16`	`run:`
`17`		`- shell: bash.exe -eo pipefail -o igncr "{0}"`
	`17`	`+ shell: bash.exe --noprofile --norc -exo pipefail -o igncr "{0}"`
`18`	`18`
`19`	`19`	`steps:`
`20`	`20`	`- name: Force LF line endings`
`@@ -31,23 +31,19 @@ jobs:`
`31`	`31`
`32`	`32`	`- name: Show python and git versions`
`33`	`33`	`run: \|`
`34`		`- set -x`
`35`	`34`	`/usr/bin/python --version`
`36`	`35`	`/usr/bin/git version`
`37`	`36`
`38`	`37`	`- name: Tell git to trust this repo`
`39`	`38`	`run: \|`
`40`		`- /usr/bin/git config --global --add safe.directory "$(pwd)"`
	`39`	`+ /usr/bin/git config --global --add safe.directory "$(pwd)"`
`41`	`40`
`42`	`41`	`- name: Prepare this repo for tests`
`43`	`42`	`run: \|`
`44`		`- set -x`
`45`	`43`	`TRAVIS=yes ./init-tests-after-clone.sh`
`46`	`44`
`47`	`45`	`- name: Further prepare git configuration for tests`
`48`	`46`	`run: \|`
`49`		`- set -x`
`50`		`-`
`51`	`47`	`/usr/bin/git config --global user.email "travis@ci.com"`
`52`	`48`	`/usr/bin/git config --global user.name "Travis Runner"`
`53`	`49`	`# If we rewrite the user's config by accident, we will mess it up`
`@@ -56,14 +52,13 @@ jobs:`
`56`	`52`
`57`	`53`	`- name: Update PyPA packages`
`58`	`54`	`run: \|`
`59`		`- set -x`
`60`	`55`	`/usr/bin/python -m pip install --upgrade pip setuptools wheel`
`61`	`56`
`62`	`57`	`- name: Install project and test dependencies`
`63`	`58`	`run: \|`
`64`		`- set -x`
`65`	`59`	`/usr/bin/python -m pip install ".[test]"`
`66`	`60`
`67`	`61`	`- name: Test with pytest`
`68`	`62`	`run: \|`
	`63`	`+ set +x`
`69`	`64`	`/usr/bin/python -m pytest`

`‎.github/workflows/pythonpackage.yml‎`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ jobs:`
`20`	`20`	`- experimental: false`
`21`	`21`	`- python-version: "3.12"`
`22`	`22`	`experimental: true`
	`23`	`+ defaults:`
	`24`	`+ run:`
	`25`	`+ shell: /bin/bash --noprofile --norc -exo pipefail {0}`
`23`	`26`
`24`	`27`	`steps:`
`25`	`28`	`- uses: actions/checkout@v4`
`@@ -35,19 +38,15 @@ jobs:`
`35`	`38`
`36`	`39`	`- name: Show python and git versions`
`37`	`40`	`run: \|`
`38`		`- set -x`
`39`	`41`	`python --version`
`40`	`42`	`git version`
`41`	`43`
`42`	`44`	`- name: Prepare this repo for tests`
`43`	`45`	`run: \|`
`44`		`- set -x`
`45`	`46`	`TRAVIS=yes ./init-tests-after-clone.sh`
`46`	`47`
`47`	`48`	`- name: Prepare git configuration for tests`
`48`	`49`	`run: \|`
`49`		`- set -x`
`50`		`-`
`51`	`50`	`git config --global user.email "travis@ci.com"`
`52`	`51`	`git config --global user.name "Travis Runner"`
`53`	`52`	`# If we rewrite the user's config by accident, we will mess it up`
`@@ -56,8 +55,6 @@ jobs:`
`56`	`55`
`57`	`56`	`- name: Update PyPA packages`
`58`	`57`	`run: \|`
`59`		`- set -x`
`60`		`-`
`61`	`58`	`python -m pip install --upgrade pip`
`62`	`59`	`if pip freeze --all \| grep --quiet '^setuptools=='; then`
`63`	`60`	`# Python prior to 3.12 ships setuptools. Upgrade it if present.`
`@@ -67,25 +64,21 @@ jobs:`
`67`	`64`
`68`	`65`	`- name: Install project and test dependencies`
`69`	`66`	`run: \|`
`70`		`- set -x`
`71`	`67`	`pip install ".[test]"`
`72`	`68`
`73`	`69`	`- name: Check types with mypy`
`74`	`70`	`run: \|`
`75`		`- set -x`
`76`	`71`	`mypy -p git`
`77`	`72`	`# With new versions of mypy new issues might arise. This is a problem if there is nobody able to fix them,`
`78`	`73`	`# so we have to ignore errors until that changes.`
`79`	`74`	`continue-on-error: true`
`80`	`75`
`81`	`76`	`- name: Test with pytest`
`82`	`77`	`run: \|`
`83`		`- set -x`
`84`	`78`	`pytest`
`85`	`79`	`continue-on-error: false`
`86`	`80`
`87`	`81`	`- name: Documentation`
`88`	`82`	`run: \|`
`89`		`- set -x`
`90`	`83`	`pip install -r doc/requirements.txt`
`91`	`84`	`make -C doc html`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 5f128e8

File tree

2 files changed

2 files changed

`‎.github/workflows/cygwin-test.yml‎`

`‎.github/workflows/pythonpackage.yml‎`

0 commit comments