setup for nightly build on linux

This commit is contained in:
alemuntoni 2021-03-28 11:44:10 +02:00
parent 2700563f1b
commit 56e73b1335
3 changed files with 15 additions and 6 deletions

View File

@ -27,15 +27,13 @@ jobs:
shell: bash
run: |
if [ "${{matrix.precision}}" == "double_precision" ]; then
echo ::set-output name=version::"$(cat ML_VERSION)d"
echo ::set-output name=artifact_suffix::"_double"
else
echo ::set-output name=version::"$(cat ML_VERSION)"
echo ::set-output name=artifact_suffix::""
fi
- name: Configure and Build
run: |
sh scripts/${{ runner.os }}/1_build.sh --${{ matrix.precision }}
sh scripts/${{ runner.os }}/1_build.sh --${{ matrix.precision }} --nightly
- name: Deploy
run: |
sh scripts/${{ runner.os }}/2_deploy.sh
@ -61,7 +59,7 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: meshlab_linux_appimage${{steps.envs.outputs.artifact_suffix}}
path: src/MeshLab${{steps.envs.outputs.version}}-linux.AppImage
path: src/MeshLab*.AppImage
#- name: Upload MeshLab deb
# uses: actions/upload-artifact@v2
# with:

View File

@ -18,6 +18,7 @@ BUILD_PATH=$SOURCE_PATH/build
INSTALL_PATH=$SOURCE_PATH/install/usr/
CORES="-j4"
DOUBLE_PRECISION_OPTION=""
NIGHTLY_OPTION=""
#check parameters
for i in "$@"
@ -39,6 +40,10 @@ case $i in
DOUBLE_PRECISION_OPTION="-DBUILD_WITH_DOUBLE_SCALAR=ON"
shift # past argument=value
;;
--nightly)
NIGHTLY_OPTION="-DMESHLAB_IS_NIGHTLY_VERSION=ON"
shift # past argument=value
;;
*)
# unknown option
;;
@ -61,6 +66,6 @@ BUILD_PATH=$(realpath $BUILD_PATH)
INSTALL_PATH=$(realpath $INSTALL_PATH)
cd $BUILD_PATH
cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $DOUBLE_PRECISION_OPTION $SOURCE_PATH
cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $DOUBLE_PRECISION_OPTION $NIGHTLY_OPTION $SOURCE_PATH
make $CORES
make install

View File

@ -11,7 +11,6 @@
SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
INSTALL_PATH=$SCRIPTS_PATH/../../src/install
ML_VERSION=$(cat $SCRIPTS_PATH/../../ML_VERSION)
#checking for parameters
@ -34,6 +33,13 @@ done
PARENT_NAME="$(dirname $INSTALL_PATH)"
#get version
IFS=' ' #space delimiter
STR_VERSION=$($INSTALL_PATH/usr/bin/meshlab --version)
read -a strarr <<< "$STR_VERSION"
ML_VERSION=${strarr[1]} #get the meshlab version from the string
export VERSION=$ML_VERSION
$SCRIPTS_PATH/resources/appimagetool $INSTALL_PATH