Merge branch 'swig:master' into pr-1262

Author: willadsen

.github/workflows/linux.yml

@@ -3,15 +3,19 @@ name: linux
 on:
   push:
     paths-ignore:
+      - '.github/workflows/macos.yml'
+      - '.github/workflows/windows-cmake.yml'
+      - '.github/workflows/windows.yml'
       - 'CHANGES*'
       - 'Doc/**'
-      - 'appveyor.yml'
   pull_request:
     branches: master
     paths-ignore:
+      - '.github/workflows/macos.yml'
+      - '.github/workflows/windows-cmake.yml'
+      - '.github/workflows/windows.yml'
       - 'CHANGES*'
       - 'Doc/**'
-      - 'appveyor.yml'
 
 permissions:
   contents: read
@@ -68,9 +72,15 @@ jobs:
         - SWIGLANG: go
           VER: '1.20'
           CSTD: gnu11
+        - SWIGLANG: go
+          VER: '1.22'
+        - SWIGLANG: go
+          VER: '1.23'
         - SWIGLANG: go
           VER: '1.24'
           CSTD: gnu99 # Go 1.24 doesn't build with -Wdeclaration-after-statement
+        - SWIGLANG: go
+          VER: '1.25'
         - SWIGLANG: guile
         - SWIGLANG: guile
           VER: '3.0'
@@ -89,6 +99,7 @@ jobs:
           os: ubuntu-22.04 # Octave 6.4.0
           CPPSTD: c++11
         - SWIGLANG: octave
+          VER: '8.4'
           os: ubuntu-24.04 # Octave 8.4.0
           CPPSTD: c++11
         - SWIGLANG: perl5
@@ -101,6 +112,7 @@ jobs:
         - SWIGLANG: php
           VER: '8.3'
           CPPSTD: c++11 # C++98 not supported by PHP.
+          os: ubuntu-24.04
         - SWIGLANG: php
           VER: '8.4'
           CPPSTD: c++11 # C++98 not supported by PHP.
@@ -251,7 +263,13 @@ jobs:
           CPPSTD: c++11
         - SWIGLANG: ruby
           CPPSTD: c++11
-          VER: '3.3.9' # 3.3.10 has an error: -Werror=missing-field-initializers, see https://bugs.ruby-lang.org/issues/21659
+          VER: '3.3'
+        - SWIGLANG: ruby
+          CPPSTD: c++11
+          VER: '3.4'
+        - SWIGLANG: ruby
+          CPPSTD: c++11
+          VER: '4.0'
         - SWIGLANG: ruby
           CPPSTD: c++11
         - SWIGLANG: scilab
@@ -307,6 +325,16 @@ jobs:
         - SWIGLANG: java
           CPPSTD: c++17
           GCC: 13
+        - SWIGLANG: java
+          VER: 8
+        - SWIGLANG: java
+          VER: 11
+        - SWIGLANG: java
+          VER: 17
+        - SWIGLANG: java
+          VER: 21
+        - SWIGLANG: java
+          VER: 25
         - SWIGLANG: javascript
           ENGINE: node
           VER: '18'
@@ -373,6 +401,12 @@ jobs:
           CPPSTD: c++20
           GCC: 13
           os: ubuntu-22.04
+        - SWIGLANG: javascript
+          ENGINE: node
+          VER: '22'
+          CPPSTD: c++20
+          GCC: 13
+          os: ubuntu-22.04
         - SWIGLANG: javascript
           ENGINE: v8
           CSTD: c++14
@@ -395,6 +429,7 @@ jobs:
 
     env:
       SWIGLANG: ${{ matrix.SWIGLANG }}
+      compiler: ${{ matrix.compiler }}
       PY2: ${{ matrix.PY2 }}
       VER: ${{ matrix.VER }}
       ENGINE: ${{ matrix.ENGINE }}
@@ -435,70 +470,40 @@ jobs:
     - name: Install Dependencies
       run: |
           set -x
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          echo PATH="$PATH" >> $GITHUB_ENV
-
           source $GITHUB_WORKSPACE/Tools/GHA-linux-install.sh
-          echo WITHLANG="$WITHLANG" >> $GITHUB_ENV
-
-          case $(uname) in
-              Linux)
-                  cpu_count=$(nproc)
-                  ;;
 
-              Darwin)
-                  cpu_count=$(sysctl -n hw.ncpu)
-                  ;;
-
-              *)
-                  cpu_count=1
-                  ;;
-          esac
-
-          if [[ $cpu_count != 1 ]]; then
+          cpu_count=$(nproc)
+          if test $cpu_count -gt 1; then
             echo SWIGJOBS=-j$cpu_count >> $GITHUB_ENV
           fi
 
-          if test '${{ matrix.compiler }}' = 'clang'; then
-            CC="clang"
-            CXX="clang++"
-
-            CFLAGS="$CFLAGS -fPIE"
-            CXXFLAGS="$CXXFLAGS -fPIE"
-          elif test -n "$GCC"; then
-            CC="gcc-$GCC"
-            CXX="g++-$GCC"
-          else
-            CC="gcc"
-            CXX="g++"
-          fi
-
-          export CC CXX
-
-          echo CC="$CC" >> $GITHUB_ENV
-          echo CXX="$CXX" >> $GITHUB_ENV
-
-          ls -la $(which $CC) $(which $CXX)
-          $CC --version
-          $CXX --version
-
     - name: Configure
       run: |
           source $GITHUB_WORKSPACE/Tools/CI-linux-environment.sh
           set -x
 
-          if [[ -z "$CSTD" ]]; then
+          if test -z "$CSTD"; then
             case "$CPPSTD" in
-              c++11) export CSTD=c11 ;;
-              c++14) export CSTD=c11 ;;
-              c++17) export CSTD=c17 ;;
-              c++20) export CSTD=c17 ;;
+              c++11) CSTD=c11 ;;
+              c++14) CSTD=c11 ;;
+              c++17) CSTD=c17 ;;
+              c++20) CSTD=c17 ;;
             esac
-            echo CSTD="$CSTD" >> $GITHUB_ENV
+            if test -n "$CSTD"; then echo "CSTD=$CSTD" >> $GITHUB_ENV; fi
+          fi
+          if test -n "$CPPSTD"; then
+            CONFIGOPTS+=("CXXFLAGS=-std=$CPPSTD $CXXFLAGS")
+            echo "Use C++ standard $CPPSTD"
+          else
+            CONFIGOPTS+=("--disable-cpp11-testing")
+            $CXX -x c++ -dM -E - < /dev/null | grep __cplusplus
+          fi
+          if test -n "$CSTD"; then
+            CONFIGOPTS+=("CFLAGS=-std=$CSTD $CFLAGS")
+            echo "Use C standard $CSTD"
+          else
+            $CC -dM -E - < /dev/null | grep __STDC_VERSION__
           fi
-          if test -z "$CPPSTD"; then CONFIGOPTS+=("--disable-cpp11-testing"); fi
-          if test -n "$CPPSTD"; then CONFIGOPTS+=("CXXFLAGS=-std=$CPPSTD $CXXFLAGS"); fi
-          if test -n "$CSTD"; then CONFIGOPTS+=("CFLAGS=-std=$CSTD $CFLAGS"); fi
           if test -n "$SWIGLANG"; then CONFIGOPTS+=(--without-alllang --with-$WITHLANG); fi
           if test "$PY2" = "2"; then CONFIGOPTS+=(--with-python=python2 --without-python3); fi
           echo "${CONFIGOPTS[@]}"