Skip to content

Commit 3855215

Browse files
authored
Merge pull request #482 from bjodah/CI-gcc-13
Bump one CI config to ubuntu-24.04
2 parents 4052cf6 + 50682e9 commit 3855215

File tree

4 files changed

+35
-24
lines changed

4 files changed

+35
-24
lines changed

.github/workflows/ci.yml

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,100 +12,102 @@ jobs:
1212
WITH_BFD: yes
1313
PYTHON_VERSION: '3.12'
1414
TEST_SYMPY: yes
15-
OS: ubuntu-20.04
15+
OS: ubuntu-22.04
1616
CC: gcc
1717

1818
- BUILD_TYPE: Debug
1919
WITH_BFD: yes
2020
PYTHON_VERSION: '3.11'
2121
TEST_SYMPY: yes
22-
OS: ubuntu-20.04
22+
OS: ubuntu-22.04
2323
CC: gcc
2424

2525
- BUILD_TYPE: Debug
2626
WITH_BFD: yes
2727
PYTHON_VERSION: '3.10'
2828
TEST_SYMPY: yes
29-
OS: ubuntu-20.04
29+
OS: ubuntu-22.04
3030
CC: gcc
3131

3232
- BUILD_TYPE: Debug
3333
WITH_BFD: yes
3434
PYTHON_VERSION: '3.9'
3535
TEST_SYMPY: yes
36-
OS: ubuntu-20.04
36+
OS: ubuntu-22.04
3737
CC: gcc
3838

3939
- BUILD_TYPE: Release
4040
PYTHON_VERSION: '3.13'
4141
BUILD_SHARED_LIBS: yes
42-
OS: ubuntu-20.04
42+
OS: ubuntu-22.04
4343
CC: gcc
4444

4545
- BUILD_TYPE: Release
4646
PYTHON_VERSION: '3.13'
4747
WITH_MPFR: yes
4848
INTEGER_CLASS: gmpxx
4949
WITH_NUMPY: no
50-
OS: ubuntu-20.04
50+
OS: ubuntu-22.04
5151
CC: gcc
5252

5353
- BUILD_TYPE: Release
5454
PYTHON_VERSION: '3.13'
5555
WITH_MPC: yes
56-
OS: ubuntu-20.04
56+
OS: ubuntu-22.04
5757
CC: gcc
5858

5959
- BUILD_TYPE: Release
6060
WITH_MPFR: yes
6161
PYTHON_VERSION: '3.13'
62-
OS: ubuntu-20.04
62+
OS: ubuntu-22.04
6363
CC: gcc
6464

6565
- BUILD_TYPE: Release
6666
PYTHON_VERSION: '3.9'
6767
WITH_MPC: yes
68-
OS: ubuntu-20.04
68+
OS: ubuntu-22.04
6969
CC: gcc
7070

7171
- BUILD_TYPE: Release
7272
PYTHON_VERSION: '3.9'
7373
WITH_MPC: yes
7474
INTEGER_CLASS: flint
7575
WITH_FLINT: yes
76-
OS: ubuntu-20.04
76+
OS: ubuntu-22.04
7777
CC: gcc
7878

7979
#- BUILD_TYPE: Debug
8080
# PYTHON_VERSION: '3.9'
8181
# WITH_BFD: yes
8282
# WITH_PIRANHA: yes
83-
# OS: ubuntu-20.04
83+
# OS: ubuntu-22.04
8484
# CC: gcc
8585

8686
- BUILD_TYPE: Debug
8787
PYTHON_VERSION: '3.13'
8888
WITH_BFD: yes
8989
BUILD_SHARED_LIBS: yes
90-
OS: ubuntu-20.04
90+
OS: ubuntu-22.04
9191
CC: clang
9292

9393
- BUILD_TYPE: Release
9494
PYTHON_VERSION: '3.13'
9595
WITH_NUMPY: yes
96-
OS: ubuntu-20.04
96+
OS: ubuntu-22.04
9797
CC: clang
9898

9999
- BUILD_TYPE: Debug
100-
PYTHON_VERSION: '3.10'
100+
PYTHON_VERSION: '3.12'
101101
WITH_SYMPY: yes
102-
WITH_LLVM: 14
102+
WITH_LLVM: 18
103103
WITH_SCIPY: yes
104+
WITH_LATEST_GCC: yes
104105
INTEGER_CLASS: 'boostmp'
105106
PYTEST_ADDOPTS: '-k "not integer_nthroot"'
106-
OS: ubuntu-22.04
107-
EXTRA_APT_REPOSITORY: 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main'
108-
EXTRA_APT_PACKAGES: 'llvm-14'
107+
OS: ubuntu-24.04
108+
CC: gcc # ubuntu nobel uses gcc-13
109+
#EXTRA_APT_REPOSITORY: 'deb http://apt.llvm.org/jammy/ llvm-toolchain-nobel-18 main'
110+
EXTRA_APT_PACKAGES: 'llvm-18'
109111

110112
- BUILD_TYPE: Debug
111113
PYTHON_VERSION: '3.13'
@@ -133,7 +135,7 @@ jobs:
133135

134136
- BUILD_TYPE: Release
135137
PYTHON_VERSION: '3.11'
136-
OS: ubuntu-20.04
138+
OS: ubuntu-22.04
137139
WITH_MPC: yes
138140
WITH_MPFR: yes
139141
WITH_FLINT: yes
@@ -145,11 +147,21 @@ jobs:
145147
CC: gcc
146148

147149
steps:
150+
151+
- uses: conda-incubator/setup-miniconda@v3
152+
if: matrix.MSYS_ENV == ''
153+
with:
154+
activate-environment: symengine
155+
channel-priority: strict
156+
architecture: x86_64
157+
channels: conda-forge
158+
conda-remove-defaults: "true"
159+
148160
- name: Checkout code
149161
uses: actions/checkout@v4
150162

151163
- name: Build and test symengine
152-
shell: bash
164+
shell: bash -el {0}
153165
run: |
154166
source bin/test_symengine_unix.sh
155167
env:

bin/install_travis.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ if [[ "${WITH_SYMPY}" != "no" ]]; then
3333
pip install sympy;
3434
fi
3535

36-
conda clean --all
37-
source activate $our_install_dir;
36+
conda clean --all

bin/test_symengine_unix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cd ..
1010

1111
# Setup travis for C++ library
1212
cd $SOURCE_DIR
13-
source bin/test_symengine_unix.sh
13+
source bin/test_symengine.sh
1414

1515
# Setup travis for Python wrappers
1616
cd $PYTHON_SOURCE_DIR

symengine_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
153b7e98f310bccaae586dab6b49284ccd5f4174
1+
c9510fb4b5c30b84adb993573a51f2a9a38a4cfe

0 commit comments

Comments
 (0)