Merge branch 'zombienet_new_version'

Signed-off-by: Jasti Sri Radhe Shyam <radheshyam.jasti@zeeve.io>
Zeeve-App · Oct 31, 2023 · 8c4e3aa · 8c4e3aa
2 parents 30aa286 + 857e053
commit 8c4e3aa
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 77 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "larch-backend",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
@@ -19,7 +19,7 @@ import * as versionInfo from './version.js';
 export const LARCH_CONTEXT_DIR = `${homedir()}/.larch`;
 export const LARCH_VERSION = versionInfo.default.version;
 export const LARCH_DEFAULT_PROVIDER_NAME = 'podman';
-export const ZOMBIENET_VERSION: string = '1.3.43';
+export const ZOMBIENET_VERSION: string = '1.3.71';
 export const ZOMBIENET_BIN_COLLECTION_DIR = `${LARCH_CONTEXT_DIR}/bin`;
 export const ZOMBIENET_NETWORKS_COLLECTION_DIR = `${LARCH_CONTEXT_DIR}/networks`;
 export const ZOMBIENET_NETWORKS_EXECUTION_DIR = `${LARCH_CONTEXT_DIR}/exec`;

diff --git a/packages/backend/src/modules/zombienet.ts b/packages/backend/src/modules/zombienet.ts
@@ -18,7 +18,7 @@ import { constants } from 'node:fs';
 import { spawnSync } from 'node:child_process';
 import {
   ZOMBIENET_BIN_COLLECTION_DIR,
-  ZOMBIENET_BINARY_DOWNLOAD_BASE_URL,
+  // ZOMBIENET_BINARY_DOWNLOAD_BASE_URL,
   ZOMBIENET_PATCH_BINARY_DOWNLOAD_BASE_URL,
 } from '../config.js';
 import { downloadFileToAPath } from '../utils/download.js';
@@ -76,7 +76,7 @@ const getPodmanCurrentAndAvailableVersion = async (): Promise<{
 export const downloadZombienetBinary = async (zombienetVersion: string, podmanVersion: string): Promise<void> => {
   const downloadBinaryFileSlugName = process.platform === 'darwin' ? 'zombienet-macos' : 'zombienet-linux-x64';
   const binaryDownloadUrl = !podmanVersion || podmanVersion === '3'
-    ? `${ZOMBIENET_BINARY_DOWNLOAD_BASE_URL}/v${zombienetVersion}/${downloadBinaryFileSlugName}`
+    ? `${ZOMBIENET_PATCH_BINARY_DOWNLOAD_BASE_URL}/v${zombienetVersion}-podman3-patch/${downloadBinaryFileSlugName}`
     : `${ZOMBIENET_PATCH_BINARY_DOWNLOAD_BASE_URL}/v${zombienetVersion}-podman4-patch/${downloadBinaryFileSlugName}`;
   const binaryVersionedPath = zombienetBinPathByVersion(zombienetVersion);
   await fs.mkdir(ZOMBIENET_BIN_COLLECTION_DIR, { recursive: true });
@@ -122,14 +122,14 @@ export const generateZombienetCliOptions = (zombienetCliOptions: ZombienetCliOpt
     return optionsList;
   }
 
-  optionsList.push('--monitor');
   if (zombienetCliOptions.spawn) {
     optionsList.push('spawn');
     optionsList.push(zombienetCliOptions.networkConfigPath ?? '');
   } else if (zombienetCliOptions.test) {
     optionsList.push('test');
     optionsList.push(zombienetCliOptions.testConfigPath ?? '');
   }
+  optionsList.push('--monitor');
 
   if (zombienetCliOptions.provider) {
     optionsList.push('--provider');

diff --git a/packages/backend/src/version.ts b/packages/backend/src/version.ts
@@ -14,4 +14,4 @@
 */
 
 // Managed by version script - do not edit directly
-export default { version: '1.4.0' };
+export default { version: '1.5.0' };
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "larch-cli",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Larch CLI",
   "main": "dist/index.js",
   "bin": {
@@ -31,6 +31,6 @@
   },
   "dependencies": {
     "commander": "^10.0.0",
-    "larch-backend": "1.4.0"
+    "larch-backend": "1.5.0"
   }
 }
diff --git a/packages/cli/src/version.ts b/packages/cli/src/version.ts
@@ -14,4 +14,4 @@
 */
 
 // Managed by version script - do not edit directly
-export default { version: '1.4.0' };
+export default { version: '1.5.0' };