Loading .gitlab-ci.yml +1 −4 Original line number Diff line number Diff line Loading @@ -66,9 +66,6 @@ stages: echo "Commit time was $CI_COMMIT_TIMESTAMP" ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression .get-previous-merge-commit-sha: &get-previous-merge-commit-sha - previous_merge_commit=$(git --no-pager log --merges HEAD~1 -n 1 --pretty=format:%H) .mr-fetch-target-branch: &mr-fetch-target-branch # first delete local target branch to avoid conflicts when branch is cached and there are merge conflicts during fetching # depending on chaching, the branch may not be there, so prevent failure of this command -> should maybe be done smarter later Loading Loading @@ -1314,7 +1311,7 @@ codec-comparison-on-main-push: script: - bash "$CI_PROJECT_DIR"/.gitlab-ci/snippets/print-common-info.sh - latest_commit=$(git rev-parse HEAD) # Latest commit - *get-previous-merge-commit-sha # Stored in previous_merge_commit shell variable now - previous_merge_commit=$(git --no-pager log --merges HEAD~1 -n 1 --pretty=format:%H) - echo "Comparing changes from $previous_merge_commit to $latest_commit" - git --no-pager diff --stat $previous_merge_commit..$latest_commit Loading Loading
.gitlab-ci.yml +1 −4 Original line number Diff line number Diff line Loading @@ -66,9 +66,6 @@ stages: echo "Commit time was $CI_COMMIT_TIMESTAMP" ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression .get-previous-merge-commit-sha: &get-previous-merge-commit-sha - previous_merge_commit=$(git --no-pager log --merges HEAD~1 -n 1 --pretty=format:%H) .mr-fetch-target-branch: &mr-fetch-target-branch # first delete local target branch to avoid conflicts when branch is cached and there are merge conflicts during fetching # depending on chaching, the branch may not be there, so prevent failure of this command -> should maybe be done smarter later Loading Loading @@ -1314,7 +1311,7 @@ codec-comparison-on-main-push: script: - bash "$CI_PROJECT_DIR"/.gitlab-ci/snippets/print-common-info.sh - latest_commit=$(git rev-parse HEAD) # Latest commit - *get-previous-merge-commit-sha # Stored in previous_merge_commit shell variable now - previous_merge_commit=$(git --no-pager log --merges HEAD~1 -n 1 --pretty=format:%H) - echo "Comparing changes from $previous_merge_commit to $latest_commit" - git --no-pager diff --stat $previous_merge_commit..$latest_commit Loading