Skip to content

Commit 640ac41

Browse files
authored
Update GitHub Actions for Ubuntu 24.04 (#465)
1 parent fbf9f3c commit 640ac41

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

.github/workflows/ci.yml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,10 @@ jobs:
88
matrix:
99
build_type: [Release, Debug]
1010
config:
11-
- cc: gcc-9
12-
cxx: g++-9
13-
os: ubuntu-20.04
14-
python2_ver: '2.7'
15-
python3_ver: '3.8'
16-
1711
- cc: gcc-10
1812
cxx: g++-10
19-
os: ubuntu-20.04
20-
python2_ver: '2.7'
21-
python3_ver: '3.8'
13+
os: ubuntu-22.04
14+
python3_ver: '3.10'
2215

2316
- cc: gcc-11
2417
cxx: g++-11
@@ -30,23 +23,20 @@ jobs:
3023
os: ubuntu-22.04
3124
python3_ver: '3.10'
3225

33-
- cc: clang-10
34-
cxx: clang++-10
35-
os: ubuntu-20.04
36-
python2_ver: '2.7'
37-
python3_ver: '3.8'
26+
- cc: gcc-12
27+
cxx: g++-12
28+
os: ubuntu-24.04
29+
python3_ver: '3.12'
3830

39-
- cc: clang-11
40-
cxx: clang++-11
41-
os: ubuntu-20.04
42-
python2_ver: '2.7'
43-
python3_ver: '3.8'
31+
- cc: gcc-13
32+
cxx: g++-13
33+
os: ubuntu-24.04
34+
python3_ver: '3.12'
4435

45-
- cc: clang-12
46-
cxx: clang++-12
47-
os: ubuntu-20.04
48-
python2_ver: '2.7'
49-
python3_ver: '3.8'
36+
- cc: gcc-14
37+
cxx: g++-14
38+
os: ubuntu-24.04
39+
python3_ver: '3.12'
5040

5141
- cc: clang-13
5242
cxx: clang++-13
@@ -57,6 +47,26 @@ jobs:
5747
cxx: clang++-14
5848
os: ubuntu-22.04
5949
python3_ver: '3.10'
50+
51+
- cc: clang-15
52+
cxx: clang++-15
53+
os: ubuntu-22.04
54+
python3_ver: '3.10'
55+
56+
- cc: clang-16
57+
cxx: clang++-16
58+
os: ubuntu-24.04
59+
python3_ver: '3.12'
60+
61+
- cc: clang-17
62+
cxx: clang++-17
63+
os: ubuntu-24.04
64+
python3_ver: '3.12'
65+
66+
- cc: clang-18
67+
cxx: clang++-18
68+
os: ubuntu-24.04
69+
python3_ver: '3.12'
6070
runs-on: ${{matrix.config.os}}
6171
env:
6272
CC: ${{matrix.config.cc}}
@@ -67,11 +77,10 @@ jobs:
6777
- name: Install dependencies
6878
run: |
6979
sudo apt update --fix-missing
70-
sudo apt install -y libpython2-dev libpython3-dev python3-numpy doxygen luajit lua-ldoc
80+
sudo apt install -y libpython3-dev python3-numpy doxygen luajit lua-ldoc
7181
7282
# Note: we need the grep because apt-cache will return 0 even when no packages are found
7383
if sudo apt-cache search python-numpy | grep 'numpy -'; then sudo apt install -y python-numpy; fi
74-
if sudo apt-cache search python2-numpy | grep 'numpy -'; then sudo apt install -y python2-numpy; fi
7584
7685
# LuaRocks stopped installing properly through apt, so just copy the file from its repo
7786
git clone https://github.com/bluebird75/luaunit -b LUAUNIT_V3_4
@@ -97,15 +106,6 @@ jobs:
97106
SoapySDRUtil --info
98107
SoapySDRUtil --check=null
99108
SoapySDRUtil --make="driver=null"
100-
- name: Test Python2 bindings
101-
if: ${{matrix.config.python2_ver}}
102-
run: |
103-
export PYTHONPATH=${INSTALL_PREFIX}/$(python${{matrix.config.python2_ver}} ${{github.workspace}}/swig/python/get_python_lib.py ${INSTALL_PREFIX})
104-
python${{matrix.config.python2_ver}} -c "import SoapySDR; print(SoapySDR.getAPIVersion())"
105-
python${{matrix.config.python2_ver}} -c "from SoapySDR import *; print(SOAPY_SDR_ABI_VERSION)"
106-
python${{matrix.config.python2_ver}} -c "from SoapySDR import *; print(SOAPY_SDR_TIMEOUT)"
107-
python${{matrix.config.python2_ver}} -c "import SoapySDR; print(SoapySDR.errToStr(SoapySDR.SOAPY_SDR_TIMEOUT))"
108-
python${{matrix.config.python2_ver}} -c "import SoapySDR; print(SoapySDR.Device.make('driver=null'))"
109109
- name: Test Python3 bindings
110110
run: |
111111
export PYTHONPATH=${INSTALL_PREFIX}/$(python${{matrix.config.python3_ver}} ${{github.workspace}}/swig/python/get_python_lib.py ${INSTALL_PREFIX})

0 commit comments

Comments
 (0)