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

feat(renovate): split trunk-base and release branches strategies #2743

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

kpanot
Copy link
Contributor

@kpanot kpanot commented Jan 27, 2025

Proposed change

feat(renovate): split trunk-base and release branches strategies
feat(renovate): register node-version update in base

Related issues

@kpanot kpanot requested a review from a team as a code owner January 27, 2025 17:21
@kpanot kpanot force-pushed the feature/renovate-branching-model branch from 3819087 to 3462963 Compare January 27, 2025 17:35
Copy link

nx-cloud bot commented Jan 27, 2025

View your CI Pipeline Execution ↗ for commit 3d917d0.

Command Status Duration Result
nx run-many --target=test-int ✅ Succeeded 1s View ↗
nx run-many --target=test-e2e ✅ Succeeded 9m 53s View ↗
nx run-many --target=build --projects=eslint-pl... ✅ Succeeded <1s View ↗
nx run-many --target=publish --nx-bail --userco... ✅ Succeeded 1m 49s View ↗
nx run-many --target=documentation ✅ Succeeded 1m 22s View ↗
nx affected --target=test --collectCoverage ✅ Succeeded <1s View ↗
nx run ama-sdk-schematics:build-swagger ✅ Succeeded 1s View ↗
nx run-many --target=build ✅ Succeeded 21s View ↗
Additional runs (3) ✅ Succeeded ... View ↗

☁️ Nx Cloud last updated this comment at 2025-01-29 16:29:13 UTC

@github-actions github-actions bot added the enhancement New feature or request label Jan 27, 2025
"packageRules": [
{
// TODO: replace the following matchers to `matchManagers` when https://github.com/renovatebot/renovate/issues/21760 is fixed
"matchDatasources": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we remove these lines from the preset?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not exactly removed, it is part of rules on node-version in release-branches.json

Comment on lines 117 to 129
},
{
// TODO: replace the following matchers to `matchManagers` when https://github.com/renovatebot/renovate/issues/21760 is fixed
"matchDatasources": [
"node-version"
],
"matchFileNames": [
"**/.github/workflows/**/*.y{a,}ml",
"**/__dot__github/workflows/**/*.y{a,}ml",
"**/__empty__.github/workflows/**/*.y{a,}ml",
"**/action.y{a,}ml"
],
"enable": true
Copy link
Contributor

@fpaul-1A fpaul-1A Jan 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need that in our config, does that mean it's needed for all applications using our presets ?

Copy link
Contributor Author

@kpanot kpanot Jan 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed indeed, I moved it here temporary and forgot to re-update this file :S

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't it still needed in the preset release-branches though? if we want the node upgrades on main branch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is added line 28

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we no longer have an issue with renovatebot/renovate#21760 ?

Copy link
Contributor Author

@kpanot kpanot Jan 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still have it but as the I prefer to keep the release-branches as JSON (to not enforce the user to add the extension), I will add a point in a readme file instead

@kpanot kpanot force-pushed the feature/renovate-branching-model branch from 3462963 to 0e584ca Compare January 29, 2025 02:53
fpaul-1A
fpaul-1A previously approved these changes Jan 29, 2025
feat(renovate): register node-version update in base
@kpanot kpanot force-pushed the feature/renovate-branching-model branch from 0e584ca to 3d917d0 Compare January 29, 2025 15:14
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not necessarily linked to this PR but it would be nice to group this upgrade and the npm upgrade of @types/node in the same group

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
3 participants