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

In Optimize 7, auto-merging is enabled for successful Renovate PRs #4615

Closed
4 tasks done
tasso94 opened this issue Sep 16, 2024 · 6 comments
Closed
4 tasks done

In Optimize 7, auto-merging is enabled for successful Renovate PRs #4615

tasso94 opened this issue Sep 16, 2024 · 6 comments
Assignees

Comments

@tasso94
Copy link
Member

tasso94 commented Sep 16, 2024

Acceptance Criteria (Required on creation)

In Optimize 7, auto-merging is enabled for successful Renovate PRs.

Hints

  • When the CI succeeds, auto-merge Renovate dependency bump PRs.
  • GitHub branch protection rules for auto merging cannot handle dynamic workflow spawning depending on the respective path (paths-filter action).
  • This workflow passes when all other checks are green or skipped and fails if any check fails.
  • The workflow is timer triggered after 60 minutes (delayenv) to ensure that all checks are complete.
    • Alternatively, we need to configure the action to poll the status according to an interval if checks are still running after the last interval-triggered run.
    • Since we only want to use this to enable auto-merging for Renovate PRs, it's most likely fine to wait 60 minutes statically.
  • The workflow only runs when the dependencies label exists and is skipped otherwise.
    • This allows manual merging of PRs when the check is skipped (e.g., when run on a feature branch).

Caution

Enable branch protection for maintenance branches before merge.

Links

Breakdown

To be reviewed commits on master:

Pull Requests

Dev2QA handover

  • Does this ticket need a QA test and the testing goals are not clear from the description? Add a Dev2QA handover comment
@tasso94 tasso94 added type:task Issues that are a change to the project that is neither a feature nor a bug fix. version:optimize 3.15.0 version:optimize 3.14.0 and removed version:optimize 3.15.0 labels Sep 16, 2024
@tasso94 tasso94 added the scope:optimize Changes to Optimize. label Sep 18, 2024
@yanavasileva yanavasileva reopened this Oct 11, 2024
@yanavasileva
Copy link
Member

yanavasileva commented Oct 11, 2024

Made steps:
Enabled automerge in github settings of the repo according to: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository#managing-auto-merge

❗ e2e tests are failing since yesterday so automerge will be blocked until they are fixed. FE were contacted about it: link

@yanavasileva
Copy link
Member

@yanavasileva
Copy link
Member

CI is still unstable so moving back to backlog for now.

@yanavasileva
Copy link
Member

@yanavasileva
Copy link
Member

Do we need to revert any of the settings that we made for this ticket?

@tasso94
Copy link
Member Author

tasso94 commented Nov 15, 2024

Do we need to revert any of the settings that we made for this ticket?

IMO the current configuration is a good first increment. Don't see any redflags after reviewing it. We can tweak it later.

@yanavasileva yanavasileva assigned tasso94 and unassigned yanavasileva Nov 15, 2024
@tasso94 tasso94 closed this as completed Nov 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants