Skip to content

Commit

Permalink
Update continuous-integration.yml (#1513)
Browse files Browse the repository at this point in the history
* Update continuous-integration.yml

Build dependencies from scratch and use python 3.10, numpy 1.25

* Update continuous-integration.yml

Restore caching now that its updated

* Update continuous-integration.yml

fix python3 path spec on windows

* Update continuous-integration.yml

* Update continuous-integration.yml

use fwd slashes on windows

* Update continuous-integration.yml

use python specification in core build not dependencies on windows
  • Loading branch information
aymanhab authored Jun 4, 2024
1 parent daaffba commit 7b6991c
Showing 1 changed file with 16 additions and 9 deletions.
25 changes: 16 additions & 9 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
- name: Install Python packages
uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.10'

- name: Install NumPy
run: python3 -m pip install numpy==1.20.2
run: python3 -m pip install numpy==1.25

- name: Set up JDK 1.8
uses: actions/setup-java@v3
Expand Down Expand Up @@ -81,8 +81,7 @@ jobs:
# default CMAKE_CXX_FLAGS.
# https://msdn.microsoft.com/en-us/library/19z1t1wy.aspx
$env:CXXFLAGS = "/W0"
cmake $env:GITHUB_WORKSPACE/opensim-core/dependencies -G"Visual Studio 16 2019" -A x64 -DSUPERBUILD_ezc3d:BOOL=on -DOPENSIM_WITH_CASADI:BOOL=on -DWIG_DIR=C:/ProgramData/chocolatey/lib/swig -DOPENSIM_WITH_TROPTER:BOOL=on -DCMAKE_INSTALL_PREFIX=~/opensim_dependencies_install -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64
$env:CXXFLAGS = ""
cmake $env:GITHUB_WORKSPACE/opensim-core/dependencies -G"Visual Studio 16 2019" -A x64 -DSUPERBUILD_ezc3d:BOOL=on -DOPENSIM_WITH_CASADI:BOOL=on -DWIG_DIR=C:/ProgramData/chocolatey/lib/swig -DOPENSIM_WITH_TROPTER:BOOL=on -DCMAKE_INSTALL_PREFIX=~/opensim_dependencies_install
cmake . -LAH
cmake --build . --config Release -- /maxcpucount:2
Expand All @@ -108,7 +107,7 @@ jobs:
mkdir $env:GITHUB_WORKSPACE\\build_core
chdir $env:GITHUB_WORKSPACE\\build_core
$env:CXXFLAGS = "/W0"
cmake $env:GITHUB_WORKSPACE/opensim-core -G"Visual Studio 16 2019" -A x64 -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DBUILD_JAVA_WRAPPING=on -DBUILD_PYTHON_WRAPPING=on -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_TESTING=off -DPython3_ROOT_DIR=C:\hostedtoolcache\windows\Python\3.8.10\x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install
cmake $env:GITHUB_WORKSPACE/opensim-core -G"Visual Studio 16 2019" -A x64 -DOPENSIM_DEPENDENCIES_DIR=~/opensim_dependencies_install -DBUILD_JAVA_WRAPPING=on -DBUILD_PYTHON_WRAPPING=on -DOPENSIM_C3D_PARSER=ezc3d -DBUILD_TESTING=off -DPython3_ROOT_DIR=C:/hostedtoolcache/windows/Python/3.10.11/x64 -DCMAKE_INSTALL_PREFIX=~/opensim-core-install
cmake . -LAH
cmake --build . --config Release -- /maxcpucount:2
cmake --install .
Expand Down Expand Up @@ -162,7 +161,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.10'

- name: symbolic link to python so GUI can find it
run: |
Expand All @@ -172,7 +171,7 @@ jobs:
run: |
brew install cmake pkgconfig autoconf libtool automake wget pcre doxygen llvm
brew reinstall gcc
pip3 install numpy==1.20.2
pip3 install numpy==1.25
gfortran -v
mkdir gfortran_version
gfortran -v &> gfortran_version/gfortran_version.txt
Expand Down Expand Up @@ -251,7 +250,7 @@ jobs:
key: ${{ runner.os }}-${{ steps.opensim-core-commit.outputs.hash }}

- name: Install SWIG
# if: steps.cache-swig.outputs.cache-hit != 'true'
if: steps.cache-swig.outputs.cache-hit != 'true'
run: |
mkdir ~/swig-source && cd ~/swig-source
wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz
Expand Down Expand Up @@ -314,8 +313,16 @@ jobs:
repository: opensim-org/opensim-core
path: 'opensim-core'

- name: Install Python packages
uses: actions/setup-python@v4
with:
python-version: '3.10'

- name: Install NumPy
run: python3 -m pip install numpy==1.25

- name: Install packages
run: sudo apt-get update && sudo apt-get install --yes liblapack-dev freeglut3-dev libxi-dev libxmu-dev doxygen python3 python3-dev python3-numpy python3-setuptools gfortran-7
run: sudo apt-get update && sudo apt-get install --yes liblapack-dev freeglut3-dev libxi-dev libxmu-dev doxygen gfortran-7

- name: Install SWIG
if: steps.cache-swig.outputs.cache-hit != 'true'
Expand Down

0 comments on commit 7b6991c

Please sign in to comment.