diff --git a/.ado/jobs/npm-publish.yml b/.ado/jobs/npm-publish.yml index c43af09e3f843b..6a1b9a4db80b0f 100644 --- a/.ado/jobs/npm-publish.yml +++ b/.ado/jobs/npm-publish.yml @@ -24,7 +24,11 @@ jobs: - template: /.ado/templates/configure-git.yml@self - script: | - PUBLISH_TAG=$(jq -r '.release.version.generatorOptions.currentVersionResolverMetadata.tag' nx.json) + PUBLISH_TAG=$(jq -r '.release.version.versionActionsOptions.currentVersionResolverMetadata.tag' nx.json) + if [ -z "$PUBLISH_TAG" ] || [ "$PUBLISH_TAG" = "null" ]; then + echo "Error: Failed to read publish tag from nx.json" + exit 1 + fi echo "##vso[task.setvariable variable=publishTag]$PUBLISH_TAG" echo "Using publish tag from nx.json: $PUBLISH_TAG" displayName: Read publish tag from nx.json @@ -61,7 +65,12 @@ jobs: - script: | if [[ -f .rnm-publish ]]; then - yarn nx release publish --tag ${{ parameters['publishTag'] }} --excludeTaskDependencies + # https://github.com/microsoft/react-native-macos/issues/2580 + # `nx release publish` gets confused by the output of RNM's prepack script. + # Let's call `yarn npm publish` directly instead on the packages we want to publish. + # yarn nx release publish --tag ${{ parameters['publishTag'] }} --excludeTaskDependencies + yarn ./packages/virtualized-lists npm publish --tag ${{ parameters['publishTag'] }} + yarn ./packages/react-native npm publish --tag ${{ parameters['publishTag'] }} fi displayName: Publish packages condition: and(succeeded(), eq(variables['publish_react_native_macos'], '1')) diff --git a/packages/nx-release-version/index.js b/packages/nx-release-version/index.js index 2db1447949c8d5..38f893b0c8d23c 100644 --- a/packages/nx-release-version/index.js +++ b/packages/nx-release-version/index.js @@ -84,10 +84,8 @@ const afterAllProjectsVersioned = async (_cwd, _opts) => { changedFiles.push(...versionedFiles); console.log('✅ Updated React Native artifacts'); - console.log('🏷️ Created .rnm-publish marker file'); - + console.table(versionedFiles.map(file => path.relative(REPO_ROOT, file))); } catch (error) { - console.error('Failed to update React Native artifacts:', error); const errorMessage = error instanceof Error ? error.message : String(error); console.error(`❌ Failed to update React Native artifacts: ${errorMessage}`); throw error;