Commitfe7533e

authored

Merge pull request#2007 from EliahKagan/cygwin-py39-venv

Work around Cygwin CI failure#2004, except for `test_installation`

2 parents470318f +d597fc9 commitfe7533eCopy full SHA for fe7533e

File tree

+10

-5

lines changed

+10

-5

lines changed

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ jobs:`
`15`	`15`
`16`	`16`	`defaults:`
`17`	`17`	`run:`
`18`		`-shell:C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr "{0}"`
	`18`	`+shell:C:\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr "{0}"`
`19`	`19`
`20`	`20`	`steps:`
`21`	`21`	`-name:Force LF line endings`
`@@ -27,10 +27,11 @@ jobs:`
`27`	`27`	`with:`
`28`	`28`	`fetch-depth:0`
`29`	`29`
`30`		`- -name:Set up Cygwin`
`31`		`-uses:egor-tensin/setup-cygwin@v4`
	`30`	`+ -name:Install Cygwin`
	`31`	`+uses:cygwin/cygwin-install-action@v5`
`32`	`32`	`with:`
`33`		`-packages:python39 python39-pip python39-virtualenv git`
	`33`	`+packages:python39 python39-pip python39-virtualenv git wget`
	`34`	`+add-to-path:false# No need to change $PATH outside the Cygwin environment.`
`34`	`35`
`35`	`36`	`-name:Arrange for verbose output`
`36`	`37`	`run:\|`
`@@ -57,9 +58,13 @@ jobs:`
`57`	`58`
`58`	`59`	`-name:Set up virtualenv`
`59`	`60`	`run:\|`
`60`		`-python -m venv .venv`
	`61`	`+python3.9 -m venv --without-pip .venv`
`61`	`62`	`echo 'BASH_ENV=.venv/bin/activate' >>"$GITHUB_ENV"`
`62`	`63`
	`64`	`+ -name:Bootstrap pip in virtualenv`
	`65`	`+run:\|`
	`66`	`+ wget -qO- https://bootstrap.pypa.io/get-pip.py \| python`
	`67`	`+`
`63`	`68`	`-name:Update PyPA packages`
`64`	`69`	`run:\|`
`65`	`70`	`# Get the latest pip, wheel, and prior to Python 3.12, setuptools.`

Comments

(0)