From e9b6d6e35827c499b42ac8b7cfd6c806653f89f5 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Wed, 27 Dec 2023 17:32:59 -0600 Subject: [PATCH] [CI] Pick CI fixes from main --- packages/community-cli-plugin/package.json | 3 +++ packages/virtualized-lists/package.json | 2 +- scripts/npm-utils.js | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/community-cli-plugin/package.json b/packages/community-cli-plugin/package.json index 9b6b549c4b3f0d..a0ad265c4dfb25 100644 --- a/packages/community-cli-plugin/package.json +++ b/packages/community-cli-plugin/package.json @@ -39,5 +39,8 @@ }, "engines": { "node": ">=18" + }, + "beachball": { + "shouldPublish": false } } diff --git a/packages/virtualized-lists/package.json b/packages/virtualized-lists/package.json index 602be0006d0122..43de3e1f5dbff3 100644 --- a/packages/virtualized-lists/package.json +++ b/packages/virtualized-lists/package.json @@ -1,7 +1,7 @@ { "name": "@react-native-mac/virtualized-lists", "version": "0.73.3", - "description": "Virtualized lists for React Native.", + "description": "Virtualized lists for React Native macOS.", "license": "MIT", "repository": { "type": "git", diff --git a/scripts/npm-utils.js b/scripts/npm-utils.js index b3890f4d3025c0..1342a3df665c87 100644 --- a/scripts/npm-utils.js +++ b/scripts/npm-utils.js @@ -16,6 +16,23 @@ const { getCurrentCommit, isTaggedLatest, } = require('./scm-utils'); +const path = require('path'); // [macOS] +const fs = require('fs'); // [macOS] + +// [macOS] Function to get our version from package.json instead of the CircleCI build tag. +function getPkgJsonVersion() { + const RN_PACKAGE_DIRECTORY = path.resolve( + __dirname, + '..', + 'packages', + 'react-native', + ); + const pkgJsonPath = path.resolve(RN_PACKAGE_DIRECTORY, 'package.json'); + const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8')); + const pkgJsonVersion = pkgJson.version; + return pkgJsonVersion; +} +// macOS] // Get `next` version from npm and +1 on the minor for `main` version function getMainVersion() { @@ -48,7 +65,7 @@ function getNpmInfo(buildType) { } const {version, major, minor, prerelease} = parseVersion( - process.env.CIRCLE_TAG, + getPkgJsonVersion(), // [macOS] We can't use the CircleCI build tag, so we use the version argument instead. buildType, );