Merge pull request #98 from fullstackedorg/runner-improvements

Runner Improvements
fullstackedorg · Oct 8, 2024 · c665495 · c665495
2 parents 10d321f + 78d0c1c
commit c665495
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # FullStacked Editor
 
-[Docs](https://docs.fullstacked.org) | [Demo](https://demo.fullstacked.org)
+[Docs](https://docs.fullstacked.org) | [Demo](https://demo.fullstacked.org) | [Figma](https://www.figma.com/design/xb3JBRCvEWpbwGda03T5QQ/Mockups)
 
 Create local-first web-like apps on any platform.
 

diff --git a/platform/electron/package.json b/platform/electron/package.json
@@ -29,4 +29,4 @@
         "esbuild": "^0.24.0",
         "tar": "^7.4.3"
     }
-}
+}
diff --git a/platform/node/package.json b/platform/node/package.json
@@ -27,4 +27,4 @@
         "mime": "^4.0.4",
         "ws": "^8.18.0"
     }
-}
+}
diff --git a/runner.js b/runner.js
@@ -75,12 +75,6 @@ const currentVersion = JSON.parse(
 ).version;
 const latestReleaseVersion = await getLatestReleaseVersion();
 
-if (semver.lte(currentVersion, latestReleaseVersion)) {
-    notifyError(
-        `Trying to run same or older version. Current [${currentVersion}] | Latest [${latestReleaseVersion}]`
-    );
-}
-
 const electronDirectory = "platform/electron";
 
 const BUILD_AND_TEST = () => {
@@ -103,7 +97,11 @@ const NODE_BUILD = async () => {
     const nodePackageJson = JSON.parse(
         fs.readFileSync(nodePackageJsonFile, { encoding: "utf-8" })
     );
-    nodePackageJson.version = currentVersion + "-" + commitNumber;
+
+    nodePackageJson.version = release
+        ? currentVersion
+        : currentVersion + "-" + commitNumber;
+
     fs.writeFileSync(
         nodePackageJsonFile,
         JSON.stringify(nodePackageJson, null, 4)
@@ -497,11 +495,15 @@ const DOCKER_DEPLOY = () => {
     );
 };
 
-
 async function run() {
-
     const start = new Date();
 
+    if (!release && semver.lte(currentVersion, latestReleaseVersion)) {
+        await notifyError(
+            `Trying to run same or older version. Current [${currentVersion}] | Latest [${latestReleaseVersion}]`
+        );
+    }
+
     /////// BUILD AND TESTS ////////
 
     let tries = 5;
@@ -528,24 +530,28 @@ async function run() {
         console.error(e);
         await notifyError("Failed to build for node");
     }
-    try {
-        await ELECTRON_BUILD();
-    } catch (e) {
-        console.error(e);
-        await notifyError("Failed to build for electron");
-    }
-    try {
-        IOS_BUILD();
-    } catch (e) {
-        console.error(e);
-        await notifyError("Failed to build for ios");
-    }
-    try {
-        ANDROID_BUILD();
-    } catch (e) {
-        console.error(e);
-        await notifyError("Failed to build for android");
+
+    if (!release) {
+        try {
+            await ELECTRON_BUILD();
+        } catch (e) {
+            console.error(e);
+            await notifyError("Failed to build for electron");
+        }
+        try {
+            IOS_BUILD();
+        } catch (e) {
+            console.error(e);
+            await notifyError("Failed to build for ios");
+        }
+        try {
+            ANDROID_BUILD();
+        } catch (e) {
+            console.error(e);
+            await notifyError("Failed to build for android");
+        }
     }
+
     try {
         DOCKER_BUILD();
     } catch (e) {
@@ -561,24 +567,28 @@ async function run() {
         console.error(e);
         notifyError("Failed to deploy for node", false);
     }
-    try {
-        await ELECTRON_DEPLOY();
-    } catch (e) {
-        console.error(e);
-        notifyError("Failed to deploy for electron", false);
-    }
-    try {
-        IOS_DEPLOY();
-    } catch (e) {
-        console.error(e);
-        notifyError("Failed to deploy for ios", false);
-    }
-    try {
-        ANDROID_DEPLOY();
-    } catch (e) {
-        console.error(e);
-        notifyError("Failed to deploy for android", false);
+
+    if (!release) {
+        try {
+            await ELECTRON_DEPLOY();
+        } catch (e) {
+            console.error(e);
+            notifyError("Failed to deploy for electron", false);
+        }
+        try {
+            IOS_DEPLOY();
+        } catch (e) {
+            console.error(e);
+            notifyError("Failed to deploy for ios", false);
+        }
+        try {
+            ANDROID_DEPLOY();
+        } catch (e) {
+            console.error(e);
+            notifyError("Failed to deploy for android", false);
+        }
     }
+
     try {
         DOCKER_DEPLOY();
     } catch (e) {