Skip to content

Commit 370a5e1

Browse files
authored
ci: "update to nx 21" followup fixes (#2576)
1 parent 133c7dd commit 370a5e1

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.ado/jobs/npm-publish.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ jobs:
2424
- template: /.ado/templates/configure-git.yml@self
2525

2626
- script: |
27-
PUBLISH_TAG=$(jq -r '.release.version.generatorOptions.currentVersionResolverMetadata.tag' nx.json)
27+
PUBLISH_TAG=$(jq -r '.release.version.versionActionsOptions.currentVersionResolverMetadata.tag' nx.json)
28+
if [ -z "$PUBLISH_TAG" ] || [ "$PUBLISH_TAG" = "null" ]; then
29+
echo "Error: Failed to read publish tag from nx.json"
30+
exit 1
31+
fi
2832
echo "##vso[task.setvariable variable=publishTag]$PUBLISH_TAG"
2933
echo "Using publish tag from nx.json: $PUBLISH_TAG"
3034
displayName: Read publish tag from nx.json
@@ -61,7 +65,12 @@ jobs:
6165
6266
- script: |
6367
if [[ -f .rnm-publish ]]; then
64-
yarn nx release publish --tag ${{ parameters['publishTag'] }} --excludeTaskDependencies
68+
# https://github.com/microsoft/react-native-macos/issues/2580
69+
# `nx release publish` gets confused by the output of RNM's prepack script.
70+
# Let's call `yarn npm publish` directly instead on the packages we want to publish.
71+
# yarn nx release publish --tag ${{ parameters['publishTag'] }} --excludeTaskDependencies
72+
yarn ./packages/virtualized-lists npm publish --tag ${{ parameters['publishTag'] }}
73+
yarn ./packages/react-native npm publish --tag ${{ parameters['publishTag'] }}
6574
fi
6675
displayName: Publish packages
6776
condition: and(succeeded(), eq(variables['publish_react_native_macos'], '1'))

packages/nx-release-version/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,8 @@ const afterAllProjectsVersioned = async (_cwd, _opts) => {
8787
changedFiles.push(...versionedFiles);
8888

8989
console.log('✅ Updated React Native artifacts');
90-
console.log('🏷️ Created .rnm-publish marker file');
91-
90+
console.table(versionedFiles.map(file => path.relative(REPO_ROOT, file)));
9291
} catch (error) {
93-
console.error('Failed to update React Native artifacts:', error);
9492
const errorMessage = error instanceof Error ? error.message : String(error);
9593
console.error(`❌ Failed to update React Native artifacts: ${errorMessage}`);
9694
throw error;

0 commit comments

Comments
 (0)