diff --git a/.ci/start_mapdl.sh b/.ci/start_mapdl.sh index 26962a8557..68d028c4a4 100755 --- a/.ci/start_mapdl.sh +++ b/.ci/start_mapdl.sh @@ -13,16 +13,16 @@ export VERSION="$MAJOR$MINOR" echo "MAPDL VERSION: $VERSION" -if [[ $MAPDL_VERSION == *"ubuntu"* ]] ; then - echo "It is an ubuntu based image" - export EXEC_PATH=/ansys_inc/v$VERSION/ansys/bin/mapdl - export P_SCHEMA=/ansys_inc/v$VERSION/ansys/ac4/schema - -elif [[ $MAPDL_VERSION == *"latest-ubuntu"* ]]; then +if [[ $MAPDL_VERSION == *"latest-ubuntu"* ]]; then echo "It is latest-ubuntu. Using 'ansys' script to launch" export EXEC_PATH=ansys # export P_SCHEMA=/ansys_inc/ansys/ac4/schema +elif [[ $MAPDL_VERSION == *"ubuntu"* ]] ; then + echo "It is an ubuntu based image" + export EXEC_PATH=/ansys_inc/v$VERSION/ansys/bin/mapdl + export P_SCHEMA=/ansys_inc/v$VERSION/ansys/ac4/schema + else echo "It is a CentOS based image" export EXEC_PATH=/ansys_inc/ansys/bin/mapdl diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c244e1672..4a9e77d8d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -709,12 +709,12 @@ jobs: # Because there is no 'ansys-tools-path' we need to input the # executable path with the env var: PYMAPDL_MAPDL_EXEC. - if [[ $MAPDL_VERSION == *"latest-ubuntu"* ]] ; then + if [[ "${{ matrix.mapdl-image }}" == *"latest-ubuntu"* ]] ; then version="242" else version=$(echo "${{ matrix.mapdl-image }}" | head -c 5 | tail -c 4 | tr -d '.') fi; - + echo "$version" export PYMAPDL_MAPDL_EXEC=/ansys_inc/v"$version"/ansys/bin/ansys"$version"