Skip to content

feat: add labels option for the backport and copy commands#2334

Merged
mergify[bot] merged 1 commit intoMergifyio:masterfrom
v1v:feature/backport-with-labels
Apr 2, 2021
Merged

feat: add labels option for the backport and copy commands#2334
mergify[bot] merged 1 commit intoMergifyio:masterfrom
v1v:feature/backport-with-labels

Conversation

@v1v
Copy link
Copy Markdown
Contributor

@v1v v1v commented Mar 30, 2021

Description of the change

Add labels option for the backport and copy commands.

Related issues

Fix #2288

Checklists

Development

  • All checks must pass (Semantic Pull Request, pep8, requirements, unit tests, functional tests, security checks, …)
  • The code changed/added as part of this pull request must be covered with tests
  • Hotfixes must have a link to Sentry issue and the hotfix label
  • Features must have a link to a Linear task

Code Review

Code review policies are handled and automated by Mergify.

  • When all tests pass, reviewers will be assigned automatically.
  • When change is approved by at least one review and no pending review are
    remaining, pull request is retested against its base branch.
  • The pull request is then merged automatically.

@v1v v1v changed the title Add labels option for the backport and copy commands feat: add labels option for the backport and copy commands Mar 30, 2021
@v1v
Copy link
Copy Markdown
Contributor Author

v1v commented Mar 30, 2021

I've no clue how to test this locally:

  • tox -e test-docker fails with
ERROR: InvocationError for command /Users/vmartinez/work/src/github.com/v1v/mergify-engine/run-tests.sh docker run --rm --net=host --env-file test.env -e 'MERGIFYENGINE_STORAGE_URL=redis://localhost:6363?db=2' -e 'MERGIFYENGINE_STREAM_URL=redis://localhost:6363?db=3' -e PORT=8802 -p 8802 engine-dev aio (exited with code 125)
  • tox -e test fails with
12:06:44 bridge.1 | voluptuous.error.MultipleInvalid: required key not provided @ data['BOT_USER_ID']
12:06:44 system   | bridge.1 stopped (rc=1)
12:06:44 system   | sending SIGTERM to engine.1 (pid 18890)
12:06:44 engine.1 | 12:06:44 system   | SIGTERM received
12:06:44 engine.1 | Traceback (most recent call last):
12:06:44 engine.1 |   File "/Users/vmartinez/work/src/github.com/v1v/mergify-engine/.tox/test/bin/honcho", line 8, in <module>

In addition I've no clue how to generate the testdata, I'd appreciate any help in that regard

Thanks

@v1v v1v force-pushed the feature/backport-with-labels branch from 2cea20d to 9fbe1db Compare March 30, 2021 11:47
Comment thread docs/source/actions/copy.rst Outdated
- string
- ``conflicts``
- The label to add to the created pull requested if it has conflicts and
- The label to add to the created pull requests if it has conflicts and
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I fixed a bunch of those in #2335 !

@jd
Copy link
Copy Markdown
Member

jd commented Mar 30, 2021

@sileht that looks good to me
Can you take a look and record the test if that works for you?

sileht
sileht previously approved these changes Apr 2, 2021
Copy link
Copy Markdown
Member

@sileht sileht left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks good, I will take of generating the fixture for functional tests.

@sileht sileht force-pushed the feature/backport-with-labels branch from 2a5c3bf to 71a5ba9 Compare April 2, 2021 10:02
@sileht sileht requested a review from jd April 2, 2021 10:02
@mergify mergify Bot dismissed sileht’s stale review April 2, 2021 10:02

Pull request has been modified.

@sileht sileht marked this pull request as ready for review April 2, 2021 10:02
@sileht sileht self-requested a review April 2, 2021 10:03
sileht
sileht previously approved these changes Apr 2, 2021
@sileht sileht force-pushed the feature/backport-with-labels branch from 71a5ba9 to 8a51c17 Compare April 2, 2021 10:17
@mergify mergify Bot dismissed sileht’s stale review April 2, 2021 10:18

Pull request has been modified.

@sileht sileht force-pushed the feature/backport-with-labels branch from 8a51c17 to d002ecf Compare April 2, 2021 10:19
@mergify mergify Bot requested a review from a team April 2, 2021 10:24
@mergify mergify Bot merged commit 3dfdd3a into Mergifyio:master Apr 2, 2021
@v1v v1v deleted the feature/backport-with-labels branch April 6, 2021 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

Assign labels to the backported PRs

3 participants