Skip to content
This repository has been archived by the owner on Jun 21, 2024. It is now read-only.

Latest commit

 

History

History
20 lines (13 loc) · 1.84 KB

README.md

File metadata and controls

20 lines (13 loc) · 1.84 KB
Raw

⚠️ Deprecation Notice: This GitHub action is deprecated and development will not continue here. We recommend migrating to the latest version available in the espressif/sync-pr-to-gitlab project.

Sync approved PRs to internal codebase

This script automates the process of creating branches and PRs on the internal codebase of Espressif based on approved PRs on Github.

Flow

  1. When the PR is ready to merge after reviewing, the user needs to add a comment on the PR of the type sha=1a2b3c4 where sha specifies the SHA1 hash (long or short) of the most recent commit to be merged/updated.
  2. The PR is then affixed with a label PR-Sync-Merge, PR-Sync-Rebase or PR-Sync-Update, triggering the action of syncing the PR. (Labels can only be affixed by a user with an access level > TRIAGE in Github)
  3. The PR-Sync-Merge label will create an internal PR by fetching the Github PR branch head and pushing it to the internal remote (for new PRs - close to the current master branch). This should be the preferred strategy while syncing.
  4. The PR-Sync-Rebase label will create an internal PR by rebasing the Github PR on the latest internal master (for old PRs).
  5. The PR-Sync-Update label will update the internal PR with new commits/changes on the PR fork branch. For triggering the update workflow after it has been already run once, remove and re-affix the PR-Sync-Update label.

To-Do:

  • Behaviour when PR contains multiple commits (ref)

  • Handling of conflicts while using the rebase approach