consolidate git SHA printouts (b907638f) · Commits · IVAS Codec Public Collaboration / IVAS Codec CI

snippets/basop/branch-is-up-to-date-with-target-pre.sh

+8 −11

Original line number	Diff line number	Diff line
		@@ -51,16 +51,9 @@ if [ $commits_behind_count -ne 0 ]; then
		exit 1
		fi

		# stop echoing from here on, this is anyway only dbg printout
		set +x
		# if we are up-to-date, store the commit SHA for all branches

		# if we are up-to-date, store the commit SHA's for all branches
		MERGE_TARGET_COMMIT="$(git rev-parse "origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME")"
		echo "MERGE_TARGET_COMMIT is $MERGE_TARGET_COMMIT"
		echo "$MERGE_TARGET_COMMIT" >"$MERGE_TARGET_COMMIT_FILE"

		set -x

		# to get the commit SHAs for the float reference branches, we need to get the main branch from float repo
		# below here we will be in the float repo!
		cd "${SCRIPTS_DIR}"
		@@ -69,14 +62,18 @@ git fetch origin "$float_ref_branchname_in_ivas_codec"
		git checkout "$float_ref_branchname_in_ivas_codec"
		git pull

		MERGE_SOURCE_FLOAT_REF_COMMIT="$(git rev-parse "origin/$float_ref_branchname_in_ivas_codec")"
		FLOAT_REF_COMMIT="$(git rev-parse "origin/main")"

		# stop echoing from here on, this is anyway only dbg printout
		set +x
		#set +x

		echo "MERGE_TARGET_COMMIT is $MERGE_TARGET_COMMIT"
		echo "$MERGE_TARGET_COMMIT" >"$MERGE_TARGET_COMMIT_FILE"

		MERGE_SOURCE_FLOAT_REF_COMMIT="$(git rev-parse "origin/$float_ref_branchname_in_ivas_codec")"
		echo "MERGE_SOURCE_FLOAT_REF_COMMIT is $MERGE_SOURCE_FLOAT_REF_COMMIT"
		echo "$MERGE_SOURCE_FLOAT_REF_COMMIT" >"$MERGE_SOURCE_FLOAT_REF_COMMIT_FILE"

		FLOAT_REF_COMMIT="$(git rev-parse "origin/main")"
		echo "FLOAT_REF_COMMIT is $FLOAT_REF_COMMIT"
		echo "$FLOAT_REF_COMMIT" >"$FLOAT_REF_COMMIT_FILE"