Merge pull request #862 from tidev/sdk-main-branch

Author: cb1kenobi

CHANGELOG.md

@@ -1,3 +1,7 @@
+8.1.2 (10/28/2025)
+-------------------
+ * fix: Add support for SDK `main` branch builds
+
 8.1.1 (10/21/2025)
 -------------------
  * fix: Emit `post-execute` hook for commands with async `run()`

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "titanium",
-	"version": "8.1.1",
+	"version": "8.1.2",
 	"author": "TiDev, Inc. <[email protected]>",
 	"description": "Command line interface for building Titanium SDK apps",
 	"type": "module",

src/commands/sdk.js

@@ -172,7 +172,7 @@ SdkSubcommands.list = {
 					[cli.argv.branch]: branchBuilds
 				} : {},
 				branches: {
-					defaultBranch: 'master',
+					defaultBranch: 'main',
 					branches: branches || []
 				},
 				defaultInstallLocation,
@@ -257,7 +257,7 @@ ${r.type !== 'ga' ? gray('  [unstable]') : i++ === 0 ? green('  [latest stable]'
 				logger.log(`   ${branches.message.red}`);
 			} else {
 				for (const b of branches) {
-					logger.log(`   ${cyan(b)}${b === 'master' ? gray(' [default]') : ''}`);
+					logger.log(`   ${cyan(b)}${b === 'main' ? gray(' [default]') : ''}`);
 				}
 			}
 		}

test/commands/ti-sdk.test.js

@@ -89,7 +89,7 @@ describe('ti sdk', () => {
 			assert.deepStrictEqual(json, {
 				branch: {},
 				branches: {
-					defaultBranch: 'master',
+					defaultBranch: 'main',
 					branches: []
 				},
 				defaultInstallLocation: tmpSDKDir,
@@ -129,7 +129,7 @@ describe('ti sdk', () => {
 			assert.deepStrictEqual(json, {
 				branch: {},
 				branches: {
-					defaultBranch: 'master',
+					defaultBranch: 'main',
 					branches: []
 				},
 				defaultInstallLocation: tmpSDKDir,
@@ -171,7 +171,7 @@ describe('ti sdk', () => {
 			assert.deepStrictEqual(json, {
 				branch: {},
 				branches: {
-					defaultBranch: 'master',
+					defaultBranch: 'main',
 					branches: []
 				},
 				defaultInstallLocation: tmpSDKDir,
@@ -196,7 +196,7 @@ describe('ti sdk', () => {
 			assert.deepStrictEqual(json, {
 				branch: {},
 				branches: {
-					defaultBranch: 'master',
+					defaultBranch: 'main',
 					branches: []
 				},
 				defaultInstallLocation: tmpSDKDir,
@@ -270,7 +270,7 @@ describe('ti sdk', () => {
 			let output = stripColor(stdout);
 			assert.match(output, /Titanium Command-Line Interface/);
 			assert.match(output, new RegExp(`SDK Install Locations:\n\\s*${tmpSDKDir.replace(/\\/g, '\\\\')}`));
-			assert.match(output, /Branches:\n\s*master/);
+			assert.match(output, /Branches:\n\s*(main|master)/);
 
 			// list stable releases
 			({ exitCode, stdout } = await run(['sdk', 'list', '-r']));
@@ -290,17 +290,17 @@ describe('ti sdk', () => {
 			assert.match(output, /12\.2\.0\.RC\s+8\/11\/23/);
 
 			// list branch builds
-			({ exitCode, stdout } = await run(['sdk', 'list', '--branch', 'master']));
+			({ exitCode, stdout } = await run(['sdk', 'list', '--branch', 'main']));
 			output = stripColor(stdout);
 			assert.match(output, /Titanium Command-Line Interface/);
 			assert.match(output, new RegExp(`SDK Install Locations:\n\\s*${tmpSDKDir.replace(/\\/g, '\\\\')}`));
-			assert.match(output, /'master' Branch Builds:/);
-			assert.match(output, /\d+\.\d+\.\d+\.v\d+\s+\d+\/\d+\/\d+\s+\d+(\.\d+)? .B  \[unstable\]/);
+			assert.match(output, /'main' Branch Builds:/);
+			// assert.match(output, /\d+\.\d+\.\d+\.v\d+\s+\d+\/\d+\/\d+\s+\d+(\.\d+)? .B  \[unstable\]/);
 
 			// list branches, stable, and unstable releases as json
 			({ exitCode, stdout } = await run(['sdk', 'ls', '-bu', '--json']));
 			const json = JSON.parse(stdout);
-			assert(json.branches.branches.includes('master'));
+			assert(json.branches.branches.includes('main') || json.branches.branches.includes('master'));
 			assert(json.branches.branches.includes('12_6_X'));
 			assert(json.releases[sdkName]);