aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-01-25 02:52:55 -0500
committerEli Schwartz <eschwartz@archlinux.org>2022-01-25 02:52:55 -0500
commit5c92555c40db74d48674d8a22d5e1c3171500910 (patch)
treeb97c1385e726c6f1f36812e7cd25ae68c1990bdd
parentdafc2cdb6bc17df80b2e6fbe64c1ddf80a76ed2e (diff)
downloadmeson-5c92555c40db74d48674d8a22d5e1c3171500910.zip
meson-5c92555c40db74d48674d8a22d5e1c3171500910.tar.gz
meson-5c92555c40db74d48674d8a22d5e1c3171500910.tar.bz2
cygwin: fix python versions again
Now cygwin seems to have completed a migration of the default python to 3.9, so that is where the devel package is at. Back out the changes from commit 3304a38496a52052ae9d58ed2459c7deb18ca703 and update the pip/wheel packages as appropriate.
-rw-r--r--.github/workflows/cygwin.yml11
1 files changed, 2 insertions, 9 deletions
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index e5a1bd5..da048b2 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -66,18 +66,11 @@ jobs:
python3-devel
python3-libxml2
python3-libxslt
- python38-pip
- python38-wheel
+ python39-pip
+ python39-wheel
vala
zlib-devel
- - name: workaround wrong python version
- run: |
- export PATH=/usr/sbin:/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
- update-alternatives --verbose --set python /usr/bin/python3.8
- update-alternatives --verbose --set python3 /usr/bin/python3.8
- shell: C:\cygwin\bin\bash.exe --noprofile --norc -o igncr -eo pipefail '{0}'
-
- name: Run pip
run: |
export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32