diff --git a/cirrus.toml b/cirrus.toml index 2fc3a9e..ee1deda 100644 --- a/cirrus.toml +++ b/cirrus.toml @@ -10,7 +10,7 @@ test = "sf apex test run --test-level RunLocalTests --wait 20" docs = "apexdocs markdown" generate-library-docs = "node scripts/generate-library-docs.mjs" prep-package = "node scripts/prepare-for-packaging.mjs" -package = "sf package version create -x -c -p 0HoHu000000TNMAKA4 -w 60" +package = "cirrus package -p Expression -t minor -x -c --promote -w 60" post-package = "node scripts/post-packaging.mjs" [flow.start-dev] diff --git a/scripts/prepare-for-packaging.mjs b/scripts/prepare-for-packaging.mjs index 1704c14..dd8c224 100644 --- a/scripts/prepare-for-packaging.mjs +++ b/scripts/prepare-for-packaging.mjs @@ -15,26 +15,6 @@ if (fs.existsSync(projectJsonPath)) { const projectJsonPackagingPath = path.resolve(projectJsonPackaging); if (fs.existsSync(projectJsonPackagingPath)) { - const data = fs.readFileSync(projectJsonPackagingPath, 'utf8'); - const json = JSON.parse(data); - - const corePackage = json.packageDirectories.find((pkg) => pkg.package === 'Expression'); - - // Update versionName - const versionNameParts = corePackage.versionName.split(' '); - const versionNumber = parseFloat(versionNameParts[1]); - corePackage.versionName = `${versionNameParts[0]} ${versionNumber + 0.01}`; - - // Update versionNumber - const versionNumberParts = corePackage.versionNumber.split('.'); - const majorVersion = parseInt(versionNumberParts[0]); - const minorVersion = parseInt(versionNumberParts[1]); - corePackage.versionNumber = `${majorVersion}.${minorVersion + 1}.0.NEXT`; - - // Save the updated file - fs.writeFileSync(projectJsonPackagingPath, JSON.stringify(json, null, 2), 'utf8'); - console.log(`Updated ${projectJsonPackaging}`); - fs.renameSync(projectJsonPackagingPath, projectJsonPath); console.log(`Renamed ${projectJsonPackaging} to ${projectJson}`); } diff --git a/sfdx-project_packaging.json b/sfdx-project_packaging.json index b21dec2..edf6603 100644 --- a/sfdx-project_packaging.json +++ b/sfdx-project_packaging.json @@ -4,7 +4,7 @@ "path": "expression-src", "package": "Expression", "versionName": "Version 1.36", - "versionNumber": "1.36.0.NEXT", + "versionNumber": "1.39.0.NEXT", "default": false, "versionDescription": "Expression core language", "ancestorVersion": "HIGHEST" @@ -65,6 +65,9 @@ "Expression@1.33.0-1": "04tRb0000037T8PIAU", "Expression@1.34.0-3": "04tRb000003L5m9IAC", "Expression@1.35.0-4": "04tRb000003N27RIAS", - "Expression@1.36.0-1": "04tRb000003NrEnIAK" + "Expression@1.36.0-1": "04tRb000003NrEnIAK", + "Expression@1.37.0-3": "04tRb000003OmWPIA0", + "Expression@1.38.0-1": "04tRb000003R4nNIAS", + "Expression@1.39.0-1": "04tRb000003R51tIAC" } } \ No newline at end of file