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

Mikhail Goncharov via llvm-commits llvm-commits at lists.llvm.org
Fri Oct 13 08:05:11 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/9] 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/9] 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/9] 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/9] 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

>From abdb036a956afc32cf84e730c26682bca3a5dc2f Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail at gmail.com>
Date: Fri, 13 Oct 2023 15:13:24 +0200
Subject: [PATCH 5/9] >2

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

diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index baa88152025983c..9d76a50b9debadc 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -24,7 +24,7 @@ set -o pipefail
 # List of files affected by this commit
 : ${MODIFIED_FILES:=$(git diff --name-only HEAD~1)}
 echo "pulling main"
-git fetch origin main:main
+git fetch origin main:main >&2
 echo "files modified HEAD~1" >&2
 git --no-pager diff --name-only HEAD~1 >&2
 echo "files modified main..." >&2

>From 8b1adde679dfa8eb60c404a74ed1e37d97cc83bf Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail at gmail.com>
Date: Fri, 13 Oct 2023 15:16:33 +0200
Subject: [PATCH 6/9] another echo to stderr

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

diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index 9d76a50b9debadc..cccfc14984957b5 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -23,7 +23,7 @@ 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"
+echo "pulling main" >&2
 git fetch origin main:main >&2
 echo "files modified HEAD~1" >&2
 git --no-pager diff --name-only HEAD~1 >&2

>From d8ab1802704b4653ea368917707411684ec95aff Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail at gmail.com>
Date: Fri, 13 Oct 2023 15:20:26 +0200
Subject: [PATCH 7/9] test change in a different file

---
 .ci/generate-buildkite-pipeline-scheduled | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ci/generate-buildkite-pipeline-scheduled b/.ci/generate-buildkite-pipeline-scheduled
index d5c7c5965ef6a17..06954a138f148b1 100755
--- a/.ci/generate-buildkite-pipeline-scheduled
+++ b/.ci/generate-buildkite-pipeline-scheduled
@@ -17,6 +17,7 @@
 set -eu
 set -o pipefail
 
+# test
 # Filter rules for generic windows tests
 : ${WINDOWS_AGENTS:='{"queue": "windows"}'}
 # Filter rules for generic linux tests

>From 3c9f45a00f46a5864518e35dd8f9e98969176cc5 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail at gmail.com>
Date: Fri, 13 Oct 2023 16:59:36 +0200
Subject: [PATCH 8/9] another change

---
 .ci/generate-buildkite-pipeline-scheduled | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.ci/generate-buildkite-pipeline-scheduled b/.ci/generate-buildkite-pipeline-scheduled
index 06954a138f148b1..d5c7c5965ef6a17 100755
--- a/.ci/generate-buildkite-pipeline-scheduled
+++ b/.ci/generate-buildkite-pipeline-scheduled
@@ -17,7 +17,6 @@
 set -eu
 set -o pipefail
 
-# test
 # Filter rules for generic windows tests
 : ${WINDOWS_AGENTS:='{"queue": "windows"}'}
 # Filter rules for generic linux tests

>From 8308bc4e8f4ff6c3a7fb666b0a077e8cf0a456b6 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail at gmail.com>
Date: Fri, 13 Oct 2023 17:04:53 +0200
Subject: [PATCH 9/9] don't pull main in script

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

diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index cccfc14984957b5..f7f746b8d94df3e 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -23,8 +23,6 @@ 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" >&2
-git fetch origin main:main >&2
 echo "files modified HEAD~1" >&2
 git --no-pager diff --name-only HEAD~1 >&2
 echo "files modified main..." >&2



More information about the llvm-commits mailing list