From 096d7346ab05eb0d03de74df3316f975c2f63569 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Wed, 27 Dec 2023 16:51:14 -0600 Subject: [PATCH] [CI] Fix more CI issues --- ...-ff168bbc-375a-451a-859e-a599045a960a.json | 7 ------- packages/virtualized-lists/package.json | 2 +- scripts/npm-utils.js | 19 ++++++++++++++++++- 3 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 change/@react-native-mac-virtualized-lists-ff168bbc-375a-451a-859e-a599045a960a.json diff --git a/change/@react-native-mac-virtualized-lists-ff168bbc-375a-451a-859e-a599045a960a.json b/change/@react-native-mac-virtualized-lists-ff168bbc-375a-451a-859e-a599045a960a.json deleted file mode 100644 index d49234cc68e088..00000000000000 --- a/change/@react-native-mac-virtualized-lists-ff168bbc-375a-451a-859e-a599045a960a.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "patch", - "comment": "Force bump @react-native-mac/virtualized-lists to 0.73.3-0", - "packageName": "@react-native-mac/virtualized-lists", - "email": "adgleitm@microsoft.com", - "dependentChangeType": "patch" -} diff --git a/packages/virtualized-lists/package.json b/packages/virtualized-lists/package.json index 1b223c6aec3628..e4f4b370f5e9cf 100644 --- a/packages/virtualized-lists/package.json +++ b/packages/virtualized-lists/package.json @@ -1,6 +1,6 @@ { "name": "@react-native-mac/virtualized-lists", - "version": "0.73.2", + "version": "0.73.3", "description": "Virtualized lists for React Native macOS.", "license": "MIT", "repository": { 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, );