From f2c44456216b7dca5c79f84ca9355e2a2b6a8e67 Mon Sep 17 00:00:00 2001 From: elsid Date: Sat, 22 Apr 2023 02:11:22 +0200 Subject: [PATCH] Fix preprocess code size script --- CI/ubuntu_gcc_preprocess.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/ubuntu_gcc_preprocess.sh b/CI/ubuntu_gcc_preprocess.sh index 1eefa13ead..3d38471569 100755 --- a/CI/ubuntu_gcc_preprocess.sh +++ b/CI/ubuntu_gcc_preprocess.sh @@ -45,13 +45,13 @@ if [[ "${GENERATE_ONLY}" ]]; then exit 0 fi -git remote add target "${CI_MERGE_REQUEST_SOURCE_PROJECT_URL:-https://gitlab.com/OpenMW/openmw.git}" +git remote add target "${CI_MERGE_REQUEST_PROJECT_URL:-https://gitlab.com/OpenMW/openmw.git}" TARGET_BRANCH="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-master}" git fetch target "${TARGET_BRANCH:?}" -BASE_VERSION=$(git merge-base "target/${TARGET_BRANCH:?}" HEAD) +BASE_VERSION=$(git merge-base "target/${TARGET_BRANCH:?}" "${VERSION:?}") # Save and use scripts from this commit because they may be absent or different in the base version cp scripts/preprocessed_file_size_stats.py scripts/preprocessed_file_size_stats.bak.py