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

[cascading] from release/11.6 to release/12.0.0-rc #2799

Merged
merged 6 commits into from
Feb 5, 2025
Merged

[cascading] from release/11.6 to release/12.0.0-rc #2799

merged 6 commits into from
Feb 5, 2025

Conversation

otter-cascading[bot]
Copy link
Contributor

@otter-cascading otter-cascading bot commented Feb 5, 2025 •
edited
Loading

Cascading from release/11.6 to release/12.0.0-rc

❗ The pull request is conflicting with the target branch.
You can fix the issue locally with the following commands:

Using gh CLI 
gh pr checkout 2799
git pull --ff origin release/12.0.0-rc

and update this Pull Request with

gh pr push 2799
Using git only 
git fetch origin
git checkout origin/cascading/11.6.0-12.0.0-rc
git pull --ff origin release/12.0.0-rc

and update this Pull Request with

git push origin HEAD:cascading/11.6.0-12.0.0-rc

This Pull Request has been generated with ❤️ by the Otter cascading tool.

fpaul-1A and others added 2 commits February 4, 2025 16:31
@fpaul-1A
fix(eslint): yarn pnp support for import rules
3daaf9e
@fpaul-1A
fix(eslint): yarn pnp support for import rules (#2794)
846b514 
## Proposed change

<!--
Please include a summary of the changes and the related issue.
Please also include relevant motivation and context.
-->

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@otter-cascading otter-cascading bot requested a review from a team as a code owner February 5, 2025 08:35
@otter-cascading otter-cascading bot added the cascading Cascading from previous release label Feb 5, 2025
fpaul-1A
fpaul-1A previously approved these changes Feb 5, 2025
View reviewed changes
@nx-cloud Nx Cloud
Copy link

nx-cloud bot commented Feb 5, 2025 •
edited
Loading

View your CI Pipeline Execution ↗ for commit d346463.

Command Status Duration Result
nx run-many --target=test-int ✅ Succeeded 1h 5m 39s View ↗
nx run-many --target=test-e2e ✅ Succeeded 7m 13s View ↗
nx run-many --target=build --projects=eslint-pl... ✅ Succeeded 1s View ↗
nx run-many --target=publish --nx-bail --userco... ✅ Succeeded 34s View ↗
nx run-many --target=prepare-publish --exclude-... ✅ Succeeded 1m 16s View ↗
nx run-many --target=build,build-swagger ✅ Succeeded 12m 11s View ↗
nx affected --target=test --collectCoverage ✅ Succeeded 1m 23s View ↗
nx affected --target=lint ✅ Succeeded 2m 25s View ↗
Additional runs (2) ✅ Succeeded ... View ↗

☁️ Nx Cloud last updated this comment at 2025-02-05 14:56:42 UTC

@codecov Codecov
Copy link

codecov bot commented Feb 5, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 66.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 66.72%. Comparing base (94b8f1e) to head (d346463).
Report is 7 commits behind head on release/12.0.0-rc.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...hematics/src/rule-factories/ng-add/dependencies.ts 66.66% 0 Missing and 1 partial ⚠️
Additional details and impacted files

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@fpaul-1A fpaul-1A enabled auto-merge February 5, 2025 10:57
vscaiceanu-1a and others added 2 commits February 5, 2025 13:27
@vscaiceanu-1a
fix: enforce install if dependencies have ng add (#2795)
128492a 
## Proposed change

Perform the install if a dependency has an `ng-add` schematics *and* is
not installed yet, even if the parent schematics has `skipInstall` to
`true` (which is the default value).

## Related issues

<!-- * 🐛 Fix #issue -->
* 🐛 Fix resolves #2766 
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
@otter-cascading
Merge release/11.6 into cascading/11.6.0-12.0.0-rc
f007c91
@otter-cascading otter-cascading bot dismissed stale reviews from matthieu-crouzet and fpaul-1A via f007c91 February 5, 2025 11:27
@fpaul-1A
Merge branch 'release/12.0.0-rc' of https://github.com/AmadeusITGroup…
d346463 
…/otter into HEAD

# Conflicts:
#	packages/@o3r/schematics/src/rule-factories/ng-add/dependencies.ts
@fpaul-1A fpaul-1A merged commit 232a2d8 into release/12.0.0-rc Feb 5, 2025
27 of 28 checks passed
@fpaul-1A fpaul-1A deleted the cascading/11.6.0-12.0.0-rc branch February 5, 2025 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthieu-crouzet matthieu-crouzet matthieu-crouzet approved these changes

@fpaul-1A fpaul-1A fpaul-1A approved these changes

Assignees
No one assigned
Labels
cascading Cascading from previous release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@matthieu-crouzet @fpaul-1A @vscaiceanu-1a