buildkite: Add some debug for looking into rebase issue
Add debug ls of .git dir to see at what point we have a .git/rebase-merge dir around Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
parent
82855aa4e0
commit
3b5a43e031
3 changed files with 6 additions and 0 deletions
|
@ -6,6 +6,8 @@
|
|||
# Save off where we started so we can go back there
|
||||
WORKDIR=${PWD}
|
||||
|
||||
ls -lsa .git
|
||||
|
||||
if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
|
||||
git fetch -v origin ${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
|
||||
git checkout FETCH_HEAD
|
||||
|
@ -17,6 +19,7 @@ if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
|
|||
git merge --abort
|
||||
exit $merge_result
|
||||
}
|
||||
ls -lsa .git
|
||||
fi
|
||||
|
||||
mkdir -p /var/lib/buildkite-agent/zephyr-ccache/
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
steps:
|
||||
- command:
|
||||
- ls -lsa .git
|
||||
- .buildkite/run.sh
|
||||
- ls -lsa .git
|
||||
env:
|
||||
ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
|
||||
ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.11.3"
|
||||
|
|
|
@ -21,6 +21,7 @@ echo ""
|
|||
echo "--- ccache stats at start"
|
||||
ccache -s
|
||||
|
||||
ls -lsa .git
|
||||
if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
|
||||
./scripts/ci/run_ci.sh -c -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} -r origin \
|
||||
-m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT} -p ${BUILDKITE_PULL_REQUEST}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue