Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged 0 commits into branch: message displays when a non-Source Code change is made in github_automerge_feature task #3471

Open
Julian88Tex opened this issue Dec 16, 2022 · 0 comments
Labels

Comments

@Julian88Tex
Copy link
Contributor

Julian88Tex commented Dec 16, 2022

Describe the bug

When github_automerge_feature task runs in ci_feature on a parent feature branch, changes successfully make it to child branches, but the message in CLI logs looks something like this:

Merged 0 commits into branch: feature/child-1__grandchild-2 
Completed flow 'ci_feature' on org dev successfully!

I expect to see Merged 1 commits or greater in the log. This is misleading since a commit was indeed merged to child branches but the message suggests it wasn't.

This does not always occur. There seems to be a pattern but I haven't figured it out.

Examples of when you get the unexpected message Merged 0 commits:

  • Change to ReadMe
  • Creation of test.txt file

Examples of when you get the expected Merged 1 commits (or more):

  • Change to class in force-app source code
  • Adding a comment to .gitignore
  • Change to cumulusci.yml file

Reproduction steps

  1. Create feature/child-1 branch feature/child-1__grandchild-1 and feature/child-1__grandchild-2 branches
  2. Create a GitHub Action on feature/child-1 branch that runs ci_feature on merges
  3. Make a change to ReadMe a child branch named feature/child-1__grandchild-1
  4. Merge feature/child-1__grandchild-1 into feature/child-1
  5. Wait for ci_feature action to finish
  6. View action logs

Result: Merged 0 commits
Expected: Merged 1 commits

Your CumulusCI and Python versions

CumulusCI version: 3.70.0 (/Users/julianjoseph/.local/bin/cci)
Python version: 3.10.0 (/Users/julianjoseph/.local/pipx/venvs/cumulusci/bin/python)

Operating System

Image: ubuntu-22.04 8 Version: 20221212.1

Windows environment

No response

CumulusCI installation method

pip

Error Gist

No response

Additional information

No response

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant