CI: Only pin Python version on x64 macOS and Windows

See commit 18be09f
This commit is contained in:
Lovell Fuller 2022-11-03 14:49:12 +00:00
parent 18be09f1d7
commit 12f472126d
2 changed files with 9 additions and 12 deletions

View File

@ -22,10 +22,6 @@ jobs:
run: run:
shell: /usr/bin/arch -arch arm64e /bin/bash -l {0} shell: /usr/bin/arch -arch arm64e /bin/bash -l {0}
steps: steps:
- name: Dependencies (Python 3.10)
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Dependencies (Node.js) - name: Dependencies (Node.js)
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:

View File

@ -62,27 +62,28 @@ jobs:
nodejs_version: 18 nodejs_version: 18
nodejs_arch: x64 nodejs_arch: x64
steps: steps:
- name: Dependencies (Python 3.10)
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Dependencies (Linux glibc) - name: Dependencies (Linux glibc)
if: contains(matrix.container, 'centos') if: contains(matrix.container, 'centos')
run: | run: |
curl -sL https://rpm.nodesource.com/setup_${{ matrix.nodejs_version }}.x | bash - curl -sL https://rpm.nodesource.com/setup_${{ matrix.nodejs_version }}.x | bash -
yum install -y centos-release-scl yum install -y centos-release-scl
yum install -y devtoolset-11-gcc-c++ make git nodejs fontconfig google-noto-sans-fonts yum install -y devtoolset-11-gcc-c++ make git python3 nodejs fontconfig google-noto-sans-fonts
echo "/opt/rh/devtoolset-11/root/usr/bin" >> $GITHUB_PATH echo "/opt/rh/devtoolset-11/root/usr/bin" >> $GITHUB_PATH
- name: Dependencies (Rocky Linux glibc) - name: Dependencies (Rocky Linux glibc)
if: contains(matrix.container, 'rockylinux') if: contains(matrix.container, 'rockylinux')
run: | run: |
curl -sL https://rpm.nodesource.com/setup_${{ matrix.nodejs_version }}.x | bash - curl -sL https://rpm.nodesource.com/setup_${{ matrix.nodejs_version }}.x | bash -
dnf install -y gcc-toolset-11-gcc-c++ make git nodejs fontconfig google-noto-sans-fonts dnf install -y gcc-toolset-11-gcc-c++ make git python3 nodejs fontconfig google-noto-sans-fonts
echo "/opt/rh/gcc-toolset-11/root/usr/bin" >> $GITHUB_PATH echo "/opt/rh/gcc-toolset-11/root/usr/bin" >> $GITHUB_PATH
- name: Dependencies (Linux musl) - name: Dependencies (Linux musl)
if: contains(matrix.container, 'alpine') if: contains(matrix.container, 'alpine')
run: apk add build-base git font-noto --update-cache run: apk add build-base git python3 font-noto --update-cache
- name: Dependencies (macOS, Windows) - name: Dependencies (Python 3.10 - macOS, Windows)
if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows')
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Dependencies (Node.js - macOS, Windows)
if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows') if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows')
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with: