Skip to content

Commit 2531fe6

Browse files
authored
ci(release): fix tooling release pipeline (#34444)
1 parent 4cc5c6e commit 2531fe6

File tree

3 files changed

+24
-35
lines changed

3 files changed

+24
-35
lines changed

azure-pipelines.release.tools.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,19 @@ extends:
5959
displayName: yarn
6060

6161
- script: |
62-
FLUENT_PROD_BUILD=true yarn nx run-many -t build -p tag:tools --exclude 'apps/**' --nxBail
62+
echo "Following packages will be published(if they contain changes):"
63+
yarn nx show projects -p 'tag:tools,!tag:npm:private,!tag:v8' --exclude 'apps/**'
64+
65+
- script: |
66+
FLUENT_PROD_BUILD=true yarn nx run-many -t build -p 'tag:tools,!tag:npm:private,!tag:v8' --exclude 'apps/**' --nxBail
6367
displayName: build
6468
6569
- script: |
66-
FLUENT_PROD_BUILD=true yarn nx run-many -t test -p tag:tools --exclude 'apps/**' --nxBail
70+
FLUENT_PROD_BUILD=true yarn nx run-many -t test -p 'tag:tools,!tag:npm:private,!tag:v8' --exclude 'apps/**' --nxBail
6771
displayName: test
6872
6973
- script: |
70-
FLUENT_PROD_BUILD=true yarn nx run-many -t lint -p tag:tools --exclude 'apps/**' --nxBail
74+
FLUENT_PROD_BUILD=true yarn nx run-many -t lint -p 'tag:tools,!tag:npm:private,!tag:v8' --exclude 'apps/**' --nxBail
7175
displayName: lint
7276
7377
- script: |

scripts/beachball/src/config.test.ts

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -119,39 +119,24 @@ describe(`beachball configs`, () => {
119119
expect.arrayContaining([
120120
...excludedPackagesFromReleaseProcess,
121121
'packages/eslint-plugin',
122-
'scripts/api-extractor',
123-
'scripts/babel',
124-
'scripts/beachball',
125-
'scripts/cypress',
126-
'scripts/dangerjs',
127-
'scripts/executors',
128-
'scripts/fluentui-publish',
129-
'scripts/generators',
130-
'scripts/github',
131-
'scripts/gulp',
132-
'scripts/jest',
133-
'scripts/lint-staged',
134-
'scripts/monorepo',
135-
'scripts/package-manager',
136-
'scripts/perf-test-flamegrill',
137-
'scripts/prettier',
138-
'scripts/projects-test',
139-
'scripts/puppeteer',
140-
'scripts/storybook',
141-
'scripts/tasks',
142-
'scripts/test-ssr',
143-
'scripts/triage-bot',
144-
'scripts/ts-node',
145-
'scripts/update-release-notes',
146-
'scripts/utils',
147-
'scripts/webpack',
148-
'tools/eslint-rules',
149-
'tools/workspace-plugin',
122+
'packages/react-components/babel-preset-storybook-full-source',
123+
'packages/react-components/eslint-plugin-react-components',
124+
'packages/react-components/react-conformance-griffel',
125+
'packages/react-components/react-storybook-addon',
126+
'packages/react-components/react-storybook-addon-export-to-sandbox',
127+
'packages/react-conformance',
150128
]),
151129
);
152130

153-
// Ensure that no v8/vNext packages are included in the tools release
154-
expect(toolsConfig.scope.some(scope => scope.startsWith('packages/react'))).toBe(false);
131+
// Ensure that no v8/vNext UI packages are included in the tools release
132+
const nonToolsScopes = [
133+
'packages/react-components/react-components',
134+
'packages/react-components/react-text',
135+
'packages/react-components/react-card',
136+
'packages/react',
137+
];
138+
const hasToolsTag = toolsConfig.scope.some(scope => nonToolsScopes.includes(scope));
139+
expect(hasToolsTag).toBe(false);
155140

156141
expect(toolsConfig.changelog).toEqual(sharedConfig.changelog);
157142
});

scripts/beachball/src/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ const isV8Package: typeof isConvergedPackage = metadata => {
6161
return hasV8Tag && !isWebComponentPackage(metadata) && !isConvergedPackage(metadata);
6262
};
6363
const isToolsPackage: typeof isConvergedPackage = metadata => {
64-
const hasVNextTag = Boolean(metadata.project.tags?.includes('vNext'));
6564
const hasToolsTag = Boolean(metadata.project.tags?.includes('tools'));
65+
const isPrivate = Boolean(metadata.packageJson.private);
6666

67-
return hasToolsTag && !isV8Package(metadata) && !hasVNextTag;
67+
return hasToolsTag && !isPrivate && !isV8Package(metadata);
6868
};
6969

7070
function getPackagePaths() {

0 commit comments

Comments
 (0)