Commit 930d529f authored by Jan Kiene's avatar Jan Kiene
Browse files

fix artifact creation in correct directory

improver commit printouts
parent b907638f
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ fi
MERGE_TARGET_COMMIT="$(git rev-parse "origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME")"
# 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}"
pushd "${SCRIPTS_DIR}"
git remote set-branches --add origin "$float_ref_branchname_in_ivas_codec"
git fetch origin "$float_ref_branchname_in_ivas_codec"
git checkout "$float_ref_branchname_in_ivas_codec"
@@ -64,17 +64,20 @@ 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")"
popd

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

echo "MERGE_TARGET_COMMIT is $MERGE_TARGET_COMMIT"
echo "CI_COMMIT_SHA (this branch) is $CI_COMMIT_SHA"

echo "MERGE_TARGET_COMMIT (on branch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME) is $MERGE_TARGET_COMMIT"
echo "$MERGE_TARGET_COMMIT" >"$MERGE_TARGET_COMMIT_FILE"

echo "MERGE_SOURCE_FLOAT_REF_COMMIT is $MERGE_SOURCE_FLOAT_REF_COMMIT"
echo "MERGE_SOURCE_FLOAT_REF_COMMIT (on branch $float_ref_branchname_in_ivas_codec in ivas-codec repo) is $MERGE_SOURCE_FLOAT_REF_COMMIT"
echo "$MERGE_SOURCE_FLOAT_REF_COMMIT" >"$MERGE_SOURCE_FLOAT_REF_COMMIT_FILE"

echo "FLOAT_REF_COMMIT is $FLOAT_REF_COMMIT"
echo "FLOAT_REF_COMMIT (on branch main in ivas-codec repo) is $FLOAT_REF_COMMIT"
echo "$FLOAT_REF_COMMIT" >"$FLOAT_REF_COMMIT_FILE"

# create commits.env file for passing the variables to other jobs