Merge tag 'v4.2.1' into dhc/obj-c

'Release version 4.2.1'
dhcdht · Mar 19, 2024 · 1d31e92 · 1d31e92
2 parents 89619e3 + b592468
commit 1d31e92
Show file tree

Hide file tree

Showing 144 changed files with 3,711 additions and 2,148 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,6 +34,10 @@ jobs:
         include:
         - SWIGLANG: ""
           CPPFLAGS: "-DDOH_POISON"
+        - SWIGLANG: ""
+          GCC: 7
+          CPPSTD: c++98
+          CSTD: c90
         - SWIGLANG: ""
           GCC: 7
         - SWIGLANG: ""
@@ -110,6 +114,9 @@ jobs:
           VER: '5.3'
         - SWIGLANG: octave
           CPPSTD: c++11
+        - SWIGLANG: octave
+          os: ubuntu-22.04 # Octave 6.4.0
+          CPPSTD: c++11
         - SWIGLANG: perl5
         - SWIGLANG: php
           VER: '8.0'
@@ -184,7 +191,7 @@ jobs:
           CPPSTD: c++11
         - SWIGLANG: ruby
           CPPSTD: c++11
-          VER: '3.2'
+          VER: '3.2.2' # import_fragments testcase started to fail on upgrade to 3.2.3, see https://github.com/swig/swig/issues/2800
         - SWIGLANG: scilab
           VER: '5.5.2'
         - SWIGLANG: scilab
@@ -336,11 +343,11 @@ jobs:
         # Experimental languages (these are allowed to fail)
         - SWIGLANG: mzscheme
           continue-on-error: true
-        #- SWIGLANG: ocaml
-        #  CPPSTD: c++17
-        #  GCC: 13
-        #  continue-on-error: true
-        #  os: ubuntu-18.04 # ocaml-4.08 in ubuntu-20.04 not yet working
+        - SWIGLANG: ocaml
+          CPPSTD: c++17
+          GCC: 13
+          os: ubuntu-22.04 # ocaml-4.08 in ubuntu-20.04 doesn't work
+          continue-on-error: true
       # Run all of them, as opposed to aborting when one fails
       fail-fast: false
 
@@ -357,9 +364,21 @@ jobs:
       EXTRA_CXXFLAGS: ${{ matrix.EXTRA_CXXFLAGS }}
 
     steps:
+    - name: Machine Info
+      run: |
+          echo "nproc..."
+          nproc --all
+          echo "uname..."
+          uname --all
+          echo "meminfo..."
+          cat /proc/meminfo
+          echo "lsb-release..."
+          cat /etc/lsb-release
+
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
+        show-progress: false
         submodules: recursive
 
     - name: Install CCache
@@ -470,6 +489,16 @@ jobs:
                     unset SWIGJOBS
                 esac
                 ;;
+              ocaml)
+                # `make check-ocaml-test-suite` fails with parallel make with:
+                #
+                # File "swig.ml", line 1:
+                # Error: Could not find the .cmi file for interface swig.mli.
+                #
+                # Apparently we ought to be using `ocamldep` to generate make
+                # dependencies.
+                unset SWIGJOBS
+                ;;
             esac
 
             # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.

diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -23,8 +23,9 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
+        show-progress: false
         submodules: recursive
 
     - name: Install Dependencies

diff --git a/ANNOUNCE b/ANNOUNCE
@@ -1,8 +1,8 @@
-*** ANNOUNCE: SWIG 4.2.0 (30 Dec 2023) ***
+*** ANNOUNCE: SWIG 4.2.1 (24 Feb 2024) ***
 
 https://www.swig.org
 
-We're pleased to announce SWIG-4.2.0, the latest SWIG release.
+We're pleased to announce SWIG-4.2.1, the latest SWIG release.
 
 What is SWIG?
 =============
@@ -25,11 +25,11 @@ Availability
 ============
 The release is available for download on Sourceforge at
 
-     https://prdownloads.sourceforge.net/swig/swig-4.2.0.tar.gz
+     https://prdownloads.sourceforge.net/swig/swig-4.2.1.tar.gz
 
 A Windows version is also available at
 
-     https://prdownloads.sourceforge.net/swig/swigwin-4.2.0.zip
+     https://prdownloads.sourceforge.net/swig/swigwin-4.2.1.zip
 
 Please report problems with this release to the swig-devel mailing list,
 details at https://www.swig.org/mail.html.