Skip to content

Commit 43e0592

Browse files
author
karahanharunn
committed
fix: use correct branch when cloning test project
1 parent 9ff4fc9 commit 43e0592

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

packages/jsActions/mobile-resources-native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"testProject": {
1616
"githubUrl": "https://github.com/mendix/native-mobile-resources",
17-
"branchName": "main"
17+
"branchName": "mx/10.24.x"
1818
},
1919
"scripts": {
2020
"prestart": "rimraf ./dist/tsc",

packages/jsActions/nanoflow-actions-native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"testProject": {
1616
"githubUrl": "https://github.com/mendix/native-mobile-resources",
17-
"branchName": "main"
17+
"branchName": "mx/10.24.x"
1818
},
1919
"scripts": {
2020
"start": "rollup --config ../../../configs/jsactions/rollup.config.js --watch --configProject nanoflowcommons",

packages/modules/atlas-content-native/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
"url": "https://github.com/mendix/native-widgets.git"
1010
},
1111
"marketplace": {
12-
"minimumMXVersion": "9.6.0.27784",
12+
"minimumMXVersion": "10.24.0.73019",
1313
"marketplaceId": 117175
1414
},
1515
"testProject": {
1616
"githubUrl": "https://github.com/mendix/native-mobile-resources",
17-
"branchName": "main"
17+
"branchName": "mx/10.24.x"
1818
},
1919
"scripts": {
2020
"release": "ts-node ./scripts/build.ts release",

scripts/release/createNativeModules.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ async function updateNativeComponentsTestProject(moduleInfo, tmpFolder, nativeWi
129129
const tmpFolderActions = join(tmpFolder, `javascriptsource/${moduleInfo.moduleFolderNameInModeler}/actions`);
130130

131131
console.log("Updating NativeComponentsTestProject...");
132-
await cloneRepo(moduleInfo.testProjectUrl, tmpFolder);
132+
await cloneRepo(moduleInfo.testProjectUrl, tmpFolder, moduleInfo.testProjectBranchName);
133133

134134
console.log("Deleting existing JS Actions from test project...");
135135
await rm(tmpFolderActions, { force: true, recursive: true }); // this is useful to avoid retaining stale dependencies in the test project.
@@ -199,7 +199,7 @@ async function updateNativeComponentsTestProjectWithAtlas(moduleInfo, tmpFolder)
199199
const tmpFolderNativeStyles = join(tmpFolder, `themesource/${moduleInfo.moduleFolderNameInModeler}`);
200200

201201
console.log("Updating NativeComponentsTestProject..");
202-
await cloneRepo(moduleInfo.testProjectUrl, tmpFolder);
202+
await cloneRepo(moduleInfo.testProjectUrl, tmpFolder, moduleInfo.testProjectBranchName);
203203

204204
console.log("Copying Native styling files..");
205205
await Promise.all([

scripts/release/module-automation/commons.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@ async function githubAuthentication(moduleInfo) {
207207
await execShellCommand(`echo "${process.env.GH_PAT}" | gh auth login --with-token`);
208208
}
209209

210-
async function cloneRepo(githubUrl, localFolder) {
210+
async function cloneRepo(githubUrl, localFolder, branchName = "main") {
211211
const githubUrlDomain = githubUrl.replace("https://", "");
212212
const githubUrlAuthenticated = `https://${process.env.GH_USERNAME}:${process.env.GH_PAT}@${githubUrlDomain}`;
213213
await rm(localFolder, { recursive: true, force: true });
214214
await mkdir(localFolder, { recursive: true });
215-
await execShellCommand(`git clone ${githubUrlAuthenticated} ${localFolder}`);
215+
await execShellCommand(`git clone -b ${branchName} ${githubUrlAuthenticated} ${localFolder}`);
216216
await setLocalGitCredentials(localFolder);
217217
}
218218

0 commit comments

Comments
 (0)