[llvm] add logging to pipeline generation (PR #68983)

Mikhail Goncharov via llvm-commits llvm-commits at lists.llvm.org
Fri Oct 13 06:11:54 PDT 2023


https://github.com/metaflow updated https://github.com/llvm/llvm-project/pull/68983

>From 31ad9c9bf1f5df67e1e33573237fafb67eff23f5 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail at gmail.com>
Date: Fri, 13 Oct 2023 14:19:59 +0200
Subject: [PATCH 1/4] add logging to pipeline generation

we tried to generate a full diff against main in
ec9d80ec43f5761a34c4a785c67d9e7d21ec8bda but it resulted in wrong diffs
[citation needed]. Trying to debug this by adding logs.
---
 .ci/generate-buildkite-pipeline-premerge | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index e389df431505bd1..9e69ab0e194f190 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -23,6 +23,15 @@ set -o pipefail
 # Environment variables script works with:
 # List of files affected by this commit
 : ${MODIFIED_FILES:=$(git diff --name-only HEAD~1)}
+echo "files modified HEAD~1" >&2
+git diff --name-only HEAD~1 >&2
+echo "files modified main..." >&2
+git diff --name-only main...HEAD >&2
+echo "files modified origin/main..." >&2
+git diff --name-only origin/main...HEAD >&2
+merge_base=$(git merge-base main HEAD)
+echo "merge base with main $merge_base" >&2
+git diff --name-only "$merge_base"..HEAD >&2
 # Filter rules for generic windows tests
 : ${WINDOWS_AGENTS:='{"queue": "windows"}'}
 # Filter rules for generic linux tests

>From 9da3696805712ec212718a444809bec3c934c8ee Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail at gmail.com>
Date: Fri, 13 Oct 2023 14:51:40 +0200
Subject: [PATCH 2/4] no-pager

---
 .ci/generate-buildkite-pipeline-premerge | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index 9e69ab0e194f190..b2731ffebdd243a 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -24,14 +24,14 @@ set -o pipefail
 # List of files affected by this commit
 : ${MODIFIED_FILES:=$(git diff --name-only HEAD~1)}
 echo "files modified HEAD~1" >&2
-git diff --name-only HEAD~1 >&2
+git --no-pager diff --name-only HEAD~1 >&2
 echo "files modified main..." >&2
-git diff --name-only main...HEAD >&2
+git --no-pager diff --name-only main...HEAD >&2
 echo "files modified origin/main..." >&2
-git diff --name-only origin/main...HEAD >&2
+git --no-pager diff --name-only origin/main...HEAD >&2
 merge_base=$(git merge-base main HEAD)
-echo "merge base with main $merge_base" >&2
-git diff --name-only "$merge_base"..HEAD >&2
+echo "merge base with origin/main $merge_base" >&2
+git --no-pager diff --name-only "$merge_base"..HEAD >&2
 # Filter rules for generic windows tests
 : ${WINDOWS_AGENTS:='{"queue": "windows"}'}
 # Filter rules for generic linux tests

>From b86d23a6f6705eda5730c347434811434a99f2aa Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail at gmail.com>
Date: Fri, 13 Oct 2023 14:59:36 +0200
Subject: [PATCH 3/4] show git log too

---
 .ci/generate-buildkite-pipeline-premerge | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index b2731ffebdd243a..ad3e18ed86b1a39 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -32,6 +32,8 @@ git --no-pager diff --name-only origin/main...HEAD >&2
 merge_base=$(git merge-base main HEAD)
 echo "merge base with origin/main $merge_base" >&2
 git --no-pager diff --name-only "$merge_base"..HEAD >&2
+git remote -vv >&2
+git --no-pager log --oneline --abbrev-commit -n 10 >&2
 # Filter rules for generic windows tests
 : ${WINDOWS_AGENTS:='{"queue": "windows"}'}
 # Filter rules for generic linux tests

>From 07b354a4f38a23278314ec69cce1b74ec9e5ecc2 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail at gmail.com>
Date: Fri, 13 Oct 2023 15:11:31 +0200
Subject: [PATCH 4/4] pull main brach

---
 .ci/generate-buildkite-pipeline-premerge | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index ad3e18ed86b1a39..baa88152025983c 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -23,15 +23,17 @@ set -o pipefail
 # Environment variables script works with:
 # List of files affected by this commit
 : ${MODIFIED_FILES:=$(git diff --name-only HEAD~1)}
+echo "pulling main"
+git fetch origin main:main
 echo "files modified HEAD~1" >&2
 git --no-pager diff --name-only HEAD~1 >&2
 echo "files modified main..." >&2
-git --no-pager diff --name-only main...HEAD >&2
+git --no-pager diff --name-only main...HEAD | head -n 10 >&2
 echo "files modified origin/main..." >&2
-git --no-pager diff --name-only origin/main...HEAD >&2
+git --no-pager diff --name-only origin/main...HEAD | head -n 10 >&2
 merge_base=$(git merge-base main HEAD)
 echo "merge base with origin/main $merge_base" >&2
-git --no-pager diff --name-only "$merge_base"..HEAD >&2
+git --no-pager diff --name-only "$merge_base"..HEAD | head -n 10 >&2
 git remote -vv >&2
 git --no-pager log --oneline --abbrev-commit -n 10 >&2
 # Filter rules for generic windows tests



More information about the llvm-commits mailing list