Merge pull request #3486 from opensim-org/swig_ci_fix

Upgrade to SWIG 4.1.1 on CI builds
opensim-org · Jun 17, 2023 · ffeb84d · ffeb84d
2 parents cce7f59 + ec895ee
commit ffeb84d
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -40,7 +40,9 @@ jobs:
       run: python3 -m pip install numpy==1.20.2
 
     - name: Install SWIG
-      run: choco install swig --version 4.0.2 --yes --limit-output --allow-downgrade
+      run: |
+        choco install swig --version 4.1.1 --yes --limit-output --allow-downgrade
+        swig -swiglib
 
     - name: Cache dependencies
       id: cache-dependencies
@@ -75,7 +77,7 @@ jobs:
         # TODO: Can remove /WX when we use that in CMakeLists.txt.
         # Set the CXXFLAGS environment variable to turn warnings into errors.
         # Skip timing test section included by default.
-        cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64
+        cmake -E env CXXFLAGS="/WX -DSKIP_TIMING" cmake $env:GITHUB_WORKSPACE -LAH -G"Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_PYTHON_WRAPPING=on -DBUILD_JAVA_WRAPPING=on -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 
         $env:match = cmake -L . | Select-String -Pattern OPENSIM_QUALIFIED_VERSION
         $version = $env:match.split('=')[1]
         echo $version
@@ -175,7 +177,9 @@ jobs:
       run: python3 -m pip install numpy==1.20.2
 
     - name: Install SWIG
-      run: choco install swig --version 4.0.2 --yes --limit-output --allow-downgrade
+      run: | 
+        choco install swig --version 4.1.1 --yes --limit-output --allow-downgrade
+        swig -swiglib
 
     - name: Cache dependencies
       id: cache-dependencies
@@ -286,8 +290,8 @@ jobs:
       # if: steps.cache-swig.outputs.cache-hit != 'true'
       run: |
         mkdir ~/swig-source && cd ~/swig-source
-        wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz
-        tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2
+        wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz
+        tar xzf v4.1.1.tar.gz && cd swig-4.1.1
         sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache
         make && make -j4 install
 
@@ -392,8 +396,8 @@ jobs:
       # if: steps.cache-swig.outputs.cache-hit != 'true'
       run: |
         mkdir ~/swig-source && cd ~/swig-source
-        wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz
-        tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2
+        wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz
+        tar xzf v4.1.1.tar.gz && cd swig-4.1.1
         sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache
         make && make -j4 install
     - name: Cache dependencies
@@ -494,8 +498,8 @@ jobs:
       # if: steps.cache-swig.outputs.cache-hit != 'true'
       run: |
         mkdir ~/swig-source && cd ~/swig-source
-        wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz
-        tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2
+        wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz
+        tar xzf v4.1.1.tar.gz && cd swig-4.1.1
         sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache
         make && make -j4 install
     - name: Cache dependencies