Skip to content

Commit

Permalink
Fix action
Browse files Browse the repository at this point in the history
  • Loading branch information
bakpaul committed Feb 27, 2024
1 parent a3722f6 commit 08adcf0
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ runs:
SUDO=''
QT_INSTALL_DIR="C:/Qt"
EIGEN_INSTALL_DIR="C:/eigen"
BOOST_VERSION=1.69.0
BOOST_VERSION=1.74.0
BOOST_INSTALL_DIR="C:/boost"
# vsdevcmd.bat is here: 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/Tools/vsdevcmd.bat'
Expand Down Expand Up @@ -189,7 +189,7 @@ runs:
sudo apt-get -qq install freeglut3-dev libopengl0
sudo apt-get -qq install libpng-dev libjpeg-dev libtiff-dev libglew-dev zlib1g-dev
elif [[ "$RUNNER_OS" == "macOS" ]]; then
brew update && brew upgrade
brew update
brew install ccache ninja
brew install glew
elif [[ "$RUNNER_OS" == "Windows" ]]; then
Expand Down Expand Up @@ -260,14 +260,14 @@ runs:
echo '---- pip show numpy scipy ----'
$PYTHON_EXE -m pip show numpy scipy
echo '------------------------------'
- name: Setup cache for pybind11 files
uses: actions/cache@v2
id: pybind11_cache
with:
path: ${{ env.PYBIND11_INSTALL_DIR }}
key: pybind11-${{ inputs.pybind11_version }}_${{ runner.os }}_python-${{ inputs.python_version }}_${{ hashFiles('**/*.yml') }}

- name: Install pybind11 ${{ inputs.pybind11_version }}
shell: bash
run: |
Expand All @@ -278,7 +278,7 @@ runs:
elif [ -e "$(command -v pybind11-config-${{ inputs.python_version }})" ]; then
pybind11_DIR="$(pybind11-config-${{ inputs.python_version }} --cmakedir)"
fi
- name: Setup cache for Qt files
if: inputs.sofa_scope != 'minimal'
Expand Down Expand Up @@ -395,7 +395,7 @@ runs:
run: |
if ! ls -a "${{ inputs.sofa_root }}"/* >/dev/null 2>&1; then # cache check
# directory does not exist or is empty
if [ -n "${{ steps.get_sofa_from_github.outputs.id }}" ]; then
# Release was found on GitHub
SOFA_OS_GITHUB="$RUNNER_OS"
Expand All @@ -413,7 +413,7 @@ runs:
unzip -qq "${{ runner.temp }}"/sofa_tmp/zip/sofa.zip -d "${{ runner.temp }}/sofa_tmp/binaries"
$SUDO mkdir -p "${{ inputs.sofa_root }}"
$SUDO mv "${{ runner.temp }}"/sofa_tmp/binaries/SOFA_*/* "${{ inputs.sofa_root }}"
else
# Release was not found on GitHub, try to get it from Jenkins
SOFA_OS_JENKINS="$RUNNER_OS"
Expand All @@ -439,7 +439,7 @@ runs:
$SUDO mkdir -p "${{ inputs.sofa_root }}"
$SUDO mv "${{ runner.temp }}"/sofa_tmp/binaries/SOFA_*/* "${{ inputs.sofa_root }}"
fi
fi # cache check
- name: Log SOFA install directory
Expand Down

0 comments on commit 08adcf0

Please sign in to comment.