Skip to content

fix: issues in CI tasks implementation #950

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

Merged
VasilyStrelyaev merged 1 commit into from
Apr 25, 2025
Merged

fix: issues in CI tasks implementation #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/schedule-cli-tests-latest-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Run CLI tests
uses: ./.github/workflows/applications.yml
with:
external-tools-version-tag: latest
deps-version-tag: latest

teams_notification_on_failure:
name: Send Teams notification
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-cli-tests-next-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Run CLI tests
uses: ./.github/workflows/applications.yml
with:
external-tools-version-tag: next
deps-version-tag: next

teams_notification_on_failure:
name: Send Teams notification
Expand Down
13 changes: 9 additions & 4 deletions packages/devextreme-cli/src/applications/application.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,19 @@ const updateJsonPropName = (path, name) => {
});
};

const bumpReact = (appPath, versionTag) => {
const bumpReact = (appPath, versionTag, isTypeScript) => {
const dependencies = [
{ name: 'react', version: versionTag },
{ name: 'react-dom', version: versionTag },
{ name: '@types/react', version: versionTag, dev: true },
{ name: '@types/react-dom', version: versionTag, dev: true },
];

if(isTypeScript) {
dependencies.push(
{ name: '@types/react', version: versionTag, dev: true },
{ name: '@types/react-dom', version: versionTag, dev: true },
);
}

packageJsonUtils.addDependencies(appPath, dependencies);
};

Expand All @@ -86,7 +91,7 @@ const create = async(appName, options) => {
modifyIndexHtml(appPath, templateOptions.project);

if(depsVersionTag) {
bumpReact(appPath, depsVersionTag);
bumpReact(appPath, depsVersionTag, templateOptions.isTypeScript);
}

addTemplate(appPath, appName, templateOptions);
Expand Down
Loading