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.

Sign up for GitHub

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

Jump to bottom

build: switch base to trying a rebase #2047

Merged
merged 1 commit into from
Feb 17, 2023
Merged

build: switch base to trying a rebase #2047

merged 1 commit into from
Feb 17, 2023

Conversation

adamstankiewicz
Copy link
Member

@adamstankiewicz adamstankiewicz commented Feb 17, 2023 •
edited
Loading

Description

Another attempt to automatically sync changes from master to alpha

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.

@adamstankiewicz adamstankiewicz merged commit ab68dc4 into master Feb 17, 2023
@adamstankiewicz adamstankiewicz deleted the ags/sync-alpha-master-pt10 branch February 17, 2023 18:47
@netlify
Copy link

netlify bot commented Feb 17, 2023 •
edited
Loading

✅ Deploy Preview for paragon-openedx ready!

Name Link
🔨 Latest commit d4c3744
🔍 Latest deploy log https://app.netlify.com/sites/paragon-openedx/deploys/63efcb98ac008000081ab8ef
😎 Deploy Preview https://deploy-preview-2047--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 added a commit that referenced this pull request Feb 17, 2023
@adamstankiewicz
build: switch base to trying a rebase (#2047)
8f11005
edx-requirements-bot added a commit that referenced this pull request Feb 17, 2023
@edx-requirements-bot @adamstankiewicz
@viktorrusakov @PKulkoRaccoonGang
chore(release): sync from master to alpha (#2054)
dd5d3a4 
* 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)

* feat: alpha release of design tokens (#1770)

* build: add alpha/beta to release CI workflow

* feat: design tokens with style-dictionary

BREAKING CHANGE: Introduces design tokens.

* [BD-46] resolve bootstrap conflicts with design tokens (#1800)

* feat: resolve some Bootstrap conflicts with design tokens

Co-authored-by: Peter Kulko <93188219+PKulkoRaccoonGang@users.noreply.github.com>

* feat: add ability to generate CSS utility classes through design tokens

* docs: added background-color for color HEX values on CSS utility classes page

* fix: add missed border utilities

* docs: add ability to view CSS variables on CSS Utility Classes page

* chore: remove unused import

* feat: remove deprecated components

BREAKING CHANGE: all of the deprecated components were removed from Paragon, these include `CheckBoxGroup`, `Checkbox`, `Fieldset`, `Input`, `InputSelect`, `InputText`, `ListBox`, `Modal`, `RadioButtonGroup`, `StatusAlert`, `Table`, `TextArea`, `ValidationFormGroup`, `Button.Deprecated`, `Tabs.Deprecated`, `Dropdown.Deprecated`.

* chore: update tokens for Modal components

* docs: display computed CSS variables on components' pages

* refactor: update design tokens structure

* feat: add CLI interface for design tokens (#1846)

* fix: install dependencies in tokens module after installing Paragon

* fix: remove package.json files from tokens module

* refactor: update design tokens structure

* refactor: replace old tables with `DataTable` on documentation site (#1859)

* [BD-46] refactor: improve design tokens architecture (#1874)

* refactor: update design tokens naming and add missing ones

* feat: expose replace vars script to CLI

Co-authored-by: Viktor Rusakov <vrusakov66@gmail.com>

* build: add workflow_dispatch to alpha branch to trigger release

* fix: trigger release

* fix: added custom title for CSS output files (#1985)

* feat: deleted value in reference design tokens (#1989)

* fix: ensure design tokens have a valid type attribute (#1992)

Adds `type` attribute to all design tokens per W3C design tokens spec.

* fix: add missing tokens for Button component (#1924)

* feat: add new tokens and cleanup after rebase

* feat: alpha release of design tokens (#1770)

* feat: design tokens with style-dictionary

BREAKING CHANGE: Introduces design tokens.

* [BD-46] resolve bootstrap conflicts with design tokens (#1800)

* feat: resolve some Bootstrap conflicts with design tokens

Co-authored-by: Peter Kulko <93188219+PKulkoRaccoonGang@users.noreply.github.com>

* feat: add ability to generate CSS utility classes through design tokens

* docs: added background-color for color HEX values on CSS utility classes page

* fix: add missed border utilities

* docs: add ability to view CSS variables on CSS Utility Classes page

* chore: remove unused import

* feat: remove deprecated components

BREAKING CHANGE: all of the deprecated components were removed from Paragon, these include `CheckBoxGroup`, `Checkbox`, `Fieldset`, `Input`, `InputSelect`, `InputText`, `ListBox`, `Modal`, `RadioButtonGroup`, `StatusAlert`, `Table`, `TextArea`, `ValidationFormGroup`, `Button.Deprecated`, `Tabs.Deprecated`, `Dropdown.Deprecated`.

* chore: update tokens for Modal components

* refactor: update design tokens structure

* feat: add CLI interface for design tokens (#1846)

* fix: install dependencies in tokens module after installing Paragon

* fix: remove package.json files from tokens module

* refactor: update design tokens structure

* [BD-46] refactor: improve design tokens architecture (#1874)

* refactor: update design tokens naming and add missing ones

* feat: expose replace vars script to CLI

Co-authored-by: Viktor Rusakov <vrusakov66@gmail.com>

* fix: trigger release

* feat: deleted value in reference design tokens (#1989)

* fix: ensure design tokens have a valid type attribute (#1992)

Adds `type` attribute to all design tokens per W3C design tokens spec.

* fix: add missing tokens for Button component (#1924)

* Revert "chore(release): sync from master to alpha (#2040)"

This reverts commit 14ba07c.

* feat: add new tokens and cleanup after rebase

---------

Co-authored-by: Adam Stankiewicz <agstanki@gmail.com>
Co-authored-by: Viktor Rusakov <52399399+viktorrusakov@users.noreply.github.com>
Co-authored-by: Peter Kulko <93188219+PKulkoRaccoonGang@users.noreply.github.com>
Co-authored-by: Viktor Rusakov <vrusakov66@gmail.com>
adamstankiewicz added a commit that referenced this pull request Feb 20, 2023
@adamstankiewicz
build: switch base to trying a rebase (#2047)
718f3b3
adamstankiewicz added a commit that referenced this pull request Feb 22, 2023
@adamstankiewicz @github-actions @edx-requirements-bot
chore: sync alpha with master (#2070)
00fbc1d 
* 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 <49161187+edx-requirements-bot@users.noreply.github.com>
@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
Reviewers
No reviews
Assignees
No one assigned
Labels
released on @alpha released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@adamstankiewicz @edx-semantic-release