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

build: add GH workflow to sync alpha with master automatically #2030

Merged
merged 1 commit into from
Feb 17, 2023

Conversation

adamstankiewicz
Copy link
Member

Description

We are maintaining an alpha branch for the design tokens project. This PR proposes setting up automation to sync alpha whenever there are changes to master by automatically opening a PR that gets auto-merged to master once CI status checks pass.

Uses this Github Action: https://github.com/TreTuna/sync-branches

Deploy Preview

N/A

Merge Checklist

  • If your update includes visual changes, have they been reviewed by a designer? Send them a link to the Netlify deploy preview, if applicable.
  • Does your change adhere to the documented style conventions?
  • Do any prop types have missing descriptions in the Props API tables in the documentation site (check deploy preview)?
  • Were your changes tested using all available themes (see theme switcher in the header of the deploy preview, under the "Settings" icon)?
  • Were your changes tested in the example app?
  • Is there adequate test coverage for your changes?
  • Consider whether this change needs to reviewed/QA'ed for accessibility (a11y). If so, please add wittjeff and adamstankiewicz as reviewers on this PR.

Post-merge Checklist

  • Verify your changes were released to NPM at the expected version.
  • If you'd like, share your contribution in #show-and-tell.
  • 🎉 🙌 Celebrate! Thanks for your contribution.

@netlify
Copy link

netlify bot commented Feb 17, 2023

Deploy Preview for paragon-openedx ready!

Name Link
🔨 Latest commit 46e27a7
🔍 Latest deploy log https://app.netlify.com/sites/paragon-openedx/deploys/63ef7df922fcf200082b12a7
😎 Deploy Preview https://deploy-preview-2030--paragon-openedx.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@adamstankiewicz adamstankiewicz changed the title ci: add GH workflow to sync alpha with master automatically build: add GH workflow to sync alpha with master automatically Feb 17, 2023
@codecov
Copy link

codecov bot commented Feb 17, 2023

Codecov Report

Base: 90.82% // Head: 90.82% // No change to project coverage 👍

Coverage data is based on head (46e27a7) compared to base (f58eb9e).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2030   +/-   ##
=======================================
  Coverage   90.82%   90.82%           
=======================================
  Files         233      233           
  Lines        4099     4099           
  Branches      971      971           
=======================================
  Hits         3723     3723           
  Misses        369      369           
  Partials        7        7           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@adamstankiewicz adamstankiewicz merged commit 3138169 into master Feb 17, 2023
@adamstankiewicz adamstankiewicz deleted the ags/sync-alpha-master-workflow branch February 17, 2023 13:50
adamstankiewicz added a commit that referenced this pull request Feb 22, 2023
* docs: update dependent-usage.json (#2028)

* build: add GH workflow to sync alpha with master automatically (#2030)

* docs: update dependent-usage.json (#2032)

* build: update sync workflow for alpha (#2033)

* build: include fetch-depth: 0 to checkout (#2034)

* build: setup git user in sync branches workflow (#2035)

* build: add a branch for generated workflow PR (#2037)

* build: skip CI for automation sync PR (#2039)

* build: skip CI for automation sync PR

* build: skip commitlint check for automated sync PRs

* chore: update browserslist DB (#1977)

* build: rebase instead of merge for syncing changes (#2042)

* build: another attempt to auto-sync changes from master to alpha (#2044)

* build: 1 to v1 in sync-branches workflow (#2045)

* build: switch base to trying a rebase (#2047)

* build: pull from alpha before rebase master (#2049)

* build: git checkout instead of git switch (#2051)

* build: set base branch to alpha (#2053)

* build: try using devmasx/merge-branch (#2055)

* build: update merge-branch version number (#2056)

* build: try action-sync-branch (#2057)

* build: remove sync alpha master workflow temporarily (#2059)

* docs: update dependent-usage.json (#2060)

* docs: update dependent-usage.json (#2061)

* docs: update dependent-usage.json (#2063)

* docs: update dependent-usage.json (#2065)

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: edX requirements bot <[email protected]>
@edx-semantic-release
Copy link
Contributor

🎉 This PR is included in version 21.0.0-alpha.14 🎉

The release is available on:

Your semantic-release bot 📦🚀

@edx-semantic-release
Copy link
Contributor

🎉 This PR is included in version 20.28.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

2 participants