diff options
| author | Vikram Karve <vikram.karve@progress.com> | 2023-02-22 17:40:09 +0530 |
|---|---|---|
| committer | Vikram Karve <vikram.karve@progress.com> | 2023-03-06 18:07:49 +0530 |
| commit | 0ff7ffc0487b8d57a7e8138b06d0ca2e9ba8ce64 (patch) | |
| tree | ff218dfef1cceff6b64119e862ebc2d52ebf659c | |
| parent | 03f1dc8b8cc6e8b1d7f3d2899d766eacef48f3a8 (diff) | |
| download | chef-0ff7ffc0487b8d57a7e8138b06d0ca2e9ba8ce64.tar.gz | |
test with no rebase attempt
Signed-off-by: Vikram Karve <vikram.karve@progress.com>
| -rw-r--r-- | .buildkite/hooks/pre-command | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 1b0c100896..b056ea6e13 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -49,14 +49,16 @@ if [[ "$BUILDKITE_BRANCH" != "main" ]]; then main=$(git show-ref -s --abbrev origin/main) pr_head=$(git show-ref -s --abbrev HEAD) github="https://github.com/chef/chef/commit/" - if git rebase origin/main >/dev/null; then - buildkite-agent annotate --style success --context "rebase-pr-branch-${main}" \ - "Rebased onto main ([${main}](${github}${main}))." - else - git rebase --abort - buildkite-agent annotate --style warning --context "rebase-pr-branch-${main}" \ - "Couldn't rebase onto main ([${main}](${github}${main})), building PR HEAD ([${pr_head}](${github}${pr_head}))." - fi + + git checkout "$BUILDKITE_BRANCH" + # if git rebase origin/main >/dev/null; then + # buildkite-agent annotate --style success --context "rebase-pr-branch-${main}" \ + # "Rebased onto main ([${main}](${github}${main}))." + # else + # git rebase --abort + # buildkite-agent annotate --style warning --context "rebase-pr-branch-${main}" \ + # "Couldn't rebase onto main ([${main}](${github}${main})), building PR HEAD ([${pr_head}](${github}${pr_head}))." + # fi fi # Only if on chef-canary or chef org |