Skip to content

Commit b3b0773

Browse files
authored
CI runners clean-up (#104)
* macOS 10.15 runner removed (was removed from GHA long ago) * Remove Python 2.7 on macOS and Windows (no longer supported) * Add RockyLinux to GHA CI * GHA: use older 3.6 on Windows with mingw53
1 parent ea27670 commit b3b0773

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

.github/workflows/build.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,29 @@ jobs:
8282
name: wrappers_ubuntu_22_04
8383
path: generated_cpp
8484

85-
centos:
85+
oldschool:
8686
strategy:
8787
fail-fast: false
8888
matrix:
89-
container:
90-
- 'centos:7'
89+
container_os: ['centos']
90+
container_os_version: ['7']
91+
container_os_python_package: ['python-debug']
9192
configuration: ['debug', 'release']
93+
include:
94+
- container_os: 'rockylinux'
95+
container_os_version: '9'
96+
container_os_python_package: 'python3-devel'
97+
configuration: 'release'
9298
runs-on: ubuntu-latest
93-
container: ${{ matrix.container }}
99+
container: '${{ matrix.container_os }}:${{ matrix.container_os_version }}'
94100
steps:
95101
- name: Install Qt
96102
run: |
97103
yum update -y
98104
yum groupinstall "Development Tools" -y
99105
yum install -y \
100106
which \
101-
python-debug \
107+
${{ matrix.container_os_python_package }} \
102108
qt5-qtbase-* \
103109
qt5-qttools* \
104110
qt5-qtsvg \
@@ -114,40 +120,37 @@ jobs:
114120
run: |
115121
export QT_SELECT=qt5
116122
echo ======= SYSTEM INFO ========
117-
uname -a; gcc --version | grep "gcc"; python --version; qmake-qt5 --version
123+
which python 2>/dev/null && export PYTHON_VERSION_SUFFIX= || export PYTHON_VERSION_SUFFIX=3
124+
uname -a; gcc --version | grep "gcc"; python${PYTHON_VERSION_SUFFIX} --version; qmake-qt5 --version
118125
echo ============================
119126
qmake-qt5 -r PythonQt.pro CONFIG+=${{ matrix.configuration }} \
120-
PYTHON_VERSION=$(python --version | cut -d " " -f 2 | cut -d "." -f1,2) \
121-
PYTHON_DIR=$(which python | xargs dirname | xargs dirname)
127+
PYTHON_VERSION=$(python${PYTHON_VERSION_SUFFIX} --version | cut -d " " -f 2 | cut -d "." -f1,2) \
128+
PYTHON_DIR=$(which python${PYTHON_VERSION_SUFFIX} | xargs dirname | xargs dirname)
122129
make -j 2 && make check TESTARGS="-platform offscreen"
123-
130+
124131
- name: Generate Wrappers
125132
run: |
126133
# workaround to allow to find the Qt include dirs for installed standard qt packages
127134
mkdir /usr/include/qt5ln; ln -s /usr/include/qt5 /usr/include/qt5ln/include
128135
export QTDIR=/usr/include/qt5ln
129136
cd generator
130137
./pythonqt_generator
131-
138+
132139
- name: Upload Wrappers
133140
uses: actions/upload-artifact@v3
134141
with:
135-
name: wrappers_centos7
142+
name: wrappers_${{ matrix.container_os }}-${{ matrix.container_os_version }}_${{ matrix.configuration }}
136143
path: generated_cpp
137144

138145
macOS:
139146
strategy:
140147
fail-fast: false
141148
matrix:
142-
macos-version: ['10.15']
143-
python-version: ['2.7']
149+
macos-version: ['11']
150+
python-version: ['3.6']
144151
qt-version: ['5.9.*']
145152
configuration: ['release','debug']
146153
include:
147-
- macos-version: '11'
148-
python-version: '3.6'
149-
qt-version: '5.11.*'
150-
configuration: 'release'
151154
- macos-version: '12'
152155
python-version: '3.11'
153156
qt-version: '5.12.*'
@@ -241,7 +244,7 @@ jobs:
241244
# msvc-toolset: '14.16'
242245

243246
- qt-arch: 'win32_mingw53'
244-
python-version: '2.7'
247+
python-version: '3.6'
245248
python-arch: 'x86'
246249
qt-version: '5.11.*'
247250

0 commit comments

Comments
 (0)