diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml index 518f7a2d7f7d3249df1847341938854eba56c612..1f05c5fda838e9ae9e61d267a56b512a467a427a 100644 --- a/.oniro-ci/build-generic.yaml +++ b/.oniro-ci/build-generic.yaml @@ -52,19 +52,8 @@ fi; echo "CI: Switching $CI_ONIRO_GIT_REPO_PATH to $CI_COMMIT_SHA"; ( cd "$CI_ONIRO_GIT_REPO_PATH" && git checkout "$CI_COMMIT_SHA" ); - if [ -n "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" ]; then - ( cd "$CI_ONIRO_GIT_REPO_PATH" && git lfs pull incoming-merged ); - fi; fi - # Some of the repo projects come with LFS configuration (that repo refuses - # to initialize). See: - # https://gerrit-review.googlesource.com/c/git-repo/+/83130/. As per this - # limitation, the repositories using LFS blobs need to be pulled manually. - # Now that repo synced all projects and we handled fork-based merge - # requests, we can pull all the LFS blobs. - - find -type d -name .git -execdir git lfs pull \; - script: # Reload the value of SCRATCH_DIR set in the before_script phase. Those run # in separate shell processes and do not share environment variables. @@ -306,7 +295,6 @@ name: registry.booting.oniroproject.org/distro/oniro/docs-builder:latest stage: build script: - - (cd docs && git lfs pull) - make -C docs artifacts: paths: