Improving version check

nv-morpheus · Jul 31, 2023 · 9532bfe · 9532bfe
1 parent 35887fc
commit 9532bfe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -67,7 +67,11 @@ function sed_runner() {
 # .gitmodules
 git submodule set-branch -b branch-${NEXT_SHORT_TAG} external/morpheus-visualizations
 git submodule set-branch -b branch-${NEXT_SHORT_TAG} morpheus_utils
-git submodule update --remote --recursive
+
+if [[ "$(git diff --name-only | grep .gitmodules)" != "" ]]; then
+   # Only update the submodules if setting the branch changed .gitmodules
+   git submodule update --remote --recursive
+fi
 
 # Root CMakeLists.txt
 sed_runner 's/'"VERSION ${CURRENT_FULL_VERSION}.*"'/'"VERSION ${NEXT_FULL_VERSION}"'/g' CMakeLists.txt

diff --git a/ci/scripts/common.sh b/ci/scripts/common.sh
@@ -13,11 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# set -x
-
 export SCRIPT_DIR=${SCRIPT_DIR:-"$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"}
-export REPO_DIR=$(realpath ${REPO_DIR:-"${SCRIPT_DIR}/../.."})
-export PY_ROOT="${REPO_DIR}"
+
+# The root to the Morpheus repo
+export MORPHEUS_ROOT=${MORPHEUS_ROOT:-"$(realpath ${SCRIPT_DIR}/../..)"}
+
+export PY_ROOT="${MORPHEUS_ROOT}"
 export PY_CFG="${PY_ROOT}/setup.cfg"
 export PY_DIRS="${PY_ROOT} ci/scripts"
 
@@ -40,7 +41,7 @@ export SKIP_ISORT=${SKIP_ISORT:-""}
 export SKIP_YAPF=${SKIP_YAPF:-""}
 
 # Set BUILD_DIR to use a different build folder
-export BUILD_DIR=${BUILD_DIR:-"${REPO_DIR}/build"}
+export BUILD_DIR=${BUILD_DIR:-"${MORPHEUS_ROOT}/build"}
 
 # Speficy the clang-tools version to use. Default 14
 export CLANG_TOOLS_VERSION=${CLANG_TOOLS_VERSION:-14}
@@ -194,4 +195,4 @@ function cleanup {
 trap cleanup EXIT
 
 # Change directory to the repo root
-pushd "${REPO_DIR}" &> /dev/null
+pushd "${MORPHEUS_ROOT}" &> /dev/null
diff --git a/ci/scripts/run_iwyu_for_ci.sh b/ci/scripts/run_iwyu_for_ci.sh
@@ -23,7 +23,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 # Call iwyu_tool.py and append IWYU arguments onto the end
 ${IWYU_TOOL_PY:-iwyu_tool.py} "$@" -- \
-   -Xiwyu --mapping_file=${REPO_DIR:-${SCRIPT_DIR}/../..}/ci/iwyu/mappings.imp \
+   -Xiwyu --mapping_file=${MORPHEUS_ROOT:-${SCRIPT_DIR}/../..}/ci/iwyu/mappings.imp \
    -Xiwyu --verbose=${IWYU_VERBOSITY:-1} \
    -Xiwyu --no_fwd_decls \
    -Xiwyu --quoted_includes_first \