Fix documentation deployment (#248)

* Fix documentation deployment * Add logging * Fix bug * Fix again
Illumina · Jan 7, 2021 · 610da20 · 610da20
1 parent 3863a76
commit 610da20
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/docs/src/changes.md b/docs/src/changes.md
@@ -1,6 +1,14 @@
 # Changes                                               {#changes}
 
 
+
+## v1.1.20
+
+Date       | Description
+---------- | -----------
+2021-01-05 | Fix documentation deployment
+
+
 ## v1.1.19
 
 Date       | Description

diff --git a/tools/package.sh b/tools/package.sh
@@ -85,7 +85,7 @@ if [ ! -z "$8" ] ; then
     MORE_FLAGS="$8"
 fi
 
-echo "-------------------------------"
+echo "------------------------------------------------------------"
 echo "package.sh Configuration"
 echo "Source path: ${SOURCE_PATH}"
 echo "Artifact path: ${ARTIFACT_PATH}"
@@ -95,15 +95,11 @@ echo "Build Type: ${BUILD_TYPE}"
 echo "Python Version: ${PYTHON_VERSION}"
 echo "Build Number: ${ARTFACT_BUILD_NUMBER}"
 echo "Additional Flags: ${MORE_FLAGS}"
-echo "-------------------------------"
+echo "------------------------------------------------------------"
 
 CMAKE_EXTRA_FLAGS="-DDISABLE_PACKAGE_SUBDIR=${DISABLE_SUBDIR} -DENABLE_PORTABLE=ON -DENABLE_BACKWARDS_COMPATIBILITY=$INTEROP_C89 -DCMAKE_BUILD_TYPE=$BUILD_TYPE $MORE_FLAGS"
 
 
-if [ "$PYTHON_VERSION" == "None" ] ; then
-    PYTHON_VERSION=
-fi
-
 if [ "$PYTHON_VERSION" == "Disable" ] ; then
     CMAKE_EXTRA_FLAGS="-DENABLE_SWIG=OFF $CMAKE_EXTRA_FLAGS"
 fi
@@ -169,7 +165,7 @@ if [ -z $PYTHON_VERSION ] && [  -e /opt/python ] ; then
     done
 fi
 
-if [ "$PYTHON_VERSION" != "" ] && [ "$PYTHON_VERSION" != "Disable" ] && [ "$PYTHON_VERSION" != "DotNetStandard" ] ; then
+if [ "$PYTHON_VERSION" != "" ] && [ "$PYTHON_VERSION" != "Disable" ] && [ "$PYTHON_VERSION" != "DotNetStandard" ] && [ "$PYTHON_VERSION" != "None" ] ; then
     if [ "$PYTHON_VERSION" == "ALL" ] ; then
         # python_versions="2.7.17 3.5.9 3.6.10 3.7.7 3.8.2 3.9.x"
         python_versions="2.7.17 3.5.9"
@@ -259,17 +255,15 @@ if [ "$PYTHON_VERSION" != "" ] && [ "$PYTHON_VERSION" != "Disable" ] && [ "$PYTH
     done
 fi
 
-
-if [ "$PYTHON_VERSION" == "Disable" ] ; then
+echo "------------------------------------------------------------"
+echo "Run additional package code: $PYTHON_VERSION"
+echo "------------------------------------------------------------"
+if [ "$PYTHON_VERSION" == "Disable" ] || [ "$PYTHON_VERSION" == "None" ] ; then
     run "Configure" cmake $SOURCE_PATH -B${BUILD_PATH} ${CMAKE_EXTRA_FLAGS} -DENABLE_SWIG=OFF
     run "Build" cmake --build $BUILD_PATH -- -j${THREAD_COUNT}
     run "Test" cmake --build $BUILD_PATH --target check -- -j${THREAD_COUNT}
     run "Package" cmake --build $BUILD_PATH --target bundle
-elif [ "$PYTHON_VERSION" == "None" ]  ;then
-  run "Package" cmake --build $BUILD_PATH --target bundle
-fi
-
-if [ "$PYTHON_VERSION" == "DotNetStandard" ] ; then
+elif [ "$PYTHON_VERSION" == "DotNetStandard" ] ; then
 
   # Workaround for OSX
   export PATH=/usr/local/share/dotnet:${PATH}