Skip to content

Commit

Permalink
build(client): Move flub bump config settings (microsoft#22630)
Browse files Browse the repository at this point in the history
The defaultInterdependencyRange setting in the fluid-build config is no
longer where settings for `flub bump` should be stored. Instead, they
should be defined in a `bump` setting in the flub config.

This change is related to microsoft#22628. This change will make the changes in
microsoft#22628 irrelevant in main and future release branches, but they are
still needed so the tools work against release branches without this
change (2.3 client and before).
  • Loading branch information
tylerbutler authored Sep 26, 2024
1 parent 96bf7d1 commit e0ad436
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 5 deletions.
17 changes: 17 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,23 @@
"type": "node",
"args": ["test-only-filter", "--all"],
},
{
"name": "flub bump build-tools",
"program": "${workspaceFolder}/build-tools/packages/build-cli/bin/dev.js",
"cwd": "${workspaceFolder}",
"request": "launch",
"skipFiles": ["<node_internals>/**"],
"type": "node",
"args": [
"bump",
"build-tools",
"-t",
"patch",
"--verbose",
"--no-commit",
"--no-install",
],
},
{
"name": "flub bump deps",
"program": "${workspaceFolder}/build-tools/packages/build-cli/bin/dev.js",
Expand Down
18 changes: 13 additions & 5 deletions fluidBuild.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const tscDependsOn = ["^tsc", "^api", "build:genver", "ts2esm"];
* See https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-tools/src/common/fluidTaskDefinitions.ts
* for details on the task and dependency definition format.
*
* @type {import("@fluidframework/build-tools").IFluidBuildConfig}
* @type {import("@fluidframework/build-tools").IFluidBuildConfig & import("@fluid-tools/build-cli").FlubConfig}
*/
module.exports = {
version: 1,
Expand Down Expand Up @@ -167,19 +167,15 @@ module.exports = {
},
"build-tools": {
directory: "build-tools",
defaultInterdependencyRange: "workspace:~",
},
"server": {
directory: "server/routerlicious",
defaultInterdependencyRange: "workspace:~",
},
"gitrest": {
directory: "server/gitrest",
defaultInterdependencyRange: "^",
},
"historian": {
directory: "server/historian",
defaultInterdependencyRange: "^",
},

// Independent packages
Expand Down Expand Up @@ -534,6 +530,18 @@ module.exports = {
},
},

// `flub bump` config. These settings influence `flub bump` behavior for a release group. These settings can be
// overridden usig explicit CLI flags like `--interdependencyRange`.
bump: {
defaultInterdependencyRange: {
"client": "workspace:~",
"build-tools": "workspace:~",
"server": "workspace:~",
"gitrest": "^",
"historian": "^",
},
},

// This defines the branch release types for type tests. It applies only to the client release group. Settings for
// other release groups is in their root fluid-build config.
branchReleaseTypes: {
Expand Down

0 comments on commit e0ad436

Please sign in to comment.