Skip to content

Commit 110706f

Browse files
committed
Manually restore and add fortran to ci.yml
1 parent 4fb6e68 commit 110706f

File tree

1 file changed

+28
-11
lines changed

1 file changed

+28
-11
lines changed

.github/workflows/ci.yml

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ jobs:
4444
GCC: 10
4545
- SWIGLANG: ""
4646
GCC: 11
47+
- SWIGLANG: ""
48+
GCC: 12
49+
os: ubuntu-22.04
4750
- SWIGLANG: ""
4851
compiler: clang
4952
- SWIGLANG: csharp
@@ -57,7 +60,6 @@ jobs:
5760
# VER: '2.066.0'
5861
# os: ubuntu-18.04 # This dlang version doesn't work under 20.04.
5962
- SWIGLANG: fortran
60-
CPPSTD: c++11
6163
- SWIGLANG: go
6264
VER: '1.6'
6365
CSTD: gnu11
@@ -69,6 +71,10 @@ jobs:
6971
- SWIGLANG: go
7072
VER: '1.17'
7173
- SWIGLANG: guile
74+
- SWIGLANG: guile
75+
VER: '2.2'
76+
- SWIGLANG: guile
77+
VER: '3.0'
7278
- SWIGLANG: java
7379
- SWIGLANG: javascript
7480
ENGINE: node
@@ -91,17 +97,16 @@ jobs:
9197
CPPSTD: c++11
9298
- SWIGLANG: javascript
9399
ENGINE: node
94-
VER: '17'
100+
VER: '18'
95101
CPPSTD: c++14
96102
- SWIGLANG: javascript
97103
ENGINE: jsc
104+
VER: '4.0'
98105
- SWIGLANG: lua
99106
- SWIGLANG: lua
100107
VER: '5.3'
101108
- SWIGLANG: octave
102109
CPPSTD: c++11
103-
- SWIGLANG: octave
104-
CPPSTD: c++11
105110
- SWIGLANG: perl5
106111
- SWIGLANG: php
107112
VER: '7.0'
@@ -121,10 +126,6 @@ jobs:
121126
VER: '8.2'
122127
- SWIGLANG: python
123128
PY2: 2
124-
- SWIGLANG: python
125-
VER: '3.2'
126-
os: ubuntu-18.04 # Python < 3.5 not available for 20.04.
127-
continue-on-error: true # broken packages problem
128129
- SWIGLANG: python
129130
VER: '3.3'
130131
os: ubuntu-18.04 # Python < 3.5 not available for 20.04.
@@ -143,6 +144,8 @@ jobs:
143144
VER: '3.9'
144145
- SWIGLANG: python
145146
VER: '3.10'
147+
- SWIGLANG: python
148+
VER: '3.11'
146149
- SWIGLANG: python
147150
PY2: 2
148151
SWIG_FEATURES: -builtin
@@ -180,6 +183,9 @@ jobs:
180183
- SWIGLANG: ruby
181184
VER: '3.0'
182185
CPPSTD: c++11
186+
- SWIGLANG: ruby
187+
VER: '3.1'
188+
CPPSTD: c++11
183189
- SWIGLANG: scilab
184190
VER: '5.5.2'
185191
- SWIGLANG: scilab
@@ -199,6 +205,11 @@ jobs:
199205
CPPSTD: c++11
200206
- SWIGLANG: java
201207
CPPSTD: c++11
208+
- SWIGLANG: javascript
209+
ENGINE: jsc
210+
VER: '4.1'
211+
os: ubuntu-22.04
212+
CPPSTD: c++11
202213
- SWIGLANG: javascript
203214
ENGINE: node
204215
VER: '14'
@@ -275,7 +286,7 @@ jobs:
275286
GCC: 11
276287
- SWIGLANG: javascript
277288
ENGINE: node
278-
VER: '17'
289+
VER: '18'
279290
CPPSTD: c++17
280291
GCC: 11
281292
- SWIGLANG: lua
@@ -306,6 +317,12 @@ jobs:
306317
- SWIGLANG: tcl
307318
CPPSTD: c++17
308319
GCC: 11
320+
# c++20 testing (using gcc12)
321+
# ubuntu-22.04 is currently experimental on Github Actions, so limit to just one language for now
322+
- SWIGLANG: python
323+
CPPSTD: c++20
324+
GCC: 12
325+
os: ubuntu-22.04
309326
# Experimental languages (these are allowed to fail)
310327
- SWIGLANG: mzscheme
311328
continue-on-error: true
@@ -396,7 +413,7 @@ jobs:
396413
ls -la $(which $CC) $(which $CXX)
397414
$CC --version
398415
$CXX --version
399-
$FC --version
416+
if test -n "$FC"; then $FC --version; fi
400417
401418
- name: Configure
402419
run: |
@@ -453,7 +470,7 @@ jobs:
453470
# Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.
454471
cflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cflags --std=$CSTD --compiler=$CC)
455472
cxxflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cxxflags --std=$CPPSTD --compiler=$CC)
456-
fcflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --fcflags --std=$FCSTD --compiler=$FC)
473+
if -n "$FC"; then fcflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --fcflags --std=$FCSTD --compiler=$FC); fi
457474
make check-$SWIGLANG-version
458475
make check-$SWIGLANG-enabled
459476
make $SWIGJOBS check-$SWIGLANG-examples CFLAGS="$cflags" CXXFLAGS="$cxxflags" FCFLAGS="$fcflags"

0 commit comments

Comments
 (0)