[CI] Pick CI fixes from main (#2004)

microsoft · Dec 28, 2023 · 31557f8 · 31557f8
1 parent 184bc75
commit 31557f8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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,
   );