Jarfile github action: fix scoop install + add eigen (#379)

[simgrid.git] / .github / workflows / jarfile.yml

diff --git a/.github/workflows/jarfile.yml b/.github/workflows/jarfile.yml
index 4a92b4f..915d4e7 100644 (file)
--- a/.github/workflows/jarfile.yml
+++ b/.github/workflows/jarfile.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
         matrix:
           config:
-          - { name: "Windows MingW", os: windows, cc: "gcc", cxx: "g++", generator: "MinGW Makefiles", cmake_extra_options: "-Denable_lto=OFF" }
+          - { name: "Windows MingW", os: windows, cc: "gcc", cxx: "g++", generator: "MinGW Makefiles", cmake_extra_options: '-Denable_lto=OFF -DCMAKE_PREFIX_PATH="C:/Program Files/Eigen3/"' }
           - { name: "Ubuntu gcc", os: ubuntu, cc: "gcc", cxx: "g++", generator: "Unix Makefiles", cmake_extra_options: "-DLTO_EXTRA_FLAG=auto" }
           - { name: "MacOS clang", os: macos, cc: "clang", cxx: "clang++", generator: "Unix Makefiles", cmake_extra_options: "-DLTO_EXTRA_FLAG=auto" }
     steps:
@@ -21,17 +21,18 @@ jobs:
       run: |
           echo "CC=${{ matrix.config.cc }}"   >> $GITHUB_ENV
           echo "CXX=${{ matrix.config.cxx }}" >> GITHUB_ENV
-    - name: Install boost on ubuntu
+    - name: Install boost and eigen on ubuntu
       if: matrix.config.os == 'ubuntu'
-      run: sudo apt-get update && sudo apt-get install -yq libboost-dev
-    - name: Install boost on macos
+      run: sudo apt-get update && sudo apt-get install -yq libboost-dev libeigen3-dev
+    - name: Install boost and eigen on macos
       if: matrix.config.os == 'macos'
-      run: brew install boost
-    - name: Install boost and gcc on windows
+      run: brew install boost eigen
+    - name: Install boost, eigen, and gcc on windows
       if: matrix.config.os == 'windows'
       run: |
-        Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
-        scoop -RunAsAdmin install gcc --global
+        iwr -useb get.scoop.sh -outfile 'install.ps1'
+        .\install.ps1 -RunAsAdmin
+        scoop install gcc --global
         If ((Test-Path "C:\hostedtoolcache\windows\Boost") -eq $False){
           # Use the boost-1.72.0-win32-msvc14.1-x86_64.tar.gz for Windows 2016
           $url = "https://github.com/actions/boost-versions/releases/download/1.72.0-20200608.4/boost-1.72.0-win32-msvc14.2-x86_64.tar.gz"
@@ -44,6 +45,14 @@ jobs:
         echo "BOOST_ROOT=C:\hostedtoolcache\windows\Boost\1.72.0\x86_64" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
         echo "BOOST_INCLUDEDIR=C:\hostedtoolcache\windows\Boost\1.72.0\x86_64\boost\include" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
         echo "BOOST_LIBRARYDIR=C:\hostedtoolcache\windows\Boost\1.72.0\x86_64\lib" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+        $url = "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz"
+        (New-Object System.Net.WebClient).DownloadFile($url, "$env:TEMP\eigen.tar.gz")
+        Push-Location -Path "$env:TEMP"
+        cmake -E tar zxf "$env:TEMP\eigen.tar.gz"
+        mkdir "$env:TEMP\eigen-3.4.0\build"
+        cd "$env:TEMP\eigen-3.4.0\build"
+        cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX="C:\Program Files\Eigen3" ..
+        cmake --build . --target install
     - name: Build jar with Cmake
       run: |
           mkdir build