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

sync: release-23.x to next #3373

Merged
merged 2 commits into from
Dec 18, 2024
Merged

sync: release-23.x to next #3373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19cb46a
fix: update customFileHeader during tokens build (#3371)
adamstankiewicz Dec 18, 2024
b2755fb
build: update analyze-dependents base branch to next (#3372)
adamstankiewicz Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/workflows/analyze-dependents.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,6 @@ jobs:
with:
repository: openedx/frontend-template-application
path: dependent-usage-analyzer/.projects/frontend-template-application
- name: Checkout edx/prospectus
uses: actions/checkout@v3
with:
repository: edx/prospectus
path: dependent-usage-analyzer/.projects/prospectus
token: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
- name: Checkout openedx/studio-frontend
uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -274,7 +268,7 @@ jobs:
body: "Contains automated changes to the dependent-usage.json file, which provides the data for Paragon Usage Insights."
labels: automerge
branch: dependent-usage-analyzer/update-dependent-usage-json
base: master
base: next
- name: Auto-approve pull request for dependent project usages
uses: hmarr/auto-approve-action@v2
with:
Expand Down
1 change: 0 additions & 1 deletion dependent-usage-analyzer/checkout-dependents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ mkdir .projects
git clone [email protected]:edx/frontend-lib-special-exams.git --depth 1
git clone [email protected]:openedx/frontend-platform.git --depth 1
git clone [email protected]:openedx/frontend-template-application.git --depth 1
git clone [email protected]:edx/prospectus.git --depth 1
git clone [email protected]:openedx/studio-frontend.git --depth 1
git clone [email protected]:edx/frontend-app-communications --depth 1
git clone [email protected]:edx/frontend-app-learner-dashboard.git -- depth 1
Expand Down
4 changes: 2 additions & 2 deletions styles/css/core/custom-media-breakpoints.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly, this file was auto-generated. while transforming design tokens.
* See <root>/tokens/README.md for more details.
* Do not edit directly, this file was auto-generated.
* See <PARAGON_ROOT>/tokens/README.md for more details.
*/

@custom-media --pgn-size-breakpoint-min-width-xs (min-width: 0px);
Expand Down
4 changes: 2 additions & 2 deletions styles/css/core/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly, this file was auto-generated. while transforming design tokens.
* See <root>/tokens/README.md for more details.
* Do not edit directly, this file was auto-generated.
* See <PARAGON_ROOT>/tokens/README.md for more details.
*/

:root {
Expand Down
4 changes: 2 additions & 2 deletions styles/css/themes/light/utility-classes.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly, this file was auto-generated. while transforming design tokens.
* See <root>/tokens/README.md for more details.
* Do not edit directly, this file was auto-generated.
* See <PARAGON_ROOT>/tokens/README.md for more details.
*/

.bg-accent-a {
Expand Down
4 changes: 2 additions & 2 deletions styles/css/themes/light/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly, this file was auto-generated. while transforming design tokens.
* See <root>/tokens/README.md for more details.
* Do not edit directly, this file was auto-generated.
* See <PARAGON_ROOT>/tokens/README.md for more details.
*/

:root {
Expand Down
4 changes: 2 additions & 2 deletions tokens/style-dictionary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@ const initializeStyleDictionary = async ({ themes }) => {
StyleDictionary.registerFileHeader({
name: 'customFileHeader',
fileHeader: (defaultMessage) => [
`${defaultMessage} while transforming design tokens.`,
'See <root>/tokens/README.md for more details.',
`${defaultMessage}`,
'See <PARAGON_ROOT>/tokens/README.md for more details.',
],
});

Expand Down
Loading