feat(platform/bitbucket): use development branching model as default branch #20803

setchy · 2023-03-08T05:12:00Z

Changes

Updates the Bitbucket Cloud repository initialization logic to fetch and set the development branch name instead of relying only on the main branch name.

Context

Closes Bitbucket Cloud: initialize repos with development branch #20802

Documentation (please check one with an [x])

I have updated the documentation, or
No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

Code inspection only, or
Newly added/modified unit tests, or
No unit tests but ran on a real repository, or
Both unit tests + ran on a real repository

…ebot#19942) Changes `rangeStrategy` default value from `'replace'` to `'auto'`. Changes `auto` behavior so that `update-lockfile` is preferred if the manager supports the `updateLockedDependency()` function. Closes renovatebot#19800 BREAKING CHANGE: Renovate will now default to updating locked dependency versions. To revert to previous behavior, configure rangeStrategy=replace.

…novatebot#19958) Sets new defaults: - `prConcurrentLimit`: 10 (instead of 0) - `prHourlyLimit`: 2 (instead of 0) Closes renovatebot#19800 BREAKING CHANGE: Renovate now defaults to applying hourly and concurrent PR limits. To revert to unlimited, configure them back to `0`.

Set default GOPROXY value to match `go`'s own default. Closes renovatebot#20040 BREAKING CHANGE: Renovate will now use go's default `GOPROXY` settings. To avoid using the public proxy, configure `GOPROXY=direct`.

Checks file cache for expired items at the end of a run. Non-breaking change but it may result in some long cleanup jobs for any bots which have been left to populate their package cache for a long time. Closes renovatebot#13732

…ebot#20150) Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>

…novatebot#20474)

…git tag, and preserve existing digest semantics as separate datasource (renovatebot#20178) Co-authored-by: RahulGautamSingh <rahultesnik@gmail.com> Co-authored-by: Rhys Arkins <rhys@arkins.net> Co-authored-by: Michael Kriese <michael.kriese@visualon.de> Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>

…#20221)

Removes "includeForks" option and replaces with "forkProcessing". New default behavior is to process forks if automerge=false. Closes renovatebot#20752 BREAKING CHANGE: Forked repos will now be processed automatically if autodiscover=false. includeForks is removed and replaced by new option forkProcessing.

rarkins

Please mark as breaking and target v35 branch

setchy · 2023-03-08T05:23:56Z

Please mark as breaking and target v35 branch

Sure - can do.

Will add a few more test cases also

…enarios

…ebot#19942) Changes `rangeStrategy` default value from `'replace'` to `'auto'`. Changes `auto` behavior so that `update-lockfile` is preferred if the manager supports the `updateLockedDependency()` function. Closes renovatebot#19800 BREAKING CHANGE: Renovate will now default to updating locked dependency versions. To revert to previous behavior, configure rangeStrategy=replace.

…novatebot#19958) Sets new defaults: - `prConcurrentLimit`: 10 (instead of 0) - `prHourlyLimit`: 2 (instead of 0) Closes renovatebot#19800 BREAKING CHANGE: Renovate now defaults to applying hourly and concurrent PR limits. To revert to unlimited, configure them back to `0`.

Co-authored-by: Rhys Arkins <rhys@arkins.net>

setchy · 2023-03-08T21:43:16Z

Blocked by #20800

I see #20800 and #20811 as being related to this change, but not blocking this change.

I'd like to propose this feature request moves forward as it has benefits for any new PRs and there are a few manual workarounds teams can use (or currently use) to correct existing PRs, such as

manually updating the open PR to target their develop branch
rename the Bitbucket PR, close it and then let Renovate raise a new one with the correct target branch during the next cycle

setchy · 2023-03-08T22:23:08Z

this is a breaking change, we should disable new behavior with a repo config option.

was able to make this a non-breaking change by adding the bbUseDevelopmentBranch config option and defaulting it to false.

@rarkins - with this in place, is it still OK to target this PR to v35?

viceice · 2023-03-09T18:38:00Z

this is a breaking change, we should disable new behavior with a repo config option.

was able to make this a non-breaking change by adding the bbUseDevelopmentBranch config option and defaulting it to false.

@rarkins - with this in place, is it still OK to target this PR to v35?

you can target main when it's not breaking.

do you plan to support more branching models? so this config option should be a enum with null being disabled / current behavior ?

docs/usage/self-hosted-configuration.md

lib/config/options/index.ts

lib/modules/platform/bitbucket/types.ts

setchy · 2023-03-09T19:25:00Z

do you plan to support more branching models? so this config option should be a enum with null being disabled / current behavior ?

Can you please explain a bit more about what you mean by "more branching models"?

Development branch is Atlassian Bitbucket terminology and can be configured to any branch. Examples below on how this could be configured by each repository admin

lib/modules/platform/bitbucket/index.ts

rarkins · 2023-03-10T12:55:27Z

Sorry this was closed unintentionally by GitHub when v35 was closed

setchy · 2023-03-10T20:27:08Z

Sorry this was closed unintentionally by GitHub when v35 was closed

All good. Will re-open a new PR to continue the discussion

RahulGautamSingh and others added 19 commits March 4, 2023 06:29

feat(config)!: add new option constraintsFiltering (renovatebot#19992)

040d348

feat(cache): default cacheHardTtlMinutes to 24 hours (renovatebot#20079)

7d9ce6a

feat(go)!: default GOPROXY (renovatebot#20081)

abdee35

Set default GOPROXY value to match `go`'s own default. Closes renovatebot#20040 BREAKING CHANGE: Renovate will now use go's default `GOPROXY` settings. To avoid using the public proxy, configure `GOPROXY=direct`.

fix(regex): don’t escape forward slash in fileMatch (renovatebot#19314)

2f4e448

feat(cache): file cache cleanup (renovatebot#20061)

bbe71cf

Checks file cache for expired items at the end of a run. Non-breaking change but it may result in some long cleanup jobs for any bots which have been left to populate their package cache for a long time. Closes renovatebot#13732

feat(config): default dockerImagePrefix to containerbase (renovat…

956c9c1

…ebot#20150) Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>

chore: fix artifacts tests

92b3082

fix(versioning)!: bump short ranges to version (renovatebot#20494)

3d6898e

refactor!: use packageName and not depName for datasource lookups (re…

dec97be

…novatebot#20474)

feat!: default to semver-coerced instead of semver (renovatebot#20573)

a6bbf93

chore: fix packagist tests

a2bc23c

feat!: internalChecksAsSuccess (renovatebot#20572)

789238c

refactor!: prefer packageName over depName in datasource (renovatebot…

4bbfd40

…#20221)

feat: set bitbucket development branch as default

ec66dbb

feat: set bitbucket development branch as default

3a8bfd1

rarkins requested changes Mar 8, 2023

View reviewed changes

setchy added the breaking Breaking change, requires major version bump label Mar 8, 2023

fix type import

933e6b3

setchy marked this pull request as draft March 8, 2023 05:24

setchy changed the base branch from main to v35 March 8, 2023 05:24

feat: update to check if branch exists. added unit tests for these sc…

217785a

…enarios

setchy marked this pull request as ready for review March 8, 2023 05:34

RahulGautamSingh and others added 3 commits March 8, 2023 06:34

feat(config)!: add new option constraintsFiltering (renovatebot#19992)

d41fe0f

setchy and others added 5 commits March 8, 2023 09:51

Update docs/usage/configuration-options.md

24407ed

Co-authored-by: Rhys Arkins <rhys@arkins.net>

Update lib/config/options/index.ts

81b22b6

Co-authored-by: Rhys Arkins <rhys@arkins.net>

make configuration option global. reword verbiage.

091f1bb

refactor main branch logic based on PR feedback

6e20975

remove global option

9d2704b

setchy marked this pull request as ready for review March 8, 2023 22:26

setchy requested review from rarkins and viceice March 8, 2023 22:28

make config global only

fa59473

viceice reviewed Mar 9, 2023

View reviewed changes

docs/usage/self-hosted-configuration.md Show resolved Hide resolved

lib/config/options/index.ts Show resolved Hide resolved

lib/modules/platform/bitbucket/types.ts Outdated Show resolved Hide resolved

revert mainbranch rename

d37cbd1

viceice reviewed Mar 9, 2023

View reviewed changes

lib/modules/platform/bitbucket/index.ts Show resolved Hide resolved

setchy changed the base branch from v35 to main March 9, 2023 23:21

setchy changed the base branch from main to v35 March 9, 2023 23:21

rarkins force-pushed the v35 branch 4 times, most recently from 181a4d7 to a4ab452 Compare March 10, 2023 08:34

rarkins deleted the branch renovatebot:v35 March 10, 2023 09:53

rarkins closed this Mar 10, 2023

This was referenced Mar 10, 2023

Feature/bitbucket development branch #20859

Closed

feat(platform/bitbucket): add support for Bitbucket development branching model #20860

Merged

github-actions bot locked as resolved and limited conversation to collaborators Apr 10, 2023

setchy deleted the feature/bitbucket-development-branch branch April 18, 2023 12:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(platform/bitbucket): use development branching model as default branch #20803

feat(platform/bitbucket): use development branching model as default branch #20803

setchy commented Mar 8, 2023 •

edited by viceice

Loading

rarkins left a comment

setchy commented Mar 8, 2023

setchy commented Mar 8, 2023

setchy commented Mar 8, 2023 •

edited

Loading

viceice commented Mar 9, 2023

setchy commented Mar 9, 2023

rarkins commented Mar 10, 2023

setchy commented Mar 10, 2023

feat(platform/bitbucket): use development branching model as default branch #20803

feat(platform/bitbucket): use development branching model as default branch #20803

Conversation

setchy commented Mar 8, 2023 • edited by viceice Loading

Changes

Context

Documentation (please check one with an [x])

How I've tested my work (please select one)

rarkins left a comment

Choose a reason for hiding this comment

setchy commented Mar 8, 2023

setchy commented Mar 8, 2023

setchy commented Mar 8, 2023 • edited Loading

viceice commented Mar 9, 2023

setchy commented Mar 9, 2023

rarkins commented Mar 10, 2023

setchy commented Mar 10, 2023

setchy commented Mar 8, 2023 •

edited by viceice

Loading

setchy commented Mar 8, 2023 •

edited

Loading